diff --git a/bin/themes/chrome/images/navigation-tools-rtl.png b/bin/themes/chrome/images/navigation-tools-rtl.png
new file mode 100644
index 00000000..0bf8f774
Binary files /dev/null and b/bin/themes/chrome/images/navigation-tools-rtl.png differ
diff --git a/bin/themes/linux/images/tools-rtl.svg b/bin/themes/linux/images/tools-rtl.svg
new file mode 100644
index 00000000..c2bdba6b
--- /dev/null
+++ b/bin/themes/linux/images/tools-rtl.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 3 2 L 3 14 L 4 14 L 4 2 L 3 2 z M 11.751953 2 L 7.453125 6.125 L 5.5 8 L 7.453125 9.875 L 11.751953 14 L 11.880859 13.875 L 12.271484 13.5 L 12.5 13.28125 L 8.203125 9.15625 L 6.9648438 8 L 8.203125 6.84375 L 12.5 2.71875 L 11.751953 2 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/bin/themes/mac/images/navigation-tools-rtl.png b/bin/themes/mac/images/navigation-tools-rtl.png
new file mode 100644
index 00000000..891db94f
Binary files /dev/null and b/bin/themes/mac/images/navigation-tools-rtl.png differ
diff --git a/bin/themes/mac/images/tabs-closed-button-rtl.png b/bin/themes/mac/images/tabs-closed-button-rtl.png
new file mode 100644
index 00000000..558b1b31
Binary files /dev/null and b/bin/themes/mac/images/tabs-closed-button-rtl.png differ
diff --git a/bin/themes/windows/images/tools-rtl.svg b/bin/themes/windows/images/tools-rtl.svg
new file mode 100644
index 00000000..c2bdba6b
--- /dev/null
+++ b/bin/themes/windows/images/tools-rtl.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 3 2 L 3 14 L 4 14 L 4 2 L 3 2 z M 11.751953 2 L 7.453125 6.125 L 5.5 8 L 7.453125 9.875 L 11.751953 14 L 11.880859 13.875 L 12.271484 13.5 L 12.5 13.28125 L 8.203125 9.15625 L 6.9648438 8 L 8.203125 6.84375 L 12.5 2.71875 L 11.751953 2 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/bin/themes/windows/images/tools.svg b/bin/themes/windows/images/tools.svg
new file mode 100644
index 00000000..29a1753f
--- /dev/null
+++ b/bin/themes/windows/images/tools.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 4.2480469 2 L 3.5 2.71875 L 7.796875 6.84375 L 9.0351562 8 L 7.796875 9.15625 L 3.5 13.28125 L 3.7285156 13.5 L 4.1191406 13.875 L 4.2480469 14 L 8.546875 9.875 L 10.5 8 L 8.546875 6.125 L 4.2480469 2 z M 12 2 L 12 14 L 13 14 L 13 2 L 12 2 z "
+     class="ColorScheme-Text"
+     />
+</svg>
diff --git a/themes/chrome/main.css b/themes/chrome/main.css
index 2f01df29..87223b63 100644
--- a/themes/chrome/main.css
+++ b/themes/chrome/main.css
@@ -1,355 +1,350 @@
 /*************************************
  * Chrome Theme                      *
  * Author: nowrep                    *
  * Based on: Firefox Chromifox Theme *
  *************************************/
 
 *[html-link-look="true"]
 {
     color: palette(link);
     text-decoration: underline;
 }
 
 /*MainWindow*/
 #mainwindow
 {
     background: #e4edf9 url(images/toolbar-bg.png) repeat-x;
 }
 
 #mainwindow-menubar
 {
     background: transparent;
     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 #a1c0e6, stop:1 #86abd9);
     border: 1px solid #4b6e99;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
     border-bottom: none;
 }
 
 #mainwindow-statusbar
 {
     background-color: #e4edf9;
 }
 
 #statusbar-ip-label
 {
     padding-right: 5px;
 }
 
 /*NavigationBar*/
 #navigationbar
 {
     qproperty-layoutMargin: 3;
     qproperty-layoutSpacing: 3;
 }
 
 #navigationbar QSplitter::handle
 {
     background-color:transparent;
 }
 
 #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";
