diff --git a/sugar/graphics/icon.py b/sugar/graphics/icon.py
new file mode 100644
index 00000000..84200e62
--- /dev/null
+++ b/sugar/graphics/icon.py
@@ -0,0 +1,41 @@
+# Copyright (C) 2006, Red Hat, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+import gtk
+
+class Icon(gtk.Image):
+    def __init__(self, icon_resource, size=gtk.ICON_SIZE_LARGE_TOOLBAR):
+        gtk.Image.__init__(self)
+
+        icon_theme = gtk.icon_theme_get_for_screen(self.get_screen())
+        icon_set = gtk.IconSet()
+
+        normal_name = icon_resource
+        if icon_theme.has_icon(normal_name):
+            source = gtk.IconSource()
+            source.set_icon_name(normal_name)
+            icon_set.add_source(source)
+
+        inactive_name = icon_resource + '-inactive'
+        if icon_theme.has_icon(inactive_name):
+            source = gtk.IconSource()
+            source.set_icon_name(inactive_name)
+            source.set_state(gtk.STATE_INSENSITIVE)
+            icon_set.add_source(source)
+            
+        self.set_from_icon_set(icon_set, size)
+
diff --git a/sugar/graphics/toolbutton.py b/sugar/graphics/toolbutton.py
index a8c7abae..541f6c93 100644
--- a/sugar/graphics/toolbutton.py
+++ b/sugar/graphics/toolbutton.py
@@ -17,9 +17,12 @@
 
 import gtk
 
+from sugar.graphics.icon import Icon
+
 class ToolButton(gtk.ToolButton):
-    def __init__(self, icon_name=None):
+    def __init__(self, icon_resource=None):
         gtk.ToolButton.__init__(self)
         
-        if icon_name:
-            self.set_icon_name(icon_name) 
+        icon = Icon(icon_resource)
+        self.set_icon_widget(icon)
+        icon.show()