diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
index c557a10..e2c20af 100644
--- a/browser/components/urlbar/UrlbarInput.jsm
+++ b/browser/components/urlbar/UrlbarInput.jsm
@@ -1090,13 +1090,13 @@ class UrlbarInput {
 
     // Enable the animation only after the first extend call to ensure it
     // doesn't run when opening a new window.
-    if (!this.hasAttribute("breakout-extend-animate")) {
-      this.window.promiseDocumentFlushed(() => {
-        this.window.requestAnimationFrame(() => {
-          this.setAttribute("breakout-extend-animate", "true");
-        });
-      });
-    }
+    // if (!this.hasAttribute("breakout-extend-animate")) {
+      // this.window.promiseDocumentFlushed(() => {
+        // this.window.requestAnimationFrame(() => {
+          // this.setAttribute("breakout-extend-animate", "true");
+        // });
+      // });
+    // }
   }
 
   endLayoutExtend() {
diff --git a/browser/themes/shared/urlbar-autocomplete.inc.css b/browser/themes/shared/urlbar-autocomplete.inc.css
index 13a4595..eda7bdf 100644
--- a/browser/themes/shared/urlbar-autocomplete.inc.css
+++ b/browser/themes/shared/urlbar-autocomplete.inc.css
@@ -48,8 +48,8 @@
   display: block;
   text-shadow: none;
   overflow: -moz-hidden-unscrollable;
-  margin-inline: @urlbarViewMarginInline@;
-  width: calc(100% - 2 * @urlbarViewMarginInline@);
+  margin-inline: 0;
+  width: 100%;
 
   /* Match urlbar-background's border. */
   border-inline: 1px solid transparent;
@@ -72,7 +72,7 @@
 .urlbarView-row {
   fill: currentColor;
   fill-opacity: .6;
-  padding-block: 3px;
+  padding-block: 0;
 }
 
 .urlbarView-row-inner {
@@ -179,6 +179,7 @@
   background-repeat: no-repeat;
   background-size: contain;
   -moz-context-properties: fill, fill-opacity;
+  margin-inline-start: 20px;
 }
 
 @media (min-resolution: 2dppx) {
@@ -200,10 +201,10 @@
 
 .urlbarView-type-icon {
   position: absolute;
-  min-width: 12px;
-  height: 12px;
-  margin-bottom: -4px;
-  margin-inline-start: 8px;
+  min-width: 16px;
+  height: 16px;
+  margin-bottom: 0;
+  margin-inline-start: 0;
   background-repeat: no-repeat;
   background-size: contain;
   -moz-context-properties: fill, stroke;
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
index 5d5a3d1..4e84a7f 100644
--- a/browser/themes/shared/urlbar-searchbar.inc.css
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
@@ -6,7 +6,7 @@
 
 %define fieldBorderColor hsla(240,5%,5%,.25)
 %define fieldHoverBorderColor hsla(240,5%,5%,.35)
-%define urlbarMarginInline 5px
+%define urlbarMarginInline 0px
 %define urlbarSearchButtonWidth calc(16px + 2 * @identityBoxPaddingInline@)
 
 :root {
@@ -196,13 +196,13 @@
 }
 
 #urlbar[breakout][breakout-extend] {
-  top: -@urlbarBreakoutExtend@;
-  left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
-  width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
+  top: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
+  left: 0;
+  width: 100%;
 }
 
 #urlbar[breakout][breakout-extend] > #urlbar-background {
-  box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
+  box-shadow: 0 1px 4px rgba(0,0,0,.05);
 }
 
 #urlbar[breakout][breakout-extend][open] > #urlbar-background {
@@ -210,9 +210,9 @@
 }
 
 #urlbar[breakout][breakout-extend] > #urlbar-input-container {
-  height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
-  padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
-  padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
+  height: var(--urlbar-height);
+  padding-block: 0;
+  padding-inline: 0;
 }
 
 #urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button {
@@ -230,7 +230,7 @@
 }
 
 #urlbar[breakout][breakout-extend] > #urlbar-background {
-  animation-name: urlbar-grow;
+  animation-name: none;
   animation-duration: 0s;
   animation-timing-function: var(--animation-easing-function);
 }