diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index fc1b1c9..a6279f1 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3273,22 +3273,34 @@
 }
 @supports -moz-bool-pref("userChrome.rounding.square_button") {
   :root {
-    --toolbarbutton-border-radius: 0 !important;
+    --urlbar-icon-border-radius: 0 !important;
+    /* Original: calc(var(--toolbarbutton-border-radius) - 1px); */
+  }
+
+  .toolbarbutton-1,
+  .toolbarbutton-icon,
+  .panel-info-button,
+  .searchbar-engine-one-off-item,
+  .urlbarView-button,
+  .urlbarView-tip-button,
+  .urlbarView-action,
+  toolbarbutton.bookmark-item:not(.subviewbutton),
+  #sidebar-switcher-target {
+    --toolbarbutton-border-radius: 0;
     /* Original: 4px */
   }
 
   button,
-  findbar toolbarbutton {
+  findbar toolbarbutton,
+  .notification-button {
     border-radius: 0 !important;
   }
 }
-@supports -moz-bool-pref("userChrome.rounding.square_tab") or -moz-bool-pref("userChrome.round.square_button") {
+@supports -moz-bool-pref("userChrome.rounding.square_tab") or -moz-bool-pref("userChrome.rounding.square_button") {
   /* Fix Tab bar button radius */
-  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-icon,
-  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-text,
-  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-badge-stack,
+  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button),
   .tab-close-button {
-    --tab-border-radius: var(--toolbarbutton-border-radius) !important;
+    --tab-border-radius: var(--toolbarbutton-border-radius);
   }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_panel") {
@@ -3323,11 +3335,17 @@
     border-radius: 0 !important;
   }
 
+  #urlbar-input-container,
   #urlbar-background,
   #searchbar {
     --toolbarbutton-border-radius: 0;
   }
 }
+@supports -moz-bool-pref("userChrome.rounding.square_urlView_item") {
+  .urlbarView-row-inner {
+    --toolbarbutton-border-radius: 0;
+  }
+}
 @supports -moz-bool-pref("userChrome.rounding.square_checklabel") {
   .checkbox-check,
   xul|*.radio-check {
diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss
index fa92deb..9c86f15 100644
--- a/src/rounding/_square.scss
+++ b/src/rounding/_square.scss
@@ -5,21 +5,32 @@
 }
 @include Option("userChrome.rounding.square_button") {
   :root {
-    --toolbarbutton-border-radius: 0 !important;  /* Original: 4px */
+    --urlbar-icon-border-radius: 0 !important; /* Original: calc(var(--toolbarbutton-border-radius) - 1px); */
+  }
+
+  .toolbarbutton-1,
+  .toolbarbutton-icon,
+  .panel-info-button,
+  .searchbar-engine-one-off-item,
+  .urlbarView-button,
+  .urlbarView-tip-button,
+  .urlbarView-action,
+  toolbarbutton.bookmark-item:not(.subviewbutton),
+  #sidebar-switcher-target {
+    --toolbarbutton-border-radius: 0;  /* Original: 4px */
   }
 
   button,
-  findbar toolbarbutton {
+  findbar toolbarbutton,
+  .notification-button {
     border-radius: 0 !important;
   }
 }
-@include Option("userChrome.rounding.square_tab", "userChrome.round.square_button") {
+@include Option("userChrome.rounding.square_tab", "userChrome.rounding.square_button") {
   /* Fix Tab bar button radius */
-  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-icon,
-  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-text,
-  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-badge-stack,
+  #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button),
   .tab-close-button {
-    --tab-border-radius: var(--toolbarbutton-border-radius) !important;
+    --tab-border-radius: var(--toolbarbutton-border-radius);
   }
 }
 
@@ -57,12 +68,19 @@
     border-radius: 0 !important;
   }
 
+  #urlbar-input-container,
   #urlbar-background,
   #searchbar {
     --toolbarbutton-border-radius: 0;
   }
 }
 
+@include Option("userChrome.rounding.square_urlView_item") {
+  .urlbarView-row-inner {
+    --toolbarbutton-border-radius: 0;
+  }
+}
+
 @include Option("userChrome.rounding.square_checklabel") {
   .checkbox-check,
   xul|*.radio-check {
diff --git a/user.js b/user.js
index 8c1b616..b82ade6 100644
--- a/user.js
+++ b/user.js
@@ -126,6 +126,7 @@ user_pref("userChrome.rounding.square_tab",           false);
 // user_pref("userChrome.rounding.square_menupopup",           true);
 // user_pref("userChrome.rounding.square_menuitem",            true);
 // user_pref("userChrome.rounding.square_field",               true);
+// user_pref("userChrome.rounding.square_urlView_item",        true);
 // user_pref("userChrome.rounding.square_checklabel",          true);
 
 // user_pref("userChrome.padding.first_tab",                   true);