diff --git a/Tomboy/Tray.cs b/Tomboy/Tray.cs
index f6e5fc3..faeda6e 100644
--- a/Tomboy/Tray.cs
+++ b/Tomboy/Tray.cs
@@ -149,8 +149,14 @@ namespace Tomboy
 			tray = new TomboyTray (manager, this);
 			keybinder = new TomboyPrefsKeybinder (manager, this);
 			int panel_size = 22;
-			Pixbuf = GuiUtils.GetIcon ("tomboy", panel_size);
 
+			// Load Icon to display in the notification area.
+			// First we try the "tomboy-panel" icon. This icon can be replaced
+			// by the user's icon theme. If the theme does not have this icon
+			// then we fall back to the Tomboy Menu icon named "tomboy".
+			Pixbuf = GuiUtils.GetIcon ("tomboy-panel", panel_size);
+            if (Pixbuf == null) Pixbuf = GuiUtils.GetIcon ("tomboy", panel_size);
+    
 			Tooltip = TomboyTrayUtils.GetToolTipText ();
 
 			Tomboy.ExitingEvent += OnExit;
