diff --git a/thunar/thunar-device.c b/thunar/thunar-device.c
index 4933e344c..c8ae3e734 100644
--- a/thunar/thunar-device.c
+++ b/thunar/thunar-device.c
@@ -344,9 +344,9 @@ thunar_device_get_icon (const ThunarDevice *device)
   _thunar_return_val_if_fail (THUNAR_IS_DEVICE (device), NULL);
 
   if (G_IS_VOLUME (device->device))
-    return g_volume_get_icon (device->device);
+    return g_volume_get_symbolic_icon (device->device);
   else if (G_IS_MOUNT (device->device))
-   return g_mount_get_icon (device->device);
+   return g_mount_get_symbolic_icon (device->device);
   else
     _thunar_assert_not_reached ();
 
diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
index 7d3be1adf..19c375e74 100644
--- a/thunar/thunar-icon-factory.c
+++ b/thunar/thunar-icon-factory.c
@@ -579,7 +579,7 @@ thunar_icon_factory_lookup_icon (ThunarIconFactory *factory,
             name = "folder";
 
           /* check if the icon theme contains an icon of that name */
-          icon_info = gtk_icon_theme_lookup_icon (factory->icon_theme, name, size, GTK_ICON_LOOKUP_FORCE_SIZE);
+          icon_info = gtk_icon_theme_lookup_icon (factory->icon_theme, name, size, GTK_ICON_LOOKUP_FORCE_SIZE | GTK_ICON_LOOKUP_FORCE_SYMBOLIC);
           if (G_LIKELY (icon_info != NULL))
             {
               /* try to load the pixbuf from the icon info */
diff --git a/thunar/thunar-shortcuts-icon-renderer.c b/thunar/thunar-shortcuts-icon-renderer.c
index 879e292b9..843927b72 100644
--- a/thunar/thunar-shortcuts-icon-renderer.c
+++ b/thunar/thunar-shortcuts-icon-renderer.c
@@ -238,7 +238,8 @@ thunar_shortcuts_icon_renderer_render (GtkCellRenderer     *renderer,
 
       icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, cell_area->width,
                                                   GTK_ICON_LOOKUP_USE_BUILTIN |
-                                                  GTK_ICON_LOOKUP_FORCE_SIZE);
+                                                  GTK_ICON_LOOKUP_FORCE_SIZE |
+                                                  GTK_ICON_LOOKUP_FORCE_SYMBOLIC);
       g_object_unref (gicon);
 
       /* try to load the icon */
diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
index aa38b705b..c341e6200 100644
--- a/thunar/thunar-shortcuts-model.c
+++ b/thunar/thunar-shortcuts-model.c
@@ -927,7 +927,7 @@ thunar_shortcuts_model_shortcut_devices (ThunarShortcutsModel *model)
   shortcut->group = THUNAR_SHORTCUT_GROUP_DEVICES_FILESYSTEM;
   shortcut->name = g_strdup (_("File System"));
   shortcut->file = thunar_file_get_for_uri ("file:///", NULL);
-  shortcut->gicon = g_themed_icon_new ("drive-harddisk");
+  shortcut->gicon = g_themed_icon_new ("drive-harddisk-symbolic");
   shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut);
   thunar_shortcuts_model_add_shortcut (model, shortcut);
 
@@ -969,7 +969,7 @@ thunar_shortcuts_model_shortcut_network (ThunarShortcutsModel *model)
   shortcut->group = THUNAR_SHORTCUT_GROUP_NETWORK_DEFAULT;
   shortcut->name = g_strdup (_("Browse Network"));
   shortcut->location = g_file_new_for_uri ("network://");
-  shortcut->gicon = g_themed_icon_new ("network-workgroup");
+  shortcut->gicon = g_themed_icon_new ("network-workgroup-symbolic");
   shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut);
   thunar_shortcuts_model_add_shortcut (model, shortcut);
 }
@@ -1001,7 +1001,7 @@ thunar_shortcuts_model_shortcut_places (ThunarShortcutsModel *model)
       shortcut = g_slice_new0 (ThunarShortcut);
       shortcut->group = THUNAR_SHORTCUT_GROUP_PLACES_DEFAULT;
       shortcut->file = file;
-      shortcut->gicon = g_themed_icon_new ("go-home");
+      shortcut->gicon = g_themed_icon_new ("go-home-symbolic");
       shortcut->sort_id = 0;
       shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut);
       thunar_shortcuts_model_add_shortcut (model, shortcut);
@@ -1276,7 +1276,7 @@ thunar_shortcuts_model_load_line (GFile       *file_path,
       /* create the shortcut entry */
       shortcut = g_slice_new0 (ThunarShortcut);
       shortcut->group = THUNAR_SHORTCUT_GROUP_PLACES_BOOKMARKS;
-      shortcut->gicon = g_themed_icon_new ("folder-remote");
+      shortcut->gicon = g_themed_icon_new ("folder-remote-symbolic");
       shortcut->location = g_object_ref (file_path);
       shortcut->sort_id = row_num;
       shortcut->hidden = thunar_shortcuts_model_get_hidden (model, shortcut);
@@ -1956,7 +1956,7 @@ thunar_shortcuts_model_add (ThunarShortcutsModel *model,
   else
     {
       shortcut->location = G_FILE (g_object_ref (G_OBJECT (location)));
-      shortcut->gicon = g_themed_icon_new ("folder-remote");
+      shortcut->gicon = g_themed_icon_new ("folder-remote-symbolic");
     }
 
   /* add the shortcut to the list at the given position */
diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index c5d749cbc..b9175ca7b 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -363,7 +363,7 @@ thunar_shortcuts_view_init (ThunarShortcutsView *view)
 
   /* allocate icon renderer for the eject symbol */
   renderer = gtk_cell_renderer_pixbuf_new ();
-  g_object_set (renderer, "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, "icon-name", "media-eject", NULL);
+  g_object_set (renderer, "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, "icon-name", "media-eject-symbolic", NULL);
   gtk_tree_view_column_pack_start (column_eject, renderer, FALSE);
   gtk_tree_view_column_set_attributes (column_eject, renderer,
                                        "visible", THUNAR_SHORTCUTS_MODEL_COLUMN_CAN_EJECT,