--- gnome-panel-2.16.0/gnome-panel/panel-menu-button.c	2006-09-21 16:21:12.547123000 +0200
+++ ../gnome-panel-2.16.0/gnome-panel/panel-menu-button.c	2006-09-21 16:15:16.549802000 +0200
@@ -692,7 +692,7 @@
 			       "tooltip", tooltip,
 			       "use-menu-path", use_menu_path,
 			       "use-custom-icon", use_custom_icon,
-			       "has-arrow", TRUE,
+			       "has-arrow", FALSE,
 			       NULL);
 
 	info = panel_applet_register (GTK_WIDGET (button), NULL, NULL,
@@ -772,7 +772,23 @@
 	}
 
 	if (!retval)
-		retval = g_strdup (PANEL_MAIN_MENU_ICON);
+	  {
+	    static gboolean inited = FALSE;
+	    static gboolean has_sun_branding = FALSE;
+
+	    if (!inited)
+	      {
+		GtkIconTheme *theme = gtk_icon_theme_get_default ();
+		if (gtk_icon_theme_has_icon (theme, "sun-start-here"))
+		  has_sun_branding = TRUE;
+		inited = TRUE;
+	      }
+
+	    if (has_sun_branding)
+	      retval = g_strdup ("sun-start-here");
+	    else
+	      retval = g_strdup (PANEL_MAIN_MENU_ICON);
+	  }
 
 	return retval;
 }