diff --git a/AUTHORS b/AUTHORS
index 53344ff68..f4ef2df90 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,4 +34,5 @@ Special thanks:
 
 Jonathan Hooverman    <jonathan.hooverman@gmail.com>  (english language correction)
 Peter Vacula          <pvacula1989@gmail.com>         (for a big support in the beginnigs)
+Sergio Cipolla        <secipolla@gmail.com>           (modifications to QupZilla icon)
 Radomir Orkac                                         (qupzilla.com domain)
diff --git a/bin/themes/chrome/main.css b/bin/themes/chrome/main.css
index e287fb493..e41e6f5da 100644
--- a/bin/themes/chrome/main.css
+++ b/bin/themes/chrome/main.css
@@ -121,6 +121,7 @@
     border-width:4;
     color:black;
     padding-left: 28px;
+    padding-top: -2px;
     qproperty-fixedheight: 27;
 }
 
@@ -199,6 +200,7 @@
     border-width:4;
     color:black;
     padding-left: 35px;
+    padding-top: -2px;
     qproperty-fixedheight: 27;
 }
 
diff --git a/bin/themes/linux/main.css b/bin/themes/linux/main.css
index eaf6d9dd2..52c080a16 100644
--- a/bin/themes/linux/main.css
+++ b/bin/themes/linux/main.css
@@ -117,6 +117,7 @@
     border-width:4;
     color:black;
     padding-left: 22px;
+    padding-top: -2px;
     qproperty-fixedheight: 27;
 }
 
@@ -188,6 +189,7 @@
     border-width:4;
     color:black;
     padding-left: 30px;
+    padding-top: -2px;
     qproperty-fixedheight: 27;
 }
 
diff --git a/linux/hicolor/128x128/apps/qupzilla.png b/linux/hicolor/128x128/apps/qupzilla.png
new file mode 100644
index 000000000..c297ba308
Binary files /dev/null and b/linux/hicolor/128x128/apps/qupzilla.png differ
diff --git a/linux/hicolor/128x128/qupzilla.png b/linux/hicolor/128x128/qupzilla.png
deleted file mode 100644
index 98ec40fbc..000000000
Binary files a/linux/hicolor/128x128/qupzilla.png and /dev/null differ
diff --git a/linux/hicolor/16x16/apps/qupzilla.png b/linux/hicolor/16x16/apps/qupzilla.png
new file mode 100644
index 000000000..27511a063
Binary files /dev/null and b/linux/hicolor/16x16/apps/qupzilla.png differ
diff --git a/linux/hicolor/16x16/qupzilla.png b/linux/hicolor/16x16/qupzilla.png
deleted file mode 100644
index 421c8aa92..000000000
Binary files a/linux/hicolor/16x16/qupzilla.png and /dev/null differ
diff --git a/linux/hicolor/256x256/apps/qupzilla.png b/linux/hicolor/256x256/apps/qupzilla.png
new file mode 100644
index 000000000..2bf7eee91
Binary files /dev/null and b/linux/hicolor/256x256/apps/qupzilla.png differ
diff --git a/linux/hicolor/32x32/apps/qupzilla.png b/linux/hicolor/32x32/apps/qupzilla.png
new file mode 100644
index 000000000..69a544938
Binary files /dev/null and b/linux/hicolor/32x32/apps/qupzilla.png differ
diff --git a/linux/hicolor/32x32/qupzilla.png b/linux/hicolor/32x32/qupzilla.png
deleted file mode 100644
index abc47217f..000000000
Binary files a/linux/hicolor/32x32/qupzilla.png and /dev/null differ
diff --git a/linux/hicolor/48x48/apps/qupzilla.png b/linux/hicolor/48x48/apps/qupzilla.png
new file mode 100644
index 000000000..cb3f441b5
Binary files /dev/null and b/linux/hicolor/48x48/apps/qupzilla.png differ
diff --git a/linux/hicolor/48x48/qupzilla.png b/linux/hicolor/48x48/qupzilla.png
deleted file mode 100644
index e21942534..000000000
Binary files a/linux/hicolor/48x48/qupzilla.png and /dev/null differ
diff --git a/linux/hicolor/64x64/apps/qupzilla.png b/linux/hicolor/64x64/apps/qupzilla.png
new file mode 100644
index 000000000..a94fe6016
Binary files /dev/null and b/linux/hicolor/64x64/apps/qupzilla.png differ
diff --git a/linux/hicolor/64x64/qupzilla.png b/linux/hicolor/64x64/qupzilla.png
deleted file mode 100644
index 83cc25c25..000000000
Binary files a/linux/hicolor/64x64/qupzilla.png and /dev/null differ
diff --git a/linux/pixmaps/qupzilla.png b/linux/pixmaps/qupzilla.png
index e21942534..cb3f441b5 100644
Binary files a/linux/pixmaps/qupzilla.png and b/linux/pixmaps/qupzilla.png differ
diff --git a/src/Info.plist b/src/Info.plist
index 29d75a13b..077e6ee44 100644
--- a/src/Info.plist
+++ b/src/Info.plist
@@ -15,6 +15,7 @@
     <key>CFBundleIdentifier</key>
     <string>com.qupzilla.QupZilla</string>
     
