diff --git a/SparkleShare/SparkleDialog.cs b/SparkleShare/SparkleDialog.cs
index 3e115e78..14855203 100644
--- a/SparkleShare/SparkleDialog.cs
+++ b/SparkleShare/SparkleDialog.cs
@@ -52,19 +52,33 @@ namespace SparkleShare {
 				
 				RemoteUrlCombo = new ComboBoxEntry ();
 
-				ListStore Defaults = new ListStore (typeof (string));
+				ListStore Defaults = new ListStore (typeof (string),
+				                                    typeof (Gdk.Pixbuf));
+
+
+
 
-				Defaults.AppendValues ("ssh://git@github.com/");
-				Defaults.AppendValues ("ssh://git@git.gnome.org/");
-				Defaults.AppendValues ("ssh://git@fedorahosted.org/");
-				Defaults.AppendValues ("ssh://git@gitorious.org/");
-				
 				RemoteUrlCombo.Entry.Completion = new EntryCompletion ();
+
+				CellRendererPixbuf CellRendererPixbuf = new CellRendererPixbuf ();
 				RemoteUrlCombo.Entry.Completion.Model = Defaults;
+				RemoteUrlCombo.Entry.Completion.PackStart (CellRendererPixbuf, false);
+				RemoteUrlCombo.Entry.Completion.AddAttribute (CellRendererPixbuf, "pixbuf", 1);
+				RemoteUrlCombo.Entry.Completion.InlineCompletion = true;
+				RemoteUrlCombo.Entry.Completion.PopupCompletion = true;;
 				RemoteUrlCombo.Entry.Completion.TextColumn = 0;
 
+				Defaults.AppendValues ("ssh://git@github.com/",
+				                       SparkleHelpers.GetIcon ("github", 16));
+				Defaults.AppendValues ("ssh://git@git.gnome.org/",
+				                       SparkleHelpers.GetIcon ("gnome", 16));
+				Defaults.AppendValues ("ssh://git@fedorahosted.org/",
+				                       SparkleHelpers.GetIcon ("fedorahosted", 16));
+				Defaults.AppendValues ("ssh://git@gitorious.org/",
+				                       null);
+
 				Label RemoteUrlExample = new Label (_("These usually look something like this:\n ") +
-				                                    _("‘sparkle://sparkleshare.org/SparkleShare’."));
+				                                    _("‘git://git@gnome.org/project’."));
 
 				RemoteUrlExample.UseMarkup = true;
 				RemoteUrlExample.SetAlignment (0, 0);
diff --git a/SparkleShare/SparkleHelpers.cs b/SparkleShare/SparkleHelpers.cs
index a4b1a53d..47b580e9 100644
--- a/SparkleShare/SparkleHelpers.cs
+++ b/SparkleShare/SparkleHelpers.cs
@@ -91,7 +91,10 @@ namespace SparkleShare {
 
 		// Looks up an icon from the system's theme
 		public static Gdk.Pixbuf GetIcon (string Name, int Size) {
-			SparkleTheme.AppendSearchPath (SparklePaths.SparkleInstallPath);
+
+			SparkleTheme.AppendSearchPath
+				(CombineMore (SparklePaths.SparkleInstallPath, "icons"));
+
 			return SparkleTheme.LoadIcon (Name, Size,
 			                              IconLookupFlags.GenericFallback);
 		}
diff --git a/data/icons/hicolor/16x16/places/fedorahosted.png b/data/icons/hicolor/16x16/places/fedorahosted.png
new file mode 100644
index 00000000..84287bbb
Binary files /dev/null and b/data/icons/hicolor/16x16/places/fedorahosted.png differ
diff --git a/data/icons/hicolor/16x16/places/github.png b/data/icons/hicolor/16x16/places/github.png
new file mode 100644
index 00000000..88a932f1
Binary files /dev/null and b/data/icons/hicolor/16x16/places/github.png differ
diff --git a/data/icons/hicolor/16x16/places/gnome.png b/data/icons/hicolor/16x16/places/gnome.png
new file mode 100644
index 00000000..95c4ff6e
Binary files /dev/null and b/data/icons/hicolor/16x16/places/gnome.png differ