diff --git a/src/core/iconmapper.h b/src/core/iconmapper.h
index a052804a0..162732767 100644
--- a/src/core/iconmapper.h
+++ b/src/core/iconmapper.h
@@ -38,7 +38,7 @@ static const QMap<QString, IconProperties> iconmapper_ = {
     { "alsa",                          { {}, 0, 0 } },
     { "application-exit",              { {}, 0, 0 } },
     { "applications-internet",         { {}, 0, 0 } },
-    { "bluetooth",                     { {}, 0, 0 } },
+    { "bluetooth",                     { {"preferences-system-bluetooth", "bluetooth-active"}, 0, 0 } },
     { "cdcase",                        { {"cdcover", "media-optical"}, 0, 0 } },
     { "media-optical",                 { {"cd"}, 0, 0 } },
     { "configure",                     { {}, 0, 0 } },
@@ -80,11 +80,11 @@ static const QMap<QString, IconProperties> iconmapper_ = {
     { "go-next",                       { {}, 0, 0 } },
     { "go-previous",                   { {}, 0, 0 } },
     { "go-up",                         { {}, 0, 0 } },
-    { "gstreamer",                     { {}, 0, 0 } },
-    { "headset",                       { {}, 0, 0 } },
+    { "gstreamer",                     { {"phonon-gstreamer"}, 0, 0 } },
+    { "headset",                       { {"audio-headset"}, 0, 0 } },
     { "help-hint",                     { {}, 0, 0 } },
     { "intel",                         { {}, 0, 0 } },
-    { "jack",                          { {}, 0, 0 } },
+    { "jack",                          { {"audio-input-line"}, 0, 0 } },
     { "keyboard",                      { {"input-keyboard"}, 0, 0 } },
     { "list-add",                      { {}, 0, 0 } },
     { "list-remove",                   { {}, 0, 0 } },