8 files changed, 10 insertions, 6 deletions
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index f22d191b35..fe4759f44b 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -45,6 +45,7 @@
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QAction>
 #include <QStackedWidget>
@@ -282,16 +283,16 @@ DiffEditor::DiffEditor()
     m_whitespaceButtonAction = m_toolBar->addAction(tr("Ignore Whitespace"));
     m_whitespaceButtonAction->setCheckable(true);
 
-    m_toggleDescriptionAction = m_toolBar->addAction(QIcon(QLatin1String(Constants::ICON_TOP_BAR)),
-                                               QString());
+    m_toggleDescriptionAction = m_toolBar->addAction(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Constants::ICON_TOP_BAR)), QString());
     m_toggleDescriptionAction->setCheckable(true);
 
     m_reloadAction = m_toolBar->addAction(QIcon(QLatin1String(Core::Constants::ICON_RELOAD_GRAY)),
                                           tr("Reload Diff"));
     m_reloadAction->setToolTip(tr("Reload Diff"));
 
-    m_toggleSyncAction = m_toolBar->addAction(QIcon(QLatin1String(Core::Constants::ICON_LINK)),
-                                        QString());
+    m_toggleSyncAction = m_toolBar->addAction(
+                Utils::ThemeHelper::themedIcon(QLatin1String(Core::Constants::ICON_LINK)), QString());
     m_toggleSyncAction->setCheckable(true);
 
     m_viewSwitcherAction = m_toolBar->addAction(QIcon(), QString());
diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp
index 98e75f2ce2..bb70085c90 100644
--- a/src/plugins/diffeditor/diffview.cpp
+++ b/src/plugins/diffeditor/diffview.cpp
@@ -34,6 +34,7 @@
 #include "sidebysidediffeditorwidget.h"
 
 #include <utils/qtcassert.h>
+#include <utils/themehelper.h>
 
 #include <QCoreApplication>
 
@@ -96,7 +97,8 @@ void IDiffView::setSyncToolTip(const QString &text)
 UnifiedView::UnifiedView() : m_widget(0)
 {
     setId(UNIFIED_VIEW_ID);
-    setIcon(QIcon(QLatin1String(":/diffeditor/images/unifieddiff.png")));
+    setIcon(Utils::ThemeHelper::themedIcon(
+                QLatin1String(":/diffeditor/images/unifieddiff.png")));
     setToolTip(QCoreApplication::translate("DiffEditor::UnifiedView", "Switch to Unified Diff Editor"));
 }
 
@@ -152,7 +154,8 @@ void UnifiedView::setSync(bool sync)
 SideBySideView::SideBySideView() : m_widget(0)
 {
     setId(SIDE_BY_SIDE_VIEW_ID);
-    setIcon(QIcon(QLatin1String(":/diffeditor/images/sidebysidediff.png")));
+    setIcon(Utils::ThemeHelper::themedIcon(
+                QLatin1String(":/diffeditor/images/sidebysidediff.png")));
     setToolTip(QCoreApplication::translate("DiffEditor::SideBySideView",
                                            "Switch to Side By Side Diff Editor"));
     setSupportsSync(true);
diff --git a/src/plugins/diffeditor/images/sidebysidediff.png b/src/plugins/diffeditor/images/sidebysidediff.png
index f0b2e45844..21dfa6a0a5 100644
--- a/src/plugins/diffeditor/images/sidebysidediff.png
+++ b/src/plugins/diffeditor/images/sidebysidediff.png
diff --git a/src/plugins/diffeditor/images/sidebysidediff@2x.png b/src/plugins/diffeditor/images/sidebysidediff@2x.png
index 41476fffcd..d45d1b8d68 100644
--- a/src/plugins/diffeditor/images/sidebysidediff@2x.png
+++ b/src/plugins/diffeditor/images/sidebysidediff@2x.png
diff --git a/src/plugins/diffeditor/images/topbar.png b/src/plugins/diffeditor/images/topbar.png
index 7a15c16cab..1ba7235dea 100644
--- a/src/plugins/diffeditor/images/topbar.png
+++ b/src/plugins/diffeditor/images/topbar.png
diff --git a/src/plugins/diffeditor/images/topbar@2x.png b/src/plugins/diffeditor/images/topbar@2x.png
index 3a1c15c1bc..894bcbf587 100644
--- a/src/plugins/diffeditor/images/topbar@2x.png
+++ b/src/plugins/diffeditor/images/topbar@2x.png
diff --git a/src/plugins/diffeditor/images/unifieddiff.png b/src/plugins/diffeditor/images/unifieddiff.png
index 70975187e9..ff989cd5d2 100644
--- a/src/plugins/diffeditor/images/unifieddiff.png
+++ b/src/plugins/diffeditor/images/unifieddiff.png
diff --git a/src/plugins/diffeditor/images/unifieddiff@2x.png b/src/plugins/diffeditor/images/unifieddiff@2x.png
index bd7826f4e1..671f47dd55 100644
--- a/src/plugins/diffeditor/images/unifieddiff@2x.png
+++ b/src/plugins/diffeditor/images/unifieddiff@2x.png