diff --git a/src/client/folder-list/folder-list-abstract-folder-entry.vala b/src/client/folder-list/folder-list-abstract-folder-entry.vala
index 20c934a..5cbabc9 100644
--- a/src/client/folder-list/folder-list-abstract-folder-entry.vala
+++ b/src/client/folder-list/folder-list-abstract-folder-entry.vala
@@ -20,7 +20,7 @@ public abstract class FolderList.AbstractFolderEntry : Geary.BaseObject, Sidebar
     
     public abstract string? get_sidebar_tooltip();
     
-    public abstract Icon? get_sidebar_icon();
+    public abstract string? get_sidebar_icon();
     
     public abstract int get_count();
     
diff --git a/src/client/folder-list/folder-list-account-branch.vala b/src/client/folder-list/folder-list-account-branch.vala
index 3194f21..f6af521 100644
--- a/src/client/folder-list/folder-list-account-branch.vala
+++ b/src/client/folder-list/folder-list-account-branch.vala
@@ -17,8 +17,7 @@ public class FolderList.AccountBranch : Sidebar.Branch {
         bool rtl = Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL;
         
         this.account = account;
-        user_folder_group = new SpecialGrouping(2, "",
-            IconFactory.instance.get_custom_icon(rtl ? "tag-rtl-symbolic" : "tag-symbolic", IconFactory.ICON_SIDEBAR));
+        user_folder_group = new SpecialGrouping(2, "", rtl ? "tag-rtl-symbolic" : "tag-symbolic");
         folder_entries = new Gee.HashMap<Geary.FolderPath, FolderEntry>();
         
         account.information.notify["nickname"].connect(on_nicknamed_changed);
diff --git a/src/client/folder-list/folder-list-folder-entry.vala b/src/client/folder-list/folder-list-folder-entry.vala
index 64b4f61..7a6b632 100644
--- a/src/client/folder-list/folder-list-folder-entry.vala
+++ b/src/client/folder-list/folder-list-folder-entry.vala
@@ -43,39 +43,39 @@ public class FolderList.FolderEntry : FolderList.AbstractFolderEntry, Sidebar.In
         return _("%s, %s").printf(total_msg, unread_msg);
     }
     
