From f6bd5595b64378fb09b507d99870ba2a41cb2b62 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Fri, 3 Feb 2017 14:16:48 +0100
Subject: [PATCH] Preferences: Fix showing settings icon in Extensions tab

---
 src/lib/preferences/pluginslist.ui     | 8 +-------
 src/lib/preferences/pluginsmanager.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/lib/preferences/pluginslist.ui b/src/lib/preferences/pluginslist.ui
index e24f50555..bc23e2921 100644
--- a/src/lib/preferences/pluginslist.ui
+++ b/src/lib/preferences/pluginslist.ui
@@ -62,10 +62,6 @@
        <property name="text">
         <string>Settings</string>
        </property>
-       <property name="icon">
-        <iconset resource="../data/icons.qrc">
-         <normaloff>:/icons/preferences/preferences-desktop.png</normaloff>:/icons/preferences/preferences-desktop.png</iconset>
-       </property>
       </widget>
      </item>
      <item>
@@ -85,8 +81,6 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../data/icons.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/lib/preferences/pluginsmanager.cpp b/src/lib/preferences/pluginsmanager.cpp
index a76b86503..1f2ca6a47 100644
--- a/src/lib/preferences/pluginsmanager.cpp
+++ b/src/lib/preferences/pluginsmanager.cpp
@@ -1,6 +1,6 @@
 /* ============================================================
-* QupZilla - WebKit based browser
-* Copyright (C) 2010-2014  David Rosca <nowrep@gmail.com>
+* QupZilla - Qt web browser
+* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include "pluginlistdelegate.h"
 #include "qztools.h"
 #include "settings.h"
+#include "iconprovider.h"
 
 #include <QInputDialog>
 #include <QMessageBox>
@@ -35,6 +36,7 @@ PluginsManager::PluginsManager(QWidget* parent)
 {
     ui->setupUi(this);
     ui->list->setLayoutDirection(Qt::LeftToRight);
+    ui->butSettings->setIcon(IconProvider::settingsIcon());
 
     //Application Extensions
     Settings settings;
@@ -128,7 +130,7 @@ void PluginsManager::refresh()
         QListWidgetItem* item = new QListWidgetItem(ui->list);
         QIcon icon = QIcon(spec.icon);
         if (icon.isNull()) {
-            icon = QIcon(":/icons/preferences/extension.png");
+            icon = QIcon(QSL(":/icons/preferences/extensions.svg"));
         }
         item->setIcon(icon);