-}
-
 #navigation-button-tools
 {
     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: 19px 19px;
     qproperty-fixedsize: 31px 29px;
     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::scroller
 {
     width: 0px;
 }
 
 #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-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: 3px;
     color:black;
     padding-right: 0px;
     padding-left: 0px;
     padding-top: -2px;
     padding-bottom: -2px;
     qproperty-fixedheight: 27;
     qproperty-leftMargin: 28;
 }
 
 #locationbar-bookmarkicon
 {
     margin-bottom: 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:30px 27px;
     padding-left: 0px;
 }
 
 #locationbar-siteicon[secured="true"]
 {
     border-image: url(images/siteicon-secure-bg.png);
 }
 
 #locationbar-goicon
 {
     qproperty-pixmap: url(images/gotoaddress.png);
 }
 
 #locationbar-down-icon
 {
     margin-bottom: 1px;
     qproperty-pixmap: url(images/navigation-dropdown.png);
 }
 
 #locationbar-autofillicon
 {
     margin-bottom: 1px;
     qproperty-pixmap: url(images/key.png);
 }
 
 /*SideBar*/
 #sidebar
 {
     background: transparent;
 }
 
 #sidebar-splitter::handle
 {
     background-color:transparent;
 }
 
 /*WebSearchBar*/
 #websearchbar
 {
     background: transparent;
     border-image: url(images/lineedit-bg.png);
     border-width: 3px;
     color:black;
     padding-right: 0px;
     padding-left: 0px;
     padding-top: -2px;
     padding-bottom: -2px;
     qproperty-fixedheight: 27;
     qproperty-leftMargin: 35;
 }
 
 #websearchbar-searchbutton
 {
     margin-top: 2px;
     margin-right: 2px;
     qproperty-pixmap: url(images/search-icon.png);
 }
 
 #websearchbar-searchprovider-comobobox
 {
     border-image: url(images/searchbar-provider-bg.png);
     padding-left:-8px;
     qproperty-fixedsize: 37px 27px;
 }
 
 /*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;
 }
diff --git a/themes/chrome/rtl.css b/themes/chrome/rtl.css
index e90f8f59..7f2701ef 100644
--- a/themes/chrome/rtl.css
+++ b/themes/chrome/rtl.css
@@ -1,19 +1,24 @@
 #navigation-button-next
 {
     qproperty-multiIcon: url(images/navigation-back.png);
 }
 
 #navigation-button-back
 {
     qproperty-multiIcon: url(images/navigation-forward.png);
 }
 
+#navigation-button-tools
+{
+    qproperty-icon: url(images/navigation-tools-rtl.png);
+}
+
 #tabbar-button-right
 {
     qproperty-icon: url(images/tab-left-arrow.png);
 }
 
 #tabbar-button-left
 {
     qproperty-icon: url(images/tab-right-arrow.png);
 }
diff --git a/themes/linux/rtl.css b/themes/linux/rtl.css
index af0afd48..24113a53 100644
--- a/themes/linux/rtl.css
+++ b/themes/linux/rtl.css
@@ -1,21 +1,27 @@
 #navigation-button-next
 {
     qproperty-themeIcon: "go-previous";
 }
 
 #navigation-button-back
 {
     qproperty-themeIcon: "go-next";
 }
 
+#navigation-button-tools
+{
+    qproperty-themeIcon: "arrow-left-double";
+    qproperty-fallbackIcon: url(images/tools-rtl.svg);
+}
+
 #tabbar-button-right
 {
     qproperty-themeIcon: "arrow-left";
     qproperty-fallbackIcon: url(images/tab-left-arrow.svg);
 }
 
 #tabbar-button-left
 {
     qproperty-themeIcon: "arrow-right";
     qproperty-fallbackIcon: url(images/tab-right-arrow.svg);
 }
diff --git a/themes/mac/rtl.css b/themes/mac/rtl.css
index f68b1105..d130fe48 100644
--- a/themes/mac/rtl.css
+++ b/themes/mac/rtl.css
@@ -1,24 +1,35 @@
 #navigation-button-next
 {
     qproperty-multiIcon: url(images/navigation-back.png);
 }
 
 #navigation-button-back
 {
     qproperty-multiIcon: url(images/navigation-forward.png);
 }
 
+#navigation-button-tools
+{
+    qproperty-icon: url(images/navigation-tools-rtl.png);
+}
+
+
 #tabwidget-button-opentabs
 {
     qproperty-multiIcon: url(images/tabs-list-button_rtl.png);
 }
 
+#tabwidget-button-closedtabs
+{
+    qproperty-multiIcon: url(images/tabs-closed-button-rtl.png);
+}
+
 #tabbar-button-right
 {
     qproperty-icon: url(images/tab-left-arrow.png);
 }
 
 #tabbar-button-left
 {
     qproperty-icon: url(images/tab-right-arrow.png);
 }
diff --git a/themes/windows/main.css b/themes/windows/main.css
index 84bf4b85..8d6162c2 100644
--- a/themes/windows/main.css
+++ b/themes/windows/main.css
@@ -1,424 +1,425 @@
 /*************************************
  * Windows Theme                     *
  * Author: nowrep                    *
  * Based on: Firefox Strata Aero     *
  *************************************/
 
 *[html-link-look="true"]
 {
     color: palette(link);
     text-decoration: underline;
 }
 
 /*MainWindow*/
 #mainwindow
 {
     background : #ffffff;
 }
 
 #statusbar-ip-label
 {
     padding-right: 5px;
 }
 
 /*NavigationBar*/
 #navigationbar
 {
     qproperty-layoutMargin: 3;
     qproperty-layoutSpacing: 3;
 }
 
 #navigationbar QSplitter::handle
 {
     background-color:transparent;
 }
 
 #navigationbar QSplitter
 {
     min-width: 8px;
 }
 
 #navigation-button-back
 {
     qproperty-themeIcon: "go-previous";
 }
 
 #navigation-button-next
 {
     qproperty-themeIcon: "go-next";
 }
 
 #navigation-button-stop
 {
     qproperty-themeIcon: "process-stop";
 }
 
 #navigation-button-reload
 {
     qproperty-themeIcon: "view-refresh";
 }
 
 #navigation-button-home
 {
     qproperty-themeIcon: "go-home";
 }
 
 #navigation-button-addtab
 {
     qproperty-themeIcon: "list-add";
 }
 
 #navigation-button-tools
 {
     qproperty-themeIcon: "arrow-right-double";
+    qproperty-fallbackIcon: url(images/tools.svg);
 }
 
 #navigation-button-supermenu
 {
     qproperty-themeIcon: "application-menu";
     qproperty-fallbackIcon: url(images/menu.svg);
 }
 
 #navigation-toolbutton-badge
 {
     background: palette(dark);
     color: palette(bright-text);
     margin: 0px 1px;
 }
 
 /*TabWidget*/
 #tabbar-button-right
 {
     qproperty-themeIcon: "arrow-right";
     qproperty-fallbackIcon: url(images/tab-right-arrow.svg);
     qproperty-fixedsize: 15px 25px;
 }
 
 #tabbar-button-left
 {
     qproperty-themeIcon: "arrow-left";
     qproperty-fallbackIcon: url(images/tab-left-arrow.svg);
     qproperty-fixedsize: 15px 25px;
 }
 
 #tabwidget-button-opentabs
 {
     qproperty-themeIcon: "go-down";
     qproperty-fixedsize: 22px 28px;
 }
 
 #tabwidget-button-closedtabs
 {
     qproperty-themeIcon: "user-trash-full";
     qproperty-fixedsize: 22px 28px;
 }
 
 #tabwidget-button-addtab[outside-tabbar="false"]
 {
     background : #dddddd;
     border: 1px solid #b2b2b2;
     border-bottom: none;
     border-left: none;
     qproperty-fixedsize: 28px 28px;
     qproperty-themeIcon: "list-add";
 }
 
 #tabwidget-button-addtab[outside-tabbar="true"]
 {
     qproperty-themeIcon: "list-add";
     qproperty-fixedsize: 22px 28px;
 }
 
 /*TabWidget*/
 #tabbar
 {
     min-height: 30px;
     max-height: 30px;
 }
 
 #tab-icon
 {
     padding-right: 3px;
     padding-left: 3px;
     min-width: 16px;
     max-width: 16px;
 }
 
 #combotabbar_tabs_close_button
 {
     max-width: 11px;
     max-height: 9px;
     min-width: 11px;
     min-height: 9px;
     padding-right: 2px;
 }
 
 #tabbar::close-button
 {
     image: url(images/tab-close.svg);
 }
 
 #tabbar::close-button:hover
 {
     image: url(images/tab-close-h.svg);
 }
 
 #tabbar::close-button:pressed
 {
     image: url(images/tab-close-a.svg);
 }
 
 #tabbar::tab
 {
     height: 28px;
 }
 
 #tabbar::tab:selected
 {
     background : #ffffff;
     border: 1px solid #b2b2b2;
     border-bottom: none;
 }
 
 #tabbar::tab:!selected
 {
     background : #dddddd;
     border: 1px solid #b2b2b2;
     border-bottom: none;
 }
 
 #tabbar::tab:!selected:hover
 {
     background: #f3f3f3;
     border: 1px solid #b2b2b2;
     border-bottom: none;
 }
 
 #tabbar::tab:selected:!first
 {
     margin-left: -1px;
 }
 
 #tabbar::tab:!selected:!first
 {
     margin-left: -1px;
 }
 
 #tabbar::tab:!selected:!first:hover
 {
     margin-left: -1px;
 }
 
 #tabbar::tab:selected:first
 {
     margin-left: 0;
 }
 
 #tabbar::tab:!selected:first
 {
     margin-left: 0;
 }
 
 #tabbar::tab:selected:only-one
 {
     margin-left: 0;
 }
 
 /*IconProvider*/
 IconProvider
 {
     qproperty-bookmarkIcon: url(images/star-a.svg);
 }
 
 /*LocationBar*/
 #locationbar
 {
     background: transparent;
     border: 1px solid #b2b2b2;
     min-height: 25px;
     qproperty-leftMargin: 27;
 }
 
 #locationbar::focus
 {
     border-color: #0078d7;
 }
 
 #locationbar-bookmarkicon
 {
     qproperty-themeIcon: "rating-unrated";
     qproperty-fallbackIcon: url(images/star.svg);
     qproperty-fixedsize: 16px 16px;
 }
 
 #locationbar-bookmarkicon[bookmarked="true"]
 {
     qproperty-themeIcon: "rating";
     qproperty-fallbackIcon: url(images/star-a.svg);
     qproperty-fixedsize: 16px 16px;
 }
 
 #locationbar-siteicon
 {
     border-image: url(images/transp.png);
     qproperty-fixedwidth: 30;
     min-height: 25px;
     padding-left: 0px;
 }
 
 #locationbar-goicon
 {
     qproperty-themeIcon: "go-jump-locationbar";
     qproperty-fallbackIcon: url(images/goto.svg);
     qproperty-fixedsize: 16px 16px;
 }
 
 #locationbar-down-icon
 {
     qproperty-themeIcon: "go-down";
     qproperty-fixedsize: 12px 16px;
 }
 
 #locationbar-autofillicon
 {
     qproperty-themeIcon: "user-identity";
     qproperty-fallbackIcon: url(images/user.svg);
     qproperty-fixedsize: 16px 16px;
 }
 
 /*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: 1px solid #b2b2b2 solid;
     min-height: 25px;
     qproperty-leftMargin: 27;
 }
 
 #websearchbar::focus
 {
     border-color: #0078d7;
 }
 
 #websearchbar-searchbutton
 {
     qproperty-fixedsize: 22px 16px;
     qproperty-themeIcon: "edit-find";
 }
 
 #websearchbar-searchprovider-comobobox
 {
     border-image: url(images/transp.png);
     qproperty-fixedwidth: 25;
     min-height: 25px;
     padding-left: 4px;
 }
 
 /*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;
 }
 
 /*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;
 }
diff --git a/themes/windows/rtl.css b/themes/windows/rtl.css
index c1e71ff5..fde96404 100644
--- a/themes/windows/rtl.css
+++ b/themes/windows/rtl.css
@@ -1,29 +1,68 @@
+#navigation-button-back
+{
+    qproperty-themeIcon: "go-next";
+}
+
 #navigation-button-next
 {
-    qproperty-multiIcon: url(images/navigation-back.png);
+    qproperty-themeIcon: "go-previous";
 }
 
-#navigation-button-back
+#navigation-button-tools
+{
+    qproperty-themeIcon: "arrow-left-double";
+    qproperty-fallbackIcon: url(images/tools-rtl.svg);
+}
+
+#tabbar-button-right
 {
-    qproperty-multiIcon: url(images/navigation-forward.png);
+    qproperty-themeIcon: "arrow-left";
+    qproperty-fallbackIcon: url(images/tab-left-arrow.svg);
+    qproperty-fixedsize: 15px 25px;
 }
 
-#tabwidget-button-addtab
+#tabbar-button-left
 {
-    qproperty-multiIcon: url(images/tabbar-addtab_rtl.png);
+    qproperty-themeIcon: "arrow-right";
+    qproperty-fallbackIcon: url(images/tab-right-arrow.svg);
+    qproperty-fixedsize: 15px 25px;
 }
 
-#tabbar::tab:last
+#locationbar
 {
-    margin-left: 1px;
+    background: transparent;
+    border: 1px solid #b2b2b2;
+    min-height: 25px;
+    qproperty-leftMargin: 27;
+    margin-right: 1px; /* Why ??? */
 }
 
-#tabbar-button-right
+#tabbar::tab:selected:!first
 {
-    qproperty-icon: url(images/tab-left-arrow.png);
+    margin-right: -1px;
 }
 
-#tabbar-button-left
+#tabbar::tab:!selected:!first
+{
+    margin-right: -1px;
+}
+
+#tabbar::tab:!selected:!first:hover
+{
+    margin-right: -1px;
+}
+
+#tabbar::tab:selected:first
+{
+    margin-right: 0;
+}
+
+#tabbar::tab:!selected:first
+{
+    margin-right: 0;
+}
+
+#tabbar::tab:selected:only-one
 {
-    qproperty-icon: url(images/tab-right-arrow.png);
+    margin-right: 0;
 }