+    <key>CFBundleDocumentTypes</key>
     <array>
       <dict>
         <key>CFBundleTypeExtensions</key>
@@ -43,8 +44,5 @@
     <string>QupZilla</string>
     <key>CFBundleDisplayName</key>
     <string>QupZilla</string>
-    
-    <key>NOTE</key>
-    <string>QupZilla Web Browser</string>
 </dict>
 </plist>
diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp
index cede50749..16c04cd7a 100644
--- a/src/app/mainapplication.cpp
+++ b/src/app/mainapplication.cpp
@@ -101,7 +101,7 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
 #endif
 
 #ifdef Q_WS_MAC
-    DATADIR.append("Resources/");
+    DATADIR.append("../Resources/");
 #endif
 
 #ifdef PORTABLE_BUILD
@@ -115,7 +115,7 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
     THEMESDIR = DATADIR + "themes/";
 
     setOverrideCursor(Qt::WaitCursor);
-    setWindowIcon(QupZilla::qupzillaIcon());
+    setWindowIcon(QIcon(":icons/exeicons/qupzilla-window.png"));
     bool noAddons = false;
     QUrl startUrl("");
     QStringList messages;
diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp
index 6e3df5904..706e299da 100644
--- a/src/app/qupzilla.cpp
+++ b/src/app/qupzilla.cpp
@@ -71,18 +71,6 @@ const QString QupZilla::WWWADDRESS = "http://www.qupzilla.com";
 const QString QupZilla::WIKIADDRESS = "https://github.com/nowrep/QupZilla/wiki";
 const QString QupZilla::WEBKITVERSION = qWebKitVersion();
 
-const QIcon QupZilla::qupzillaIcon()
-{
-    QIcon i;
-    i.addFile(":icons/exeicons/qupzilla16.png");
-    i.addFile(":icons/exeicons/qupzilla32.png");
-    i.addFile(":icons/exeicons/qupzilla48.png");
-    i.addFile(":icons/exeicons/qupzilla64.png");
-    i.addFile(":icons/exeicons/qupzilla128.png");
-    i.addFile(":icons/exeicons/qupzilla256.png");
-    return i;
-}
-
 QupZilla::QupZilla(Qz::BrowserWindow type, QUrl startUrl)
     : QMainWindow(0)
     , m_historyMenuChanged(true)
diff --git a/src/app/qupzilla.h b/src/app/qupzilla.h
index 506ed3e6d..2f270d9e8 100644
--- a/src/app/qupzilla.h
+++ b/src/app/qupzilla.h
@@ -76,8 +76,6 @@ public:
     static const QString WIKIADDRESS;
     static const QString WEBKITVERSION;
 
-    static const QIcon qupzillaIcon();
-
     explicit QupZilla(Qz::BrowserWindow type, QUrl startUrl = QUrl());
     ~QupZilla();
 
diff --git a/src/data/icons.qrc b/src/data/icons.qrc
index 1f4aed3d6..3689f7491 100644
--- a/src/data/icons.qrc
+++ b/src/data/icons.qrc
@@ -43,12 +43,6 @@
         <file>icons/other/bighistory.png</file>
         <file>icons/menu/dot.png</file>
         <file>icons/preferences/style-default.png</file>
-        <file>icons/exeicons/qupzilla16.png</file>
-        <file>icons/exeicons/qupzilla32.png</file>
-        <file>icons/exeicons/qupzilla48.png</file>
-        <file>icons/exeicons/qupzilla64.png</file>
-        <file>icons/exeicons/qupzilla128.png</file>
-        <file>icons/exeicons/qupzilla256.png</file>
         <file>icons/faenza/user-bookmarks.png</file>
         <file>icons/other/adblock-disabled.png</file>
         <file>icons/menu/search-icon.png</file>
