diff --git a/themes/windows/modules/navigation.css b/themes/windows/modules/navigation.css
new file mode 100644
index 0000000..e268ef3
--- /dev/null
+++ b/themes/windows/modules/navigation.css
@@ -0,0 +1,25 @@
+#navigator-toolbox {
+  width: 100%;
+  height: 30px;
+  top: 0;
+  right: 0;
+
+  position: fixed !important;
+  overflow: var(--is-bar-visible, visible);
+  border: 0px !important;
+  background-color: white !important;
+  z-index: 1;
+}
+
+#navigator-toolbox:not(:-moz-lwtheme) {
+  background-color: var(--lwt-accent-color) !important;
+  color: var(--lwt-text-color) !important;
+}
+
+#nav-bar .toolbarbutton-icon {
+  scale: 0.75;
+}
+
+#nav-bar:not([customizing="true"]) {
+  background-color: var(--lwt-accent-color) !important;
+}
diff --git a/themes/windows/modules/urlbar.css b/themes/windows/modules/urlbar.css
index 24492f1..2b60e81 100644
--- a/themes/windows/modules/urlbar.css
+++ b/themes/windows/modules/urlbar.css
@@ -1,13 +1,15 @@
 #urlbar {
   margin-top: 20px !important;
   margin-bottom: 20px !important;
-  margin-left: 200px !important;
+
+  margin-left: 80px !important;
+
   padding: 0px !important;
   padding-right: 10px !important;
   padding-left: 10px !important;
 
   height: 30px !important;
-  width: calc(100% - 200px) !important;
+  width: calc(100% - 150px) !important;
 
   text-align: center;
   -moz-border-radius: 100px !important;
@@ -75,6 +77,36 @@
   background-color: var(--lwt-accent-color) !important;
 }
 
-#identity-box *:not(#page-proxy-favicon) {
+#tracking-protection-icon-container,
+#page-action-buttons {
+  order: 2 !important;
+}
+
+#translation-button {
+  hidden: false !important;
+  display: flex !important;
+}
+
+.urlbar-page-action,
+#urlbar-go-button,
+.search-go-button,
+#tracking-protection-icon-container,
+#identity-icon-box {
+  padding-inline: 5px !important;
+  width: 25px !important;
+}
+
+#identity-icon-box,
+#identity-permission-box,
+.notification-anchor-icon {
+  padding-inline: 5px !important;
+}
+
+#identity-box[pageproxystate="valid"]:is(
+    .notSecureText,
+    .chromeUI,
+    .extensionPage
+  )
+  > .identity-box-button {
   display: none !important;
 }
diff --git a/themes/windows/userChrome.css b/themes/windows/userChrome.css
index b768535..c351760 100644
--- a/themes/windows/userChrome.css
+++ b/themes/windows/userChrome.css
@@ -1,4 +1,5 @@
 @import url("modules/urlbar.css");
+@import url("modules/navigation.css");
 
 #appcontent
   > #tabbrowser-tabbox
@@ -8,7 +9,7 @@
   > .browserStack
   > browser {
   margin: 10px !important;
-  margin-top: 30px !important;
+  margin-top: 40px !important;
 
   border-radius: 10px !important;
 }
@@ -37,29 +38,10 @@
   display: none !important;
 }
 
-#forward-button,
-#back-button,
-#reload-button {
-  display: none !important;
-}
-
 #sidebar-button {
   margin-left: 10px !important;
 }
 
-#navigator-toolbox {
-  width: 100%;
-  height: 30px;
-  top: 0;
-  right: 0;
-
-  position: fixed;
-  overflow: var(--is-bar-visible, visible);
-  border: 0px !important;
-  background-color: transparent !important;
-  z-index: 1;
-}
-
 toolbarbutton[open="true"] {
   --is-bar-visible: visible !important;
 }