diff --git a/sugar/graphics/tray.py b/sugar/graphics/tray.py
new file mode 100644
index 00000000..bfc4ad1a
--- /dev/null
+++ b/sugar/graphics/tray.py
@@ -0,0 +1,89 @@
+# Copyright (C) 2007, One Laptop Per Child
+#
+# 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 gobject
+import gtk
+
+from sugar.graphics.toolbutton import ToolButton
+from sugar.graphics.icon import Icon
+
+class _TrayViewport(gtk.Viewport):
+    def __init__(self):
+        gobject.GObject.__init__(self)
+
+        self.set_shadow_type(gtk.SHADOW_NONE)
+
+        self.traybar = gtk.Toolbar()
+        self.traybar.set_show_arrow(False)
+        self.add(self.traybar)
+        self.traybar.show()
+
+    def scroll_right(self):
+        adj = self.get_hadjustment()
+        new_value = adj.value + self.allocation.width
+        adj.value = min(new_value, adj.upper - self.allocation.width)
+
+    def scroll_left(self):
+        adj = self.get_hadjustment()
+        new_value = adj.value - self.allocation.width
+        adj.value = max(adj.lower, new_value)
+
+class HTray(gtk.HBox):
+    def __init__(self, **kwargs):
+        gobject.GObject.__init__(self, **kwargs)
+
+        self._scroll_left = gtk.Button()
+        self._scroll_left.set_relief(gtk.RELIEF_NONE)
+        self._scroll_left.connect('clicked', self._scroll_left_cb)
+
+        icon = Icon(icon_name='go-left', icon_size=gtk.ICON_SIZE_MENU)
+        self._scroll_left.set_image(icon)
+        icon.show()
+
+        self.pack_start(self._scroll_left, False)
+        self._scroll_left.show()
+
+        self._viewport = _TrayViewport()
+        self.pack_start(self._viewport)
+        self._viewport.show()
+
+        self._scroll_right = gtk.Button()
+        self._scroll_right.set_relief(gtk.RELIEF_NONE)
+        self._scroll_right.connect('clicked', self._scroll_right_cb)
+
+        icon = Icon(icon_name='go-right', icon_size=gtk.ICON_SIZE_MENU)
+        self._scroll_right.set_image(icon)
+        icon.show()
+
+        self.pack_start(self._scroll_right, False)
+        self._scroll_right.show()
+
+    def _scroll_left_cb(self, button):
+        self._viewport.scroll_left()
+
+    def _scroll_right_cb(self, button):
+        self._viewport.scroll_right()
+
+    def add_item(self, item, index=-1):
+        self._viewport.traybar.insert(item, index)
+
+    def remove_item(self, index):
+        self._viewport.traybar.remove(item)
+
+class TrayButton(ToolButton):
+    def __init__(self, **kwargs):
+        ToolButton.__init__(self, **kwargs)
diff --git a/tests/graphics/tray.py b/tests/graphics/tray.py
new file mode 100644
index 00000000..8088fde7
--- /dev/null
+++ b/tests/graphics/tray.py
@@ -0,0 +1,50 @@
+# Copyright (C) 2007, 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.
+
+"""
+Test the sugar.graphics.icon.Icon widget.
+"""
+
+import gtk
+
+from sugar.graphics.tray import HTray
+from sugar.graphics.tray import TrayButton
+
+import common
+
+test = common.Test()
+
+box = gtk.VBox()
+
+tray = HTray()
+box.pack_start(tray, False)
+tray.show()
+
+theme_icons = gtk.icon_theme_get_default().list_icons()
+
+for i in range(0, 100):
+    button = TrayButton(icon_name=theme_icons[i])
+    tray.add_item(button)
+    button.show()
+
+test.pack_start(box)
+box.show()
+
+test.show()
+
+if __name__ == "__main__":
+    common.main(test)