diff --git a/bin/themes/mac/images/navigation-downloads.png b/bin/themes/mac/images/navigation-downloads.png
new file mode 100644
index 00000000..805cda87
Binary files /dev/null and b/bin/themes/mac/images/navigation-downloads.png differ
diff --git a/bin/themes/mac/images/navigation-exit-fullscreen.png b/bin/themes/mac/images/navigation-exit-fullscreen.png
new file mode 100644
index 00000000..22f1ca80
Binary files /dev/null and b/bin/themes/mac/images/navigation-exit-fullscreen.png differ
diff --git a/bin/themes/mac/images/navigation-tools.png b/bin/themes/mac/images/navigation-tools.png
new file mode 100644
index 00000000..8bf2a94e
Binary files /dev/null and b/bin/themes/mac/images/navigation-tools.png differ
diff --git a/bin/themes/mac/images/tabs-closed-button.png b/bin/themes/mac/images/tabs-closed-button.png
new file mode 100644
index 00000000..8e078c1e
Binary files /dev/null and b/bin/themes/mac/images/tabs-closed-button.png differ
diff --git a/bin/themes/mac/images/toolbutton-a.png b/bin/themes/mac/images/toolbutton-a.png
new file mode 100644
index 00000000..c6ccf44d
Binary files /dev/null and b/bin/themes/mac/images/toolbutton-a.png differ
diff --git a/bin/themes/mac/images/toolbutton-h.png b/bin/themes/mac/images/toolbutton-h.png
new file mode 100644
index 00000000..ac8e24af
Binary files /dev/null and b/bin/themes/mac/images/toolbutton-h.png differ
diff --git a/bin/themes/mac/images/toolbutton.png b/bin/themes/mac/images/toolbutton.png
new file mode 100644
index 00000000..6f4c9613
Binary files /dev/null and b/bin/themes/mac/images/toolbutton.png differ
diff --git a/themes/mac/images/gotoaddress.png b/themes/mac/images/gotoaddress.png
index 96b5874d..b618b100 100644
Binary files a/themes/mac/images/gotoaddress.png and b/themes/mac/images/gotoaddress.png differ
diff --git a/themes/mac/images/key.png b/themes/mac/images/key.png
index 39f558db..e51cf298 100644
Binary files a/themes/mac/images/key.png and b/themes/mac/images/key.png differ
diff --git a/themes/mac/images/navigation-back.png b/themes/mac/images/navigation-back.png
index aa0a5f50..637f5a30 100644
Binary files a/themes/mac/images/navigation-back.png and b/themes/mac/images/navigation-back.png differ
diff --git a/themes/mac/images/navigation-forward.png b/themes/mac/images/navigation-forward.png
index 318309a2..82136608 100644
Binary files a/themes/mac/images/navigation-forward.png and b/themes/mac/images/navigation-forward.png differ
diff --git a/themes/mac/images/user-trash-full.png b/themes/mac/images/user-trash-full.png
deleted file mode 100644
index ab2d2042..00000000
Binary files a/themes/mac/images/user-trash-full.png and /dev/null differ
diff --git a/themes/mac/main.css b/themes/mac/main.css
index fbb9d596..b50890e4 100644
--- a/themes/mac/main.css
+++ b/themes/mac/main.css
@@ -1,337 +1,354 @@
 /*************************************
  * Mac Theme                         *
  * Author: nowrep                    *
  * Based on: Firefox Mac OS X Theme  *
  *************************************/
 
 *[html-link-look="true"]
 {
     color: palette(link);
     text-decoration: underline;
 }
 
 /*MainWindow*/
 #mainwindow
 {
     background-color: #a7a7a7;
 }
 
 #mainwindow-menubar
 {
     background-image:url(images/transp.png);
     border:none;
 }
 
 #mainwindow-menubar:item
 {
     color: black;
     spacing: 5px;
     padding: 2px 6px;
     background: transparent;
 }
 
 #mainwindow-menubar::item:pressed
 {
     background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #a5a5a5, stop:1 #9a9a9a);
     border: 1px solid #373737;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
     border-bottom: none;
 }
 
 #mainwindow-statusbar
 {
     background-color: #a7a7a7;
 }
 
 #statusbar-ip-label
 {
     padding-right: 5px;
 }
 
 /*NavigationBar*/
 #navigationbar
 {
     qproperty-layoutMargin: 4;
     qproperty-layoutSpacing: 3;
 }
 
 #navigationbar QSplitter::handle
 {
     height: 8px;
     image: url(images/splitter.png);
 }
 
 #navigation-button-back
 {
     qproperty-multiIcon: url(images/navigation-back.png);
 }
 
 #navigation-button-next
 {
     qproperty-multiIcon: url(images/navigation-forward.png);
 }
 
 #navigation-button-stop
 {
     qproperty-multiIcon: url(images/navigation-stop.png);
 }
 
 #navigation-button-reload
 {
     qproperty-multiIcon: url(images/navigation-reload.png);
 }
 
 #navigation-button-home
 {
     qproperty-multiIcon: url(images/navigation-home.png);
 }
 
 #navigation-button-addtab
 {
     qproperty-multiIcon: url(images/navigation-addtab.png);
 }
 
 #navigation-button-tools
 {
-    qproperty-themeIcon: "arrow-right-double";
+    qproperty-icon: url(images/navigation-tools.png);
 }
 
 #navigation-button-supermenu
 {
     qproperty-multiIcon: url(images/navigation-supermenu.png);
 }
 
 #navigation-toolbutton-badge
 {
     background: palette(dark);
     color: palette(bright-text);
     margin: 0px 1px;
 }
 
