diff --git a/src/plugins/projectexplorer/projectexplorericons.cpp b/src/plugins/projectexplorer/projectexplorericons.cpp
index 7ae3a28128c..e86fe915bc3 100644
--- a/src/plugins/projectexplorer/projectexplorericons.cpp
+++ b/src/plugins/projectexplorer/projectexplorericons.cpp
@@ -44,10 +44,16 @@ const Icon RUN_FLAT({
 const Icon WINDOW(":/projectexplorer/images/window.png");
 const Icon DEBUG_START(":/projectexplorer/images/debugger_start.png");
 const Icon DEVICE_READY_INDICATOR({
+        {":/utils/images/filledcircle.png", Theme::IconsRunColor}}, Icon::Tint);
+const Icon DEVICE_READY_INDICATOR_OVERLAY({
         {":/projectexplorer/images/devicestatusindicator.png", Theme::IconsRunToolBarColor}});
 const Icon DEVICE_CONNECTED_INDICATOR({
+        {":/utils/images/filledcircle.png", Theme::IconsWarningColor}}, Icon::Tint);
+const Icon DEVICE_CONNECTED_INDICATOR_OVERLAY({
         {":/projectexplorer/images/devicestatusindicator.png", Theme::IconsWarningToolBarColor}});
 const Icon DEVICE_DISCONNECTED_INDICATOR({
+        {":/utils/images/filledcircle.png", Theme::IconsStopColor}}, Icon::Tint);
+const Icon DEVICE_DISCONNECTED_INDICATOR_OVERLAY({
         {":/projectexplorer/images/devicestatusindicator.png", Theme::IconsStopToolBarColor}});
 
 const Icon DEBUG_START_FLAT({
diff --git a/src/plugins/projectexplorer/projectexplorericons.h b/src/plugins/projectexplorer/projectexplorericons.h
index 7b14ea97fba..fbef1896633 100644
--- a/src/plugins/projectexplorer/projectexplorericons.h
+++ b/src/plugins/projectexplorer/projectexplorericons.h
@@ -41,8 +41,11 @@ PROJECTEXPLORER_EXPORT extern const Utils::Icon RUN_FLAT;
 PROJECTEXPLORER_EXPORT extern const Utils::Icon WINDOW;
 PROJECTEXPLORER_EXPORT extern const Utils::Icon DEBUG_START;
 PROJECTEXPLORER_EXPORT extern const Utils::Icon DEVICE_READY_INDICATOR;
+PROJECTEXPLORER_EXPORT extern const Utils::Icon DEVICE_READY_INDICATOR_OVERLAY;
 PROJECTEXPLORER_EXPORT extern const Utils::Icon DEVICE_CONNECTED_INDICATOR;
+PROJECTEXPLORER_EXPORT extern const Utils::Icon DEVICE_CONNECTED_INDICATOR_OVERLAY;
 PROJECTEXPLORER_EXPORT extern const Utils::Icon DEVICE_DISCONNECTED_INDICATOR;
+PROJECTEXPLORER_EXPORT extern const Utils::Icon DEVICE_DISCONNECTED_INDICATOR_OVERLAY;
 
 PROJECTEXPLORER_EXPORT extern const Utils::Icon DEBUG_START_FLAT;
 PROJECTEXPLORER_EXPORT extern const Utils::Icon DEBUG_START_SMALL;
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index ec86c680b8b..1a45c8db4b1 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -723,7 +723,7 @@ void Target::updateDeviceState()
     IDevice::ConstPtr current = DeviceKitInformation::device(kit());
 
     QIcon overlay;
-    static const QIcon disconnected = Icons::DEVICE_DISCONNECTED_INDICATOR.icon();
+    static const QIcon disconnected = Icons::DEVICE_DISCONNECTED_INDICATOR_OVERLAY.icon();
     if (current.isNull()) {
         overlay = disconnected;
     } else {
@@ -733,12 +733,12 @@ void Target::updateDeviceState()
             setToolTip(QString());
             return;
         case IDevice::DeviceReadyToUse: {
-            static const QIcon ready = Icons::DEVICE_READY_INDICATOR.icon();
+            static const QIcon ready = Icons::DEVICE_READY_INDICATOR_OVERLAY.icon();
             overlay = ready;
             break;
         }
         case IDevice::DeviceConnected: {
-            static const QIcon connected = Icons::DEVICE_CONNECTED_INDICATOR.icon();
+            static const QIcon connected = Icons::DEVICE_CONNECTED_INDICATOR_OVERLAY.icon();
             overlay = connected;
             break;
         }