-    public override Icon? get_sidebar_icon() {
+    public override string? get_sidebar_icon() {
         bool rtl = Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL;
         
         switch (folder.special_folder_type) {
             case Geary.SpecialFolderType.NONE:
-                return IconFactory.instance.get_custom_icon(rtl ? "tag-rtl-symbolic" : "tag-symbolic", IconFactory.ICON_SIDEBAR);
+                return rtl ? "tag-rtl-symbolic" : "tag-symbolic";
             
             case Geary.SpecialFolderType.INBOX:
-                return new ThemedIcon("inbox-symbolic");
+                return "inbox-symbolic";
             
             case Geary.SpecialFolderType.DRAFTS:
-                return new ThemedIcon("accessories-text-editor-symbolic");
+                return "accessories-text-editor-symbolic";
             
             case Geary.SpecialFolderType.SENT:
-                return new ThemedIcon(rtl ? "sent-rtl-symbolic" : "sent-symbolic");
+                return rtl ? "sent-rtl-symbolic" : "sent-symbolic";
             
             case Geary.SpecialFolderType.FLAGGED:
-                return new ThemedIcon("starred-symbolic");
+                return "starred-symbolic";
             
             case Geary.SpecialFolderType.IMPORTANT:
-                return new ThemedIcon("task-due-symbolic");
+                return "task-due-symbolic";
             
             case Geary.SpecialFolderType.ALL_MAIL:
-                return IconFactory.instance.get_custom_icon("archive-symbolic", IconFactory.ICON_SIDEBAR);
+                return "archive-symbolic";
             
             case Geary.SpecialFolderType.SPAM:
-                return new ThemedIcon(rtl ? "spam-rtl-symbolic" : "spam-symbolic");
+                return rtl ? "spam-rtl-symbolic" : "spam-symbolic";
             
             case Geary.SpecialFolderType.TRASH:
-                return new ThemedIcon("user-trash-symbolic");
+                return "user-trash-symbolic";
             
             case Geary.SpecialFolderType.OUTBOX:
-                return new ThemedIcon("outbox-symbolic");
+                return "outbox-symbolic";
             
             default:
                 assert_not_reached();
diff --git a/src/client/folder-list/folder-list-search-branch.vala b/src/client/folder-list/folder-list-search-branch.vala
index ce3b7a8..5ddbe7a 100644
--- a/src/client/folder-list/folder-list-search-branch.vala
+++ b/src/client/folder-list/folder-list-search-branch.vala
@@ -44,8 +44,8 @@ public class FolderList.SearchEntry : FolderList.AbstractFolderEntry {
         return ngettext("%d result", "%d results", total).printf(total);
     }
     
-    public override Icon? get_sidebar_icon() {
-        return new ThemedIcon("edit-find-symbolic");
+    public override string? get_sidebar_icon() {
+        return "edit-find-symbolic";
     }
     
     public override string to_string() {
diff --git a/src/client/folder-list/folder-list-special-grouping.vala b/src/client/folder-list/folder-list-special-grouping.vala
index 3b87912..8cafcc3 100644
--- a/src/client/folder-list/folder-list-special-grouping.vala
+++ b/src/client/folder-list/folder-list-special-grouping.vala
@@ -11,9 +11,9 @@ public class FolderList.SpecialGrouping : Sidebar.Grouping {
     // in the list.  If < 0, it comes before non-SpecialGroupings.
     public int position { get; private set; }
     
-    public SpecialGrouping(int position, string name, Icon? open_icon,
-        Icon? closed_icon = null, string? tooltip = null) {
-        base(name, open_icon, closed_icon, tooltip);
+    public SpecialGrouping(int position, string name, string? icon,
+        string? tooltip = null) {
+        base(name, icon, tooltip);
         
         this.position = position;
     }
diff --git a/src/client/sidebar/sidebar-common.vala b/src/client/sidebar/sidebar-common.vala
index 2edd17b..ccae7c8 100644
--- a/src/client/sidebar/sidebar-common.vala
+++ b/src/client/sidebar/sidebar-common.vala
@@ -10,13 +10,11 @@ public class Sidebar.Grouping : Object, Sidebar.Entry, Sidebar.ExpandableEntry,
     
     private string name;
     private string? tooltip;
-    private Icon? open_icon;
-    private Icon? closed_icon;
+    private string? icon;
     
-    public Grouping(string name, Icon? open_icon, Icon? closed_icon = null, string? tooltip = null) {
+    public Grouping(string name, string? icon, string? tooltip = null) {
         this.name = name;
-        this.open_icon = open_icon;
-        this.closed_icon = closed_icon ?? open_icon;
+        this.icon = icon;
         this.tooltip = tooltip;
     }
     
@@ -37,16 +35,8 @@ public class Sidebar.Grouping : Object, Sidebar.Entry, Sidebar.ExpandableEntry,
         return tooltip;
     }
     
-    public Icon? get_sidebar_icon() {
-        return null;
-    }
-    
-    public Icon? get_sidebar_open_icon() {
-        return open_icon;
-    }
-    
-    public Icon? get_sidebar_closed_icon() {
-        return closed_icon;
+    public string? get_sidebar_icon() {
+        return icon;
     }
     
     public int get_count() {
diff --git a/src/client/sidebar/sidebar-entry.vala b/src/client/sidebar/sidebar-entry.vala
index 0cf740f..0193aae 100644
--- a/src/client/sidebar/sidebar-entry.vala
+++ b/src/client/sidebar/sidebar-entry.vala
@@ -9,15 +9,13 @@ public interface Sidebar.Entry : Object {
     
     public signal void sidebar_tooltip_changed(string? tooltip);
     
-    public signal void sidebar_icon_changed(Icon? icon);
-    
     public signal void sidebar_count_changed(int count);
     
     public abstract string get_sidebar_name();
     
     public abstract string? get_sidebar_tooltip();
     
-    public abstract Icon? get_sidebar_icon();
+    public abstract string? get_sidebar_icon();
     
     public abstract int get_count();
     
@@ -31,12 +29,6 @@ public interface Sidebar.Entry : Object {
 }
 
 public interface Sidebar.ExpandableEntry : Sidebar.Entry {
-    public signal void sidebar_open_closed_icons_changed(Icon? open, Icon? closed);
-    
-    public abstract Icon? get_sidebar_open_icon();
-    
-    public abstract Icon? get_sidebar_closed_icon();
-    
     public abstract bool expand_on_select();
 }
 
diff --git a/src/client/sidebar/sidebar-tree.vala b/src/client/sidebar/sidebar-tree.vala
index 91ea17a..c7db330 100644
--- a/src/client/sidebar/sidebar-tree.vala
+++ b/src/client/sidebar/sidebar-tree.vala
@@ -48,9 +48,7 @@ public class Sidebar.Tree : Gtk.TreeView {
         NAME,
         TOOLTIP,
         WRAPPER,
-        PIXBUF,
-        CLOSED_PIXBUF,
-        OPEN_PIXBUF,
+        ICON,
         COUNTER,
         N_COLUMNS
     }
@@ -59,9 +57,7 @@ public class Sidebar.Tree : Gtk.TreeView {
         typeof (string),            // NAME
         typeof (string?),           // TOOLTIP
         typeof (EntryWrapper),      // WRAPPER
-        typeof (Gdk.Pixbuf?),       // PIXBUF
-        typeof (Gdk.Pixbuf?),       // CLOSED_PIXBUF
-        typeof (Gdk.Pixbuf?),       // OPEN_PIXBUF
+        typeof (string?),           // ICON
         typeof (int)                // COUNTER
     );
     
@@ -69,7 +65,6 @@ public class Sidebar.Tree : Gtk.TreeView {
     private Gtk.CellRendererText text_renderer;
     private unowned ExternalDropHandler drop_handler;
     private Gtk.Entry? text_entry = null;
-    private Gee.HashMap<string, Gdk.Pixbuf> icon_cache = new Gee.HashMap<string, Gdk.Pixbuf>();
     private Gee.HashMap<Sidebar.Entry, EntryWrapper> entry_map =
         new Gee.HashMap<Sidebar.Entry, EntryWrapper>();
     private Gee.HashMap<Sidebar.Branch, int> branches = new Gee.HashMap<Sidebar.Branch, int>();
@@ -102,10 +97,9 @@ public class Sidebar.Tree : Gtk.TreeView {
         Gtk.TreeViewColumn text_column = new Gtk.TreeViewColumn();
         text_column.set_expand(true);
         Gtk.CellRendererPixbuf icon_renderer = new Gtk.CellRendererPixbuf();
+        icon_renderer.follow_state = true; 
         text_column.pack_start(icon_renderer, false);
-        text_column.add_attribute(icon_renderer, "pixbuf", Columns.PIXBUF);
-        text_column.add_attribute(icon_renderer, "pixbuf_expander_closed", Columns.CLOSED_PIXBUF);
-        text_column.add_attribute(icon_renderer, "pixbuf_expander_open", Columns.OPEN_PIXBUF);
+        text_column.add_attribute(icon_renderer, "icon_name", Columns.ICON);
         text_column.set_cell_data_func(icon_renderer, icon_renderer_function);
         text_renderer = new Gtk.CellRendererText();
         text_renderer.editing_canceled.connect(on_editing_canceled);
@@ -143,7 +137,7 @@ public class Sidebar.Tree : Gtk.TreeView {
         // currently
         enable_model_drag_dest(target_entries, actions);
         
-        // Drag source removed as per http://redmine.yorba.org/issues/4701
+        // Drag source removed as per http://redmine.y_orba.org/issues/4701
         //
         // Reason: this isn't working correctly (Sidebar.InternalDragSourceEntry should be
         // the trigger for enable dragging, but that doesn't work anymore).  It looks like
@@ -155,11 +149,6 @@ public class Sidebar.Tree : Gtk.TreeView {
         
         popup_menu.connect(on_context_menu_keypress);
         
-        if (icon_theme == null)
-            icon_theme = Gtk.IconTheme.get_default();
-        
-        icon_theme.changed.connect(on_theme_change);
-        
         drag_begin.connect(on_drag_begin);
         drag_end.connect(on_drag_end);
         drag_motion.connect(on_drag_motion);
@@ -168,7 +157,6 @@ public class Sidebar.Tree : Gtk.TreeView {
     ~Tree() {
         text_renderer.editing_canceled.disconnect(on_editing_canceled);
         text_renderer.editing_started.disconnect(on_editing_started);
-        icon_theme.changed.disconnect(on_theme_change);
     }
     
     public void icon_renderer_function(Gtk.CellLayout layout, Gtk.CellRenderer renderer, Gtk.TreeModel model, Gtk.TreeIter iter) {
@@ -492,7 +480,7 @@ public class Sidebar.Tree : Gtk.TreeView {
         load_entry_icons(assoc_iter);
         
         entry.sidebar_tooltip_changed.connect(on_sidebar_tooltip_changed);
-        entry.sidebar_icon_changed.connect(on_sidebar_icon_changed);
+
         entry.sidebar_name_changed.connect(on_sidebar_name_changed);
         entry.sidebar_count_changed.connect(on_sidebar_count_changed);
         
@@ -500,10 +488,6 @@ public class Sidebar.Tree : Gtk.TreeView {
         if (emphasizable != null)
             emphasizable.is_emphasized_changed.connect(on_is_emphasized_changed);
         
-        Sidebar.ExpandableEntry? expandable = entry as Sidebar.ExpandableEntry;
-        if (expandable != null)
-            expandable.sidebar_open_closed_icons_changed.connect(on_sidebar_open_closed_icons_changed);
-        
         entry.grafted(this);
     }
     
@@ -607,18 +591,12 @@ public class Sidebar.Tree : Gtk.TreeView {
         entry.pruned(this);
         
         entry.sidebar_tooltip_changed.disconnect(on_sidebar_tooltip_changed);
-        entry.sidebar_icon_changed.disconnect(on_sidebar_icon_changed);
-        entry.sidebar_name_changed.disconnect(on_sidebar_name_changed);
         entry.sidebar_count_changed.disconnect(on_sidebar_count_changed);
         
         Sidebar.EmphasizableEntry? emphasizable = entry as Sidebar.EmphasizableEntry;
         if (emphasizable != null)
             emphasizable.is_emphasized_changed.disconnect(on_is_emphasized_changed);
         
-        Sidebar.ExpandableEntry? expandable = entry as Sidebar.ExpandableEntry;
-        if (expandable != null)
-            expandable.sidebar_open_closed_icons_changed.disconnect(on_sidebar_open_closed_icons_changed);
-        
         bool removed = entry_map.unset(entry);
         assert(removed);
     }
@@ -748,22 +726,6 @@ public class Sidebar.Tree : Gtk.TreeView {
             Geary.HTML.escape_markup(tooltip) : null);
     }
     
-    private void on_sidebar_icon_changed(Sidebar.Entry entry, Icon? icon) {
-        EntryWrapper? wrapper = get_wrapper(entry);
-        assert(wrapper != null);
-        
-        store.set(wrapper.get_iter(), Columns.PIXBUF, fetch_icon_pixbuf(icon));
-    }
-    
-    private void on_sidebar_open_closed_icons_changed(Sidebar.ExpandableEntry entry, Icon? open,
-        Icon? closed) {
-        EntryWrapper? wrapper = get_wrapper(entry);
-        assert(wrapper != null);
-        
-        store.set(wrapper.get_iter(), Columns.OPEN_PIXBUF, fetch_icon_pixbuf(open));
-        store.set(wrapper.get_iter(), Columns.CLOSED_PIXBUF, fetch_icon_pixbuf(closed));
-    }
-    
     private void rename_entry(Sidebar.Entry entry) {
         EntryWrapper? wrapper = get_wrapper(entry);
         assert(wrapper != null);
@@ -786,58 +748,12 @@ public class Sidebar.Tree : Gtk.TreeView {
         store.set(wrapper.get_iter(), Columns.COUNTER, entry.get_count());
     }
     
-    private Gdk.Pixbuf? fetch_icon_pixbuf(GLib.Icon? gicon) {
-        if (gicon == null)
-            return null;
-        
-        try {
-            Gdk.Pixbuf? icon = icon_cache.get(gicon.to_string());
-            if (icon != null)
-                return icon;
-            
-            Gtk.IconInfo? info = icon_theme.lookup_by_gicon(gicon, ICON_SIZE, 0);
-            if (info == null)
-                return null;
-            
-            icon = info.load_symbolic_for_context(get_style_context());
-            
-            if (icon == null)
-                return null;
-            
-            icon_cache.set(gicon.to_string(), icon);
-            
-            return icon;
-        } catch (Error err) {
-            warning("Unable to load icon %s: %s", gicon.to_string(), err.message);
-            
-            return null;
-        }
-    }
-    
     private void load_entry_icons(Gtk.TreeIter iter) {
         EntryWrapper? wrapper = get_wrapper_at_iter(iter);
         if (wrapper == null)
             return;
-        
-        Icon? icon = wrapper.entry.get_sidebar_icon();
-        Icon? open = null;
-        Icon? closed = null;
-        
-        Sidebar.ExpandableEntry? expandable = wrapper.entry as Sidebar.ExpandableEntry;
-        if (expandable != null) {
-            open = expandable.get_sidebar_open_icon();
-            closed = expandable.get_sidebar_closed_icon();
-        }
-        
-        if (open == null)
-            open = icon;
-        
-        if (closed == null)
-            closed = icon;
-        
-        store.set(iter, Columns.PIXBUF, fetch_icon_pixbuf(icon));
-        store.set(iter, Columns.OPEN_PIXBUF, fetch_icon_pixbuf(open));
-        store.set(iter, Columns.CLOSED_PIXBUF, fetch_icon_pixbuf(closed));
+        string? icon = wrapper.entry.get_sidebar_icon();
+        store.set(iter, Columns.ICON, icon);
     }
     
     private void load_branch_icons(Gtk.TreeIter iter) {
@@ -851,15 +767,6 @@ public class Sidebar.Tree : Gtk.TreeView {
         }
     }
     
-    private void on_theme_change() {
-        Gtk.TreeIter iter;
-        if (store.get_iter_first(out iter)) {
-            do {
-                load_branch_icons(iter);
-            } while (store.iter_next(ref iter));
-        }
-    }
-    
     private bool on_selection(Gtk.TreeSelection selection, Gtk.TreeModel model, Gtk.TreePath path,
         bool path_currently_selected) {
         // only allow selection if a page is selectable