+ToolButton[toolbar-look="true"]
+{
+    qproperty-iconSize: 16px 16px;
+    qproperty-fixedsize: 36px 23px;
+    border-image: url(images/toolbutton.png);
+}
+
+ToolButton[toolbar-look="true"]:hover
+{
+    border-image: url(images/toolbutton-h.png);
+}
+
+ToolButton[toolbar-look="true"]:pressed
+{
+    border-image: url(images/toolbutton-a.png);
+}
+
 /*TabWidget*/
 #tabbar-button-right
 {
     qproperty-icon: url(images/tab-right-arrow.png);
     qproperty-fixedsize: 15px 25px;
 }
 
 #tabbar-button-left
 {
     qproperty-icon: url(images/tab-left-arrow.png);
     qproperty-fixedsize: 15px 25px;
 }
 
 #tabwidget-button-opentabs
 {
     qproperty-multiIcon: url(images/tabs-list-button.png);
 }
 
 #tabwidget-button-closedtabs
 {
-    qproperty-themeIcon: "user-trash-full";
-    qproperty-fixedsize: 22px 25px;
+    qproperty-multiIcon: url(images/tabs-closed-button.png);
 }
 
 #tabwidget-button-addtab
 {
     qproperty-multiIcon: url(images/tabbar-addtab.png);
 }
 
 /*IconProvider*/
 IconProvider
 {
     qproperty-bookmarkIcon: url(images/star-a.png);
 }
 
 /*LocationBar*/
 #locationbar
 {
     background: transparent;
     border-image: url(images/lineedit-bg.png);
     border-width: 4px;
     color:black;
     padding-right: -5px;
     padding-left: -5px;
     padding-top: -2px;
     padding-bottom: -2px;
     qproperty-fixedheight: 23;
     qproperty-leftMargin: 40;
 }
 
 #locationbar-bookmarkicon
 {
     margin-left: 2px;
     qproperty-pixmap: url(images/star.png);
 }
 
 #locationbar-bookmarkicon[bookmarked="true"]
 {
     qproperty-pixmap: url(images/star-a.png);
 }
 
 #locationbar-siteicon
 {
     border-image: url(images/siteicon-bg.png);
     qproperty-fixedsize:42px 23px;
     padding-left: -3px;
 }
 
 #locationbar-siteicon[secured="true"]
 {
     border-image: url(images/siteicon-secure-bg.png);
 }
 
 #locationbar-goicon
 {
+    margin-top: 2px;
     qproperty-pixmap: url(images/gotoaddress.png);
 }
 
 #locationbar-down-icon
 {
     margin-left: 3px;
     margin-right: 2px;
     qproperty-pixmap: url(images/navigation-dropdown.png);
 }
 
 #locationbar-autofillicon
 {
     margin-bottom: 1px;
     qproperty-pixmap: url(images/key.png);
 }
 
 /*BookmarksToolbar*/
 #bookmarksbar QToolButton
 {
     border-image: url(images/transp.png);
     border-width: 0px;
     height: 15px;
 }
 
 /*SideBar*/
 #sidebar
 {
     background: transparent;
 }
 
 #sidebar-splitter::handle
 {
     background-color:transparent;
 }
 
 /*WebSearchBar*/
 #websearchbar
 {
     background: transparent;
     border-image: url(images/lineedit-bg.png);
     border-width: 4px;
     padding-right: -4px;
     padding-top: -2px;
     padding-bottom: -2px;
     color:black;
     qproperty-fixedheight: 23;
     qproperty-leftMargin: 35;
 }
 
 #websearchbar-searchbutton
 {
     margin-bottom: -1px;
     qproperty-pixmap: url(images/search-icon.png);
 }
 
 #websearchbar-searchprovider-comobobox
 {
     border-image: url(images/searchbar-provider-bg.png);
     padding-left:-11px;
     qproperty-fixedsize: 42px 23px;
 }
 
 /*SourceViewer*/
 #sourceviewer-textedit
 {
     border:none;
 }
 
 /*SourceViewerSearch*/
 SourceViewerSearch #lineEdit[notfound="true"]
 {
     background:#ff6666;
 }
 
 /*SearchToolbar*/
 SearchToolBar #lineEdit[notfound="true"]
 {
     background:#ff6666;
 }
 
 /*AboutDialog*/
 AboutDialog #label
 {
     background:white;
 }
 
 AboutDialog #textBrowser
 {
     border:none;
     margin-top: -2px; /* Workarounding rounded border on KDE */
 }
 
 /*DesktopNotification*/
 DesktopNotification
 {
     background: transparent;
 }
 DesktopNotification #frame
 {
     border: 2px solid darkblue;
     border-radius: 20px;
     background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1);
 }
 
 DesktopNotification #heading
 {
     font: bold;
     font-size: 13pt;
 }
 
 /*BrowsingLibrary*/
 BrowsingLibrary #tabs
 {
     qproperty-bgPixmap: url(images/library-bg.png);
 }
 
 BrowsingLibrary #frame
 {
     background: url(images/library-bg.png);
 }
 
 /*Downloads*/
 DownloadItem #fileName
 {
     font-size: 13pt;
 }
 
 DownloadManager #list
 {
     border: none;
 }
 
 /*JavaScript Dialogs*/
 #jsFrame
 {
     background: url(images/semi-transp.png);
 }
 
 QFrame[js-frame="true"]
 {
     border: 1px solid  black;
     border-bottom: 0px;
     background-color: white;
 }
 
 QFrame[js-frame2="true"]
 {
     border: 1px solid  black;
     border-top: 0px;
     background-color: #f3f3f3;
 }