diff --git a/gnome-panel/panel-icon-names.h b/gnome-panel/panel-icon-names.h
index b972b21..d84b434 100644
--- a/gnome-panel/panel-icon-names.h
+++ b/gnome-panel/panel-icon-names.h
@@ -8,6 +8,13 @@
 #define PANEL_ICON_DRAWER		"gnome-panel-drawer"
 #define PANEL_ICON_FILESYSTEM		"drive-harddisk"
 #define PANEL_ICON_FOLDER		"folder"
+#define PANEL_ICON_FOLDER_DOCUMENTS		"folder-documents"
+#define PANEL_ICON_FOLDER_DOWNLOAD		"folder-download"
+#define PANEL_ICON_FOLDER_MUSIC		"folder-music"
+#define PANEL_ICON_FOLDER_PICTURES		"folder-pictures"
+#define PANEL_ICON_FOLDER_PUBLIC_SHARE		"folder-publicshare"
+#define PANEL_ICON_FOLDER_TEMPLATES		"folder-templates"
+#define PANEL_ICON_FOLDER_VIDEOS		"folder-videos"
 #define PANEL_ICON_FONTS		"preferences-desktop-font"
 #define PANEL_ICON_FORCE_QUIT		"gnome-panel-force-quit"
 #define PANEL_ICON_HOME			"user-home"
diff --git a/gnome-panel/panel-menu-items.c b/gnome-panel/panel-menu-items.c
index 901bbeb..fda335b 100644
--- a/gnome-panel/panel-menu-items.c
+++ b/gnome-panel/panel-menu-items.c
@@ -450,6 +450,7 @@ panel_place_menu_item_append_gtk_bookmarks (GtkWidget *menu)
 		char *tooltip;
 		char *label;
 		char *icon;
+		GIcon *gicon;
 		GFile *file;
 
 		bookmark = l->data;
@@ -489,8 +490,10 @@ panel_place_menu_item_append_gtk_bookmarks (GtkWidget *menu)
 		if (!icon)
 			icon = g_strdup (PANEL_ICON_FOLDER);
 
+		gicon = g_themed_icon_new_with_default_fallbacks (icon);
+		
 		//FIXME: drag and drop will be broken for x-nautilus-search uris
-		panel_menu_items_append_place_item (icon, NULL,
+		panel_menu_items_append_place_item (icon, gicon,
 						    label,
 						    tooltip,
 						    add_menu,
@@ -498,6 +501,7 @@ panel_place_menu_item_append_gtk_bookmarks (GtkWidget *menu)
 						    bookmark->full_uri);
 
 		g_free (icon);
+		g_object_unref (gicon);
 		g_free (tooltip);
 		g_free (label);
 		g_free (bookmark->full_uri);
diff --git a/gnome-panel/panel-util.c b/gnome-panel/panel-util.c
index 4b00d91..6446f9a 100644
--- a/gnome-panel/panel-util.c
+++ b/gnome-panel/panel-util.c
@@ -962,6 +962,27 @@ panel_util_get_icon_for_uri_known_folders (const char *uri)
 	else if (strcmp (path,
 			 g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)) == 0)
 		icon = PANEL_ICON_DESKTOP;
+	else if (g_strcmp0 (path,
+			 g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS)) == 0)
+		icon = PANEL_ICON_FOLDER_DOCUMENTS;
+	else if (g_strcmp0 (path,
+			 g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD)) == 0)
+		icon = PANEL_ICON_FOLDER_DOWNLOAD;
+	else if (g_strcmp0 (path,
+			 g_get_user_special_dir (G_USER_DIRECTORY_MUSIC)) == 0)
+		icon = PANEL_ICON_FOLDER_MUSIC;
+	else if (g_strcmp0 (path,
+			 g_get_user_special_dir (G_USER_DIRECTORY_PICTURES)) == 0)
+		icon = PANEL_ICON_FOLDER_PICTURES;
+	else if (g_strcmp0 (path,
+			 g_get_user_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE)) == 0)
+		icon = PANEL_ICON_FOLDER_PUBLIC_SHARE;
+	else if (g_strcmp0 (path,
+			 g_get_user_special_dir (G_USER_DIRECTORY_TEMPLATES)) == 0)
+		icon = PANEL_ICON_FOLDER_TEMPLATES;
+	else if (g_strcmp0 (path,
+			 g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS)) == 0)
+		icon = PANEL_ICON_FOLDER_VIDEOS;
 
 	g_free (path);
 
