diff --git a/TODO b/TODO
index c25964316..51da1d9ef 100644
--- a/TODO
+++ b/TODO
@@ -10,5 +10,4 @@ The list is not sorted by priority.
 * Password Manager: save more than one account for site + input completer
 * New LocationBar completer
 * (KDE) Nepomuk integration
-* Own FileType detect for downloads (based on suffix)
 * Page previews as tooltip on tabs (like Opera)
diff --git a/src/lib/plugins/plugininterface.h b/src/lib/plugins/plugininterface.h
index 2afd01e6a..1774232f1 100644
--- a/src/lib/plugins/plugininterface.h
+++ b/src/lib/plugins/plugininterface.h
@@ -34,7 +34,7 @@ struct PluginSpec {
     QString description;
     QString author;
     QString version;
-    QIcon icon;
+    QPixmap icon;
     bool hasSettings;
 
     bool operator==(const PluginSpec &other) {
diff --git a/src/lib/plugins/plugins.cpp b/src/lib/plugins/plugins.cpp
index 171febea2..16c3a4c66 100644
--- a/src/lib/plugins/plugins.cpp
+++ b/src/lib/plugins/plugins.cpp
@@ -101,7 +101,6 @@ void Plugins::c2f_saveSettings()
     settings.endGroup();
 }
 
-
 void Plugins::loadPlugins()
 {
     if (!m_pluginsEnabled || m_pluginsLoaded) {
diff --git a/src/lib/preferences/pluginslist.cpp b/src/lib/preferences/pluginslist.cpp
index b269beff3..3700e0f22 100644
--- a/src/lib/preferences/pluginslist.cpp
+++ b/src/lib/preferences/pluginslist.cpp
@@ -151,7 +151,7 @@ void PluginsList::refresh()
         QString pluginInfo = tr("%1 (%2)\nAuthor: %3\n%4\n%5").arg(spec.name, spec.version, spec.author, spec.info, spec.description);
         item->setText(pluginInfo);
 
-        QIcon icon = spec.icon;
+        QIcon icon = QIcon(spec.icon);
         if (icon.isNull()) {
             icon = QIcon(":/icons/preferences/extension.png");
         }
diff --git a/src/plugins/MouseGestures/mousegesturesplugin.cpp b/src/plugins/MouseGestures/mousegesturesplugin.cpp
index 9f757d45f..d5bca66e0 100644
--- a/src/plugins/MouseGestures/mousegesturesplugin.cpp
+++ b/src/plugins/MouseGestures/mousegesturesplugin.cpp
@@ -17,7 +17,7 @@ PluginSpec MouseGesturesPlugin::pluginSpec()
     spec.description = "Provides support for navigating by mouse gestures through webpages";
     spec.version = "0.1.0";
     spec.author = "David Rosca <nowrep@gmail.com>";
-    spec.icon = QIcon(":/mousegestures/data/icon.png");
+    spec.icon = QPixmap(":/mousegestures/data/icon.png");
     spec.hasSettings = true;
 
     return spec;
diff --git a/src/plugins/MouseGestures/mousegesturessettingsdialog.ui b/src/plugins/MouseGestures/mousegesturessettingsdialog.ui
index 63c0bcb8b..9d5250721 100644
--- a/src/plugins/MouseGestures/mousegesturessettingsdialog.ui
+++ b/src/plugins/MouseGestures/mousegesturessettingsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>502</width>
-    <height>325</height>
+    <height>355</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -58,6 +58,19 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QLabel" name="label_17">
+     <property name="text">
+      <string>Press and hold the middle mouse button and move your mouse in the indicated directions.</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp
index bfbd702e3..2302cd17c 100644
--- a/src/plugins/TestPlugin/testplugin.cpp
+++ b/src/plugins/TestPlugin/testplugin.cpp
@@ -20,7 +20,7 @@ PluginSpec TestPlugin::pluginSpec()
     spec.description = "Very simple minimal plugin example";
     spec.version = "0.0.1";
     spec.author = "David Rosca <nowrep@gmail.com>";
-    spec.icon = QIcon(":qupzilla.png");
+    spec.icon = QPixmap(":qupzilla.png");
     spec.hasSettings = true;
 
     return spec;
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 2e1556e35..53f8e7505 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,2 +1,5 @@
 TEMPLATE = subdirs
-SUBDIRS  = TestPlugin MouseGestures
+SUBDIRS  = MouseGestures
+
+# TestPlugin only in debug build
+CONFIG(debug, debug|release): SUBDIRS += TestPlugin