diff --git a/sugar/activity/__init__.py b/sugar/activity/__init__.py
index 94a1a083..959c0a1d 100644
--- a/sugar/activity/__init__.py
+++ b/sugar/activity/__init__.py
@@ -1,3 +1,13 @@
+import gtk
+
+from sugar.graphics.grid import Grid
+
+settings = gtk.settings_get_default()
+
+grid = Grid()
+sizes = 'gtk-large-toolbar=%d, %d' % (grid.dimension(1), grid.dimension(1))
+settings.set_string_property('gtk-icon-sizes', sizes, '')
+
 def get_default_type(activity_type):
 	"""Get the activity default type.
 
diff --git a/tests/test-theme.py b/tests/test-theme.py
index 88386f10..e049fb16 100755
--- a/tests/test-theme.py
+++ b/tests/test-theme.py
@@ -8,11 +8,6 @@ session = UITestSession()
 session.start()
 
 import gtk
-import goocanvas
-
-from sugar.graphics import IconColor
-from sugar.graphics.IconItem import IconItem
-from sugar.graphics.CanvasView import CanvasView
 
 # Main window
 window = gtk.Window()