@@ -68,5 +62,6 @@
         <file>icons/browsers/html.png</file>
         <file>icons/menu/translate.png</file>
         <file>icons/menu/duck.png</file>
+        <file>icons/exeicons/qupzilla-window.png</file>
     </qresource>
 </RCC>
diff --git a/linux/hicolor/256x256/qupzilla.png b/src/data/icons/exeicons/qupzilla-window.png
similarity index 100%
rename from linux/hicolor/256x256/qupzilla.png
rename to src/data/icons/exeicons/qupzilla-window.png
diff --git a/src/data/icons/exeicons/qupzilla.ico b/src/data/icons/exeicons/qupzilla.ico
index 277eb61f7..709263ccd 100644
Binary files a/src/data/icons/exeicons/qupzilla.ico and b/src/data/icons/exeicons/qupzilla.ico differ
diff --git a/src/data/icons/exeicons/qupzilla128.png b/src/data/icons/exeicons/qupzilla128.png
deleted file mode 100644
index 98ec40fbc..000000000
Binary files a/src/data/icons/exeicons/qupzilla128.png and /dev/null differ
diff --git a/src/data/icons/exeicons/qupzilla16.png b/src/data/icons/exeicons/qupzilla16.png
deleted file mode 100644
index 421c8aa92..000000000
Binary files a/src/data/icons/exeicons/qupzilla16.png and /dev/null differ
diff --git a/src/data/icons/exeicons/qupzilla256.png b/src/data/icons/exeicons/qupzilla256.png
deleted file mode 100644
index c528c1e6b..000000000
Binary files a/src/data/icons/exeicons/qupzilla256.png and /dev/null differ
diff --git a/src/data/icons/exeicons/qupzilla32.png b/src/data/icons/exeicons/qupzilla32.png
deleted file mode 100644
index abc47217f..000000000
Binary files a/src/data/icons/exeicons/qupzilla32.png and /dev/null differ
diff --git a/src/data/icons/exeicons/qupzilla48.png b/src/data/icons/exeicons/qupzilla48.png
deleted file mode 100644
index e21942534..000000000
Binary files a/src/data/icons/exeicons/qupzilla48.png and /dev/null differ
diff --git a/src/data/icons/exeicons/qupzilla64.png b/src/data/icons/exeicons/qupzilla64.png
deleted file mode 100644
index 83cc25c25..000000000
Binary files a/src/data/icons/exeicons/qupzilla64.png and /dev/null differ
diff --git a/src/data/qupzilla.png b/src/data/qupzilla.png
index e21942534..cb3f441b5 100644
Binary files a/src/data/qupzilla.png and b/src/data/qupzilla.png differ
diff --git a/src/navigation/navigationbar.cpp b/src/navigation/navigationbar.cpp
index d64ec396d..0bd44c930 100644
--- a/src/navigation/navigationbar.cpp
+++ b/src/navigation/navigationbar.cpp
@@ -95,6 +95,7 @@ NavigationBar::NavigationBar(QupZilla* mainClass, QWidget* parent)
     m_menuForward = new Menu(this);
     m_buttonNext->setMenu(m_menuForward);
 
+#ifndef Q_WS_MAC
     m_supMenu = new ToolButton(this);
     m_supMenu->setObjectName("navigation-button-supermenu");
     m_supMenu->setPopupMode(QToolButton::InstantPopup);
@@ -102,6 +103,7 @@ NavigationBar::NavigationBar(QupZilla* mainClass, QWidget* parent)
     m_supMenu->setAutoRaise(true);
 //    m_supMenu->setVisible(false);
     m_supMenu->setMenu(p_QupZilla->superMenu());
+#endif
 
     m_searchLine = new WebSearchBar(p_QupZilla);
 
diff --git a/src/plugins/webpluginfactory.cpp b/src/plugins/webpluginfactory.cpp
index 063397177..0831ec5bc 100644
--- a/src/plugins/webpluginfactory.cpp
+++ b/src/plugins/webpluginfactory.cpp
@@ -21,9 +21,9 @@
 #include "pluginproxy.h"
 #include "webpage.h"
 
-WebPluginFactory::WebPluginFactory(QObject* parent)
-    : QWebPluginFactory(parent)
-    , m_page(0)
+WebPluginFactory::WebPluginFactory(WebPage* page)
+    : QWebPluginFactory(page)
+    , m_page(page)
 {
 }
 
@@ -56,31 +56,21 @@ QObject* WebPluginFactory::create(const QString &mimeType, const QUrl &url, cons
         return 0;
     }
 
