diff --git a/src/plugins/projectexplorer/images/targetaddbutton_disabled.png b/src/plugins/projectexplorer/images/targetaddbutton_disabled.png
new file mode 100644
index 00000000000..c120cc927ce
Binary files /dev/null and b/src/plugins/projectexplorer/images/targetaddbutton_disabled.png differ
diff --git a/src/plugins/projectexplorer/images/targetremovebutton_disabled.png b/src/plugins/projectexplorer/images/targetremovebutton_disabled.png
new file mode 100644
index 00000000000..499647ccb99
Binary files /dev/null and b/src/plugins/projectexplorer/images/targetremovebutton_disabled.png differ
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index 4430687501e..ed37bd29433 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -40,5 +40,7 @@
         <file>images/build.png</file>
         <file>images/targetpanel_bottom.png</file>
         <file>images/targetpanel_gradient.png</file>
+        <file>images/targetaddbutton_disabled.png</file>
+        <file>images/targetremovebutton_disabled.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/projectexplorer/targetselector.cpp b/src/plugins/projectexplorer/targetselector.cpp
index 63d82fe3447..571d1c77418 100644
--- a/src/plugins/projectexplorer/targetselector.cpp
+++ b/src/plugins/projectexplorer/targetselector.cpp
@@ -18,7 +18,9 @@ TargetSelector::TargetSelector(QWidget *parent) :
     m_runselected(QLatin1String(":/projectexplorer/images/targetrunselected.png")),
     m_buildselected(QLatin1String(":/projectexplorer/images/targetbuildselected.png")),
     m_targetaddbutton(QLatin1String(":/projectexplorer/images/targetaddbutton.png")),
+    m_targetaddbuttondisabled(QLatin1String(":/projectexplorer/images/targetaddbutton_disabled.png")),
     m_targetremovebutton(QLatin1String(":/projectexplorer/images/targetremovebutton.png")),
+    m_targetremovebuttondisabled(QLatin1String(":/projectexplorer/images/targetremovebutton_disabled.png")),
     m_currentTargetIndex(-1),
     m_addButtonEnabled(true),
     m_removeButtonEnabled(false)
@@ -190,7 +192,10 @@ void TargetSelector::paintEvent(QPaintEvent *event)
     int x = 1;
     int index = 0;
     QFontMetrics fm(font());
-    p.drawPixmap(x, 1, m_targetremovebutton);
+    if (m_removeButtonEnabled)
+        p.drawPixmap(x, 1, m_targetremovebutton);
+    else
+        p.drawPixmap(x, 1, m_targetremovebuttondisabled);
     x += m_targetremovebutton.width();
     p.setPen(QColor(0, 0, 0));
     p.drawLine(x, 1, x, TARGET_HEIGHT);
@@ -221,5 +226,8 @@ void TargetSelector::paintEvent(QPaintEvent *event)
         ++index;
     }
     // draw add button
-    p.drawPixmap(x, 1, m_targetaddbutton);
+    if (m_addButtonEnabled)
+        p.drawPixmap(x, 1, m_targetaddbutton);
+    else
+        p.drawPixmap(x, 1, m_targetaddbuttondisabled);
 }
diff --git a/src/plugins/projectexplorer/targetselector.h b/src/plugins/projectexplorer/targetselector.h
index 1c06f6dc171..1fa02329514 100644
--- a/src/plugins/projectexplorer/targetselector.h
+++ b/src/plugins/projectexplorer/targetselector.h
@@ -53,7 +53,9 @@ private:
     const QPixmap m_runselected;
     const QPixmap m_buildselected;
     const QPixmap m_targetaddbutton;
+    const QPixmap m_targetaddbuttondisabled;
     const QPixmap m_targetremovebutton;
+    const QPixmap m_targetremovebuttondisabled;
 
     QList<Target> m_targets;