diff --git a/src/plugins/autotest/autotest.qrc b/src/plugins/autotest/autotest.qrc
index f92f835e599..6bd7eac6d79 100644
--- a/src/plugins/autotest/autotest.qrc
+++ b/src/plugins/autotest/autotest.qrc
@@ -5,16 +5,6 @@
         <file>images/sort@2x.png</file>
         <file>images/leafsort.png</file>
         <file>images/leafsort@2x.png</file>
-        <file>images/debug.png</file>
-        <file>images/fail.png</file>
-        <file>images/fatal.png</file>
-        <file>images/pass.png</file>
-        <file>images/skip.png</file>
-        <file>images/warn.png</file>
-        <file>images/xfail.png</file>
-        <file>images/xpass.png</file>
-        <file>images/blacklisted_fail.png</file>
-        <file>images/blacklisted_pass.png</file>
         <file>images/benchmark.png</file>
         <file>images/runselected_boxes.png</file>
         <file>images/runselected_boxes@2x.png</file>
diff --git a/src/plugins/autotest/autotesticons.h b/src/plugins/autotest/autotesticons.h
index f7845b071f8..ae4a1527cfd 100644
--- a/src/plugins/autotest/autotesticons.h
+++ b/src/plugins/autotest/autotesticons.h
@@ -38,5 +38,39 @@ const Utils::Icon RUN_SELECTED_OVERLAY({
         {QLatin1String(":/images/runselected_boxes.png"), Utils::Theme::BackgroundColorDark},
         {QLatin1String(":/images/runselected_tickmarks.png"), Utils::Theme::IconsBaseColor}});
 
+const Utils::Icon RESULT_PASS({
+        {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestPassTextColor}},
+        Utils::Icon::Tint);
+const Utils::Icon RESULT_FAIL({
+        {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestFailTextColor}},
+        Utils::Icon::Tint);
+const Utils::Icon RESULT_XFAIL({
+        {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestXFailTextColor}},
+        Utils::Icon::Tint);
+const Utils::Icon RESULT_XPASS({
+        {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestXPassTextColor}},
+        Utils::Icon::Tint);
+const Utils::Icon RESULT_SKIP({
+        {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestSkipTextColor}},
+        Utils::Icon::Tint);
+const Utils::Icon RESULT_BLACKLISTEDPASS({
+        {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestPassTextColor},
+        {":/projectexplorer/images/buildstepdisable.png", Utils::Theme::PanelTextColorDark}},
+        Utils::Icon::Tint | Utils::Icon::PunchEdges);
+const Utils::Icon RESULT_BLACKLISTEDFAIL({
+        {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestFailTextColor},
+        {":/projectexplorer/images/buildstepdisable.png", Utils::Theme::PanelTextColorDark}},
+        Utils::Icon::Tint | Utils::Icon::PunchEdges);
+const Utils::Icon RESULT_BENCHMARK(":/images/benchmark.png");
+const Utils::Icon RESULT_MESSAGEDEBUG({
+        {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestDebugTextColor}},
+        Utils::Icon::Tint);
+const Utils::Icon RESULT_MESSAGEWARN({
+        {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestWarnTextColor}},
+        Utils::Icon::Tint);
+const Utils::Icon RESULT_MESSAGEFATAL({
+        {":/utils/images/filledcircle.png", Utils::Theme::OutputPanes_TestFatalTextColor}},
+        Utils::Icon::Tint);
+
 } // namespace Icons
 } // namespace Autotest
