Index: Tomboy/Applet.cs
===================================================================
RCS file: /cvs/gnome/tomboy/Tomboy/Applet.cs,v
retrieving revision 1.21
diff -u -p -r1.21 Applet.cs
--- Tomboy/Applet.cs	26 Jul 2006 09:00:37 -0000	1.21
+++ Tomboy/Applet.cs	6 Sep 2006 01:41:27 -0000
@@ -43,6 +43,7 @@ namespace Tomboy
 			keybinder = new TomboyGConfXKeybinder (manager, tray);
 
 			Add (tray);
+			OnChangeSize (Size);
 			ShowAll ();
 
 			// Keep referenced so our callbacks don't get reaped.
@@ -114,6 +115,14 @@ namespace Tomboy
 				tray.Style = copy;
 				break;
 			}
+		}
+
+		protected override void OnChangeSize (uint size)
+		{
+			if (tray == null)
+				return;
+
+			tray.Image.Pixbuf = GuiUtils.GetIcon ("tomboy", (int)size);
 		}
 	}
 
Index: Tomboy/Tray.cs
===================================================================
RCS file: /cvs/gnome/tomboy/Tomboy/Tray.cs,v
retrieving revision 1.45
diff -u -p -r1.45 Tray.cs
--- Tomboy/Tray.cs	9 Aug 2006 19:18:32 -0000	1.45
+++ Tomboy/Tray.cs	6 Sep 2006 01:41:27 -0000
@@ -391,17 +391,6 @@ namespace Tomboy
 			}
 		}
 
-		protected override void OnSizeAllocated (Gdk.Rectangle rect)
-		{
-			base.OnSizeAllocated (rect);
-
-			int icon_size = Math.Min (rect.Height, rect.Width);
-			if (icon_size_last != icon_size) {
-				icon_size_last = icon_size;
-				image.Pixbuf = GuiUtils.GetIcon (GetIconName (), icon_size);
-			}
-		}
-
 		void ReloadIcon ()
 		{
 			icon_size_last = -1;
