diff --git a/AUTHORS b/AUTHORS
index 65784988..e913bdf0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,6 @@
-Written by:
+Maintainer:
 Hylke Bons <hylkebons@gmail.com>
 
 Artwork by:
 Lapo Calamandrei <calamandrei@gmail.com>
-
-Special thanks to:
+Jakub Steiner <jimmac@novell.com>
diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index 1c609776..f99238d9 100644
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -45,18 +45,17 @@ namespace SparkleShare {
 
 				Menu.Add (new SeparatorMenuItem ());
 
+				MenuItem [] FolderItems =
+					new MenuItem [SparkleShare.Repositories.Length];
+				int i = 0;
 				foreach (SparkleRepo SparkleRepo in SparkleShare.Repositories) {
-
-					ImageMenuItem FolderItem = new ImageMenuItem (SparkleRepo.Name);
-					FolderItem.Image = new Image (SparkleHelpers.GetIcon ("folder", 16));
-	
-					FolderItem.Activated += delegate {
+					FolderItems [i] = new MenuItem (SparkleRepo.Name);
+					FolderItems [i].Activated += delegate {
 						SparkleWindow SparkleWindow = new SparkleWindow (SparkleRepo);
 						SparkleWindow.ShowAll ();
 					};
-
-					Menu.Add(FolderItem);
-	
+					Menu.Add(FolderItems [i]);
+					i++;
 				}
 
 				Menu.Add (new SeparatorMenuItem ());