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 000000000..0bf8f7741
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 000000000..c2bdba6b6
--- /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 000000000..891db94ff
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 000000000..558b1b310
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 000000000..c2bdba6b6
--- /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 000000000..29a1753f3
--- /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 2f01df296..87223b634 100644
--- a/themes/chrome/main.css
+++ b/themes/chrome/main.css
@@ -91,11 +91,6 @@
     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);
diff --git a/themes/chrome/rtl.css b/themes/chrome/rtl.css
index e90f8f59d..7f2701efb 100644
--- a/themes/chrome/rtl.css
+++ b/themes/chrome/rtl.css
@@ -8,6 +8,11 @@
     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);
diff --git a/themes/linux/rtl.css b/themes/linux/rtl.css
index af0afd488..24113a537 100644
--- a/themes/linux/rtl.css
+++ b/themes/linux/rtl.css
@@ -8,6 +8,12 @@
     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";
diff --git a/themes/mac/rtl.css b/themes/mac/rtl.css
index f68b11056..d130fe484 100644
--- a/themes/mac/rtl.css
+++ b/themes/mac/rtl.css
@@ -8,11 +8,22 @@
     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);
diff --git a/themes/windows/main.css b/themes/windows/main.css
index 84bf4b858..8d6162c2a 100644
--- a/themes/windows/main.css
+++ b/themes/windows/main.css
@@ -71,6 +71,7 @@
 #navigation-button-tools
 {
     qproperty-themeIcon: "arrow-right-double";
+    qproperty-fallbackIcon: url(images/tools.svg);
 }
 
 #navigation-button-supermenu
diff --git a/themes/windows/rtl.css b/themes/windows/rtl.css
index c1e71ff50..fde964041 100644
--- a/themes/windows/rtl.css
+++ b/themes/windows/rtl.css
@@ -1,29 +1,68 @@
-#navigation-button-next
-{
-    qproperty-multiIcon: url(images/navigation-back.png);
-}
-
 #navigation-button-back
 {
-    qproperty-multiIcon: url(images/navigation-forward.png);
+    qproperty-themeIcon: "go-next";
 }
 
-#tabwidget-button-addtab
+#navigation-button-next
 {
-    qproperty-multiIcon: url(images/tabbar-addtab_rtl.png);
+    qproperty-themeIcon: "go-previous";
 }
 
-#tabbar::tab:last
+#navigation-button-tools
 {
-    margin-left: 1px;
+    qproperty-themeIcon: "arrow-left-double";
+    qproperty-fallbackIcon: url(images/tools-rtl.svg);
 }
 
 #tabbar-button-right
 {
-    qproperty-icon: url(images/tab-left-arrow.png);
+    qproperty-themeIcon: "arrow-left";
+    qproperty-fallbackIcon: url(images/tab-left-arrow.svg);
+    qproperty-fixedsize: 15px 25px;
 }
 
 #tabbar-button-left
 {
-    qproperty-icon: url(images/tab-right-arrow.png);
+    qproperty-themeIcon: "arrow-right";
+    qproperty-fallbackIcon: url(images/tab-right-arrow.svg);
+    qproperty-fixedsize: 15px 25px;
+}
+
+#locationbar
+{
+    background: transparent;
+    border: 1px solid #b2b2b2;
+    min-height: 25px;
+    qproperty-leftMargin: 27;
+    margin-right: 1px; /* Why ??? */
+}
+
+#tabbar::tab:selected:!first
+{
+    margin-right: -1px;
+}
+
+#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
+{
+    margin-right: 0;
 }