Merge remote-tracking branch 'origin/4.0'

Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb

5 files changed, 5 insertions, 11 deletions

diff --git a/src/plugins/imageviewer/images/background.png b/src/plugins/imageviewer/images/background.png
deleted file mode 100644
index 93a092ab13..0000000000
--- a/src/plugins/imageviewer/images/background.png
+++ /dev/null
diff --git a/src/plugins/imageviewer/images/originalsize.png b/src/plugins/imageviewer/images/originalsize.png
deleted file mode 100644
index 133378a8e7..0000000000
--- a/src/plugins/imageviewer/images/originalsize.png
+++ /dev/null
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 5710174a1d..f3121d62d0 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -101,11 +101,15 @@ void ImageViewer::ctor()
     d->toolbar = new QWidget();
     d->ui_toolbar.setupUi(d->toolbar);
     d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"),
-                                                                  Core::Icons::SAVEFILE.icon()));
+                                                                  Core::Icons::SAVEFILE_TOOLBAR.icon()));
+    const Utils::Icon backgroundIcon({
+            {QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}});
+    d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon());
     d->ui_toolbar.toolButtonOutline->setIcon(Core::Icons::BOUNDING_RECT.icon());
     d->ui_toolbar.toolButtonZoomIn->setIcon(Core::Icons::PLUS.icon());
     d->ui_toolbar.toolButtonZoomOut->setIcon(Core::Icons::MINUS.icon());
     d->ui_toolbar.toolButtonFitToScreen->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
+    d->ui_toolbar.toolButtonOriginalSize->setIcon(Core::Icons::EYE_OPEN_TOOLBAR.icon());
     // icons update - try to use system theme
     updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomIn, QLatin1String("zoom-in"));
     updateButtonIconByTheme(d->ui_toolbar.toolButtonZoomOut, QLatin1String("zoom-out"));
diff --git a/src/plugins/imageviewer/imageviewer.qrc b/src/plugins/imageviewer/imageviewer.qrc
index 60678a9ced..c62bf29a21 100644
--- a/src/plugins/imageviewer/imageviewer.qrc
+++ b/src/plugins/imageviewer/imageviewer.qrc
@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/imageviewer">
-        <file>images/originalsize.png</file>
-        <file>images/background.png</file>
         <file>ImageViewer.mimetypes.xml</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/imageviewer/imageviewertoolbar.ui b/src/plugins/imageviewer/imageviewertoolbar.ui
index 4dec6dc66e..0a230946d3 100644
--- a/src/plugins/imageviewer/imageviewertoolbar.ui
+++ b/src/plugins/imageviewer/imageviewertoolbar.ui
@@ -29,10 +29,6 @@
      <property name="toolTipBase">
       <string>Show Background</string>
      </property>
-     <property name="icon">
-      <iconset resource="imageviewer.qrc">
-       <normaloff>:/imageviewer/images/background.png</normaloff>:/imageviewer/images/background.png</iconset>
-     </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
@@ -69,10 +65,6 @@
      <property name="toolTipBase">
       <string>Original Size</string>
      </property>
-     <property name="icon">
-      <iconset resource="imageviewer.qrc">
-       <normaloff>:/imageviewer/images/originalsize.png</normaloff>:/imageviewer/images/originalsize.png</iconset>
-     </property>
     </widget>
    </item>
    <item>