diff --git a/shell/intro/colorpicker.py b/shell/intro/colorpicker.py
index d70d84cc..f418807b 100644
--- a/shell/intro/colorpicker.py
+++ b/shell/intro/colorpicker.py
@@ -26,7 +26,7 @@ class ColorPicker(hippo.CanvasBox, hippo.CanvasItem):
         self.props.orientation = hippo.ORIENTATION_HORIZONTAL
 
         self._xo = CanvasIcon(size=style.XLARGE_ICON_SIZE,
-                              icon_name='theme:xo')
+                              icon_name='theme:computer-xo')
         self._set_random_colors()
         self._xo.connect('activated', self._xo_activated_cb)
         self.append(self._xo)
diff --git a/shell/view/BuddyIcon.py b/shell/view/BuddyIcon.py
index f16b71cd..5079fe5b 100644
--- a/shell/view/BuddyIcon.py
+++ b/shell/view/BuddyIcon.py
@@ -20,7 +20,7 @@ from view.BuddyMenu import BuddyMenu
 
 class BuddyIcon(CanvasIcon):
     def __init__(self, shell, buddy):
-        CanvasIcon.__init__(self, icon_name='theme:xo',
+        CanvasIcon.__init__(self, icon_name='theme:computer-xo',
                             xo_color=buddy.get_color())
 
         self._shell = shell
diff --git a/shell/view/home/MyIcon.py b/shell/view/home/MyIcon.py
index f4013b97..894bd83e 100644
--- a/shell/view/home/MyIcon.py
+++ b/shell/view/home/MyIcon.py
@@ -20,5 +20,5 @@ from sugar import profile
 class MyIcon(CanvasIcon):
     def __init__(self, size):
         CanvasIcon.__init__(self, size=size,
-                            icon_name='theme:xo',
+                            icon_name='theme:computer-xo',
                             xo_color=profile.get_color())