-    WebPluginFactory* factory = const_cast<WebPluginFactory*>(this);
-    if (!factory) {
-        return 0;
-    }
+//    WebPluginFactory* factory = const_cast<WebPluginFactory*>(this);
+//    if (!factory) {
+//        return 0;
+//    }
 
-    WebPage* page = factory->parentPage();
-    if (!page) {
-        return 0;
-    }
+//    WebPage* page = factory->parentPage();
+//    if (!page) {
+//        return 0;
+//    }
 
 
-    ClickToFlash* ctf = new ClickToFlash(url, argumentNames, argumentValues, page);
+    ClickToFlash* ctf = new ClickToFlash(url, argumentNames, argumentValues, m_page);
     return ctf;
 }
 
-WebPage* WebPluginFactory::parentPage()
-{
-    if (m_page) {
-        return m_page;
-    }
-
-    WebPage* page = qobject_cast<WebPage*> (parent());
-    return page;
-}
-
 QList<QWebPluginFactory::Plugin> WebPluginFactory::plugins() const
 {
 //    QList<QWebPluginFactory::Plugin> plugins;
diff --git a/src/plugins/webpluginfactory.h b/src/plugins/webpluginfactory.h
index cfb343a4d..dceb25ad0 100644
--- a/src/plugins/webpluginfactory.h
+++ b/src/plugins/webpluginfactory.h
@@ -25,13 +25,11 @@ class WebPage;
 class WebPluginFactory : public QWebPluginFactory
 {
 public:
-    WebPluginFactory(QObject* parent);
+    WebPluginFactory(WebPage *page);
     virtual QObject* create(const QString &mimeType, const QUrl &url, const QStringList &argumentNames, const QStringList &argumentValues) const;
     QList<QWebPluginFactory::Plugin> plugins() const;
 
 private:
-    WebPage* parentPage();
-
     WebPage* m_page;
 
 };
diff --git a/src/src.pro b/src/src.pro
index 223666bde..c877b53df 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -396,7 +396,7 @@ mac {
 
     bundle_target.files += ../bin/locale
     bundle_target.files += ../bin/themes
-    bundle_target.path = Resources
+    bundle_target.path = Contents/Resources
 
     QMAKE_BUNDLE_DATA += bundle_target
 }
@@ -433,22 +433,22 @@ mac {
     target3.files = ../linux/pixmaps/qupzilla.png
     target3.path = $$icon_folder
 
-    ico16.files = ../linux/hicolor/16x16/qupzilla.png
+    ico16.files = ../linux/hicolor/16x16/apps/qupzilla.png
     ico16.path = $$hicolor_folder/16x16/apps
 
-    ico32.files = ../linux/hicolor/32x32/qupzilla.png
+    ico32.files = ../linux/hicolor/32x32/apps/qupzilla.png
     ico32.path = $$hicolor_folder/32x32/apps
 
-    ico48.files = ../linux/hicolor/48x48/qupzilla.png
+    ico48.files = ../linux/hicolor/48x48/apps/qupzilla.png
     ico48.path = $$hicolor_folder/48x48/apps
 
-    ico64.files = ../linux/hicolor/64x64/qupzilla.png
+    ico64.files = ../linux/hicolor/64x64/apps/qupzilla.png
     ico64.path = $$hicolor_folder/64x64/apps
 
-    ico128.files = ../linux/hicolor/128x128/qupzilla.png
+    ico128.files = ../linux/hicolor/128x128/apps/qupzilla.png
     ico128.path = $$hicolor_folder/128x128/apps
 
-    ico256.files = ../linux/hicolor/256x256/qupzilla.png
+    ico256.files = ../linux/hicolor/256x256/apps/qupzilla.png
     ico256.path = $$hicolor_folder/256x256/apps
 
     INSTALLS += target target1 target2 target3
diff --git a/tests/link_tests.html b/tests/link_tests.html
index 2fad3ca50..03daae34b 100644
--- a/tests/link_tests.html
+++ b/tests/link_tests.html
@@ -52,6 +52,8 @@ Original file used from kWebKitPart (https://projects.kde.org/projects/extragear
   <br/>
   <a href="javascript:window.open('http://www.gmail.com', '_blank', 'width=600,height=600,statusbar=no,toolbar=no')">Open Gmail (new window)</a>
   <br/>
+  <a href="javascript:window.open('http://www.openshot.org/videos/', '_blank', 'width=600,height=600,statusbar=no,toolbar=no')">ClickToFlash (new window)</a>
+  <br/>
   <a href="javascript:window.close()">Close window</a>
   <br/>
 <h2>Form Tests</h2>