diff --git a/src/plugins/autotest/images/blacklisted_fail.png b/src/plugins/autotest/images/blacklisted_fail.png
deleted file mode 100644
index 695e1f92468..00000000000
Binary files a/src/plugins/autotest/images/blacklisted_fail.png and /dev/null differ
diff --git a/src/plugins/autotest/images/blacklisted_pass.png b/src/plugins/autotest/images/blacklisted_pass.png
deleted file mode 100644
index bac3ffb1342..00000000000
Binary files a/src/plugins/autotest/images/blacklisted_pass.png and /dev/null differ
diff --git a/src/plugins/autotest/images/debug.png b/src/plugins/autotest/images/debug.png
deleted file mode 100644
index e18bd157e4a..00000000000
Binary files a/src/plugins/autotest/images/debug.png and /dev/null differ
diff --git a/src/plugins/autotest/images/fail.png b/src/plugins/autotest/images/fail.png
deleted file mode 100644
index 38c0d1463a9..00000000000
Binary files a/src/plugins/autotest/images/fail.png and /dev/null differ
diff --git a/src/plugins/autotest/images/fatal.png b/src/plugins/autotest/images/fatal.png
deleted file mode 100644
index 4e0bf77474a..00000000000
Binary files a/src/plugins/autotest/images/fatal.png and /dev/null differ
diff --git a/src/plugins/autotest/images/pass.png b/src/plugins/autotest/images/pass.png
deleted file mode 100644
index 33dbe44649e..00000000000
Binary files a/src/plugins/autotest/images/pass.png and /dev/null differ
diff --git a/src/plugins/autotest/images/skip.png b/src/plugins/autotest/images/skip.png
deleted file mode 100644
index 9dfea415f16..00000000000
Binary files a/src/plugins/autotest/images/skip.png and /dev/null differ
diff --git a/src/plugins/autotest/images/warn.png b/src/plugins/autotest/images/warn.png
deleted file mode 100644
index a813c1dc9a6..00000000000
Binary files a/src/plugins/autotest/images/warn.png and /dev/null differ
diff --git a/src/plugins/autotest/images/xfail.png b/src/plugins/autotest/images/xfail.png
deleted file mode 100644
index deeafe7d941..00000000000
Binary files a/src/plugins/autotest/images/xfail.png and /dev/null differ
diff --git a/src/plugins/autotest/images/xpass.png b/src/plugins/autotest/images/xpass.png
deleted file mode 100644
index 964bb4a181e..00000000000
Binary files a/src/plugins/autotest/images/xpass.png and /dev/null differ
diff --git a/src/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp
index 2d4ddfd19ad..51dcbca4268 100644
--- a/src/plugins/autotest/testresultmodel.cpp
+++ b/src/plugins/autotest/testresultmodel.cpp
@@ -23,6 +23,7 @@
 **
 ****************************************************************************/
 
+#include "autotesticons.h"
 #include "testresultdelegate.h"
 #include "testresultmodel.h"
 
@@ -46,20 +47,20 @@ TestResultItem::~TestResultItem()
 }
 
 static QIcon testResultIcon(Result::Type result) {
-    static QIcon icons[] = {
-        QIcon(QLatin1String(":/images/pass.png")),
-        QIcon(QLatin1String(":/images/fail.png")),
-        QIcon(QLatin1String(":/images/xfail.png")),
-        QIcon(QLatin1String(":/images/xpass.png")),
-        QIcon(QLatin1String(":/images/skip.png")),
-        QIcon(QLatin1String(":/images/blacklisted_pass.png")),
-        QIcon(QLatin1String(":/images/blacklisted_fail.png")),
-        QIcon(QLatin1String(":/images/benchmark.png")),
-        QIcon(QLatin1String(":/images/debug.png")),
-        QIcon(QLatin1String(":/images/debug.png")), // Info get's the same handling as Debug for now
-        QIcon(QLatin1String(":/images/warn.png")),
-        QIcon(QLatin1String(":/images/fatal.png")),
-        QIcon(QLatin1String(":/images/fatal.png")), // System get's same handling as Fatal for now
+    const static QIcon icons[] = {
+        Icons::RESULT_PASS.icon(),
+        Icons::RESULT_FAIL.icon(),
+        Icons::RESULT_XFAIL.icon(),
+        Icons::RESULT_XPASS.icon(),
+        Icons::RESULT_SKIP.icon(),
+        Icons::RESULT_BLACKLISTEDPASS.icon(),
+        Icons::RESULT_BLACKLISTEDFAIL.icon(),
+        Icons::RESULT_BENCHMARK.icon(),
+        Icons::RESULT_MESSAGEDEBUG.icon(),
+        Icons::RESULT_MESSAGEDEBUG.icon(), // Info gets the same handling as Debug for now
+        Icons::RESULT_MESSAGEWARN.icon(),
+        Icons::RESULT_MESSAGEFATAL.icon(),
+        Icons::RESULT_MESSAGEFATAL.icon(), // System gets same handling as Fatal for now
     }; // provide an icon for unknown??
 
     if (result < 0 || result >= Result::MessageInternal) {