diff --git a/src/other/firefox/common/parts/entries.css b/src/other/firefox/common/parts/entries.css
index 5531b8e6..ee825cef 100644
--- a/src/other/firefox/common/parts/entries.css
+++ b/src/other/firefox/common/parts/entries.css
@@ -4,8 +4,8 @@
 
 /* Entries */
 #searchbar,
-#input,
 #loginTextbox,
+search-textbox,
 #password1Textbox {
 	-moz-appearance: none !important;
 	background-color: var(--gnome-urlbar-background) !important;
@@ -24,9 +24,19 @@
 	transition: outline 100ms ease-out;
 }
 
+#input {
+	background-color: var(--gnome-urlbar-background) !important;
+	border: 1px solid var(--gnome-urlbar-border-color) !important;
+	outline: 2px solid transparent;
+	outline-offset: -2px;
+	border-radius: 8px !important;
+	background-clip: padding-box !important;
+}
+
 /* Entries focused */
 #searchbar:focus-within,
-#input[focused],
+#input:focus,
+search-textbox:focus,
 #loginTextbox:focus,
 #password1Textbox:focus {
 	border: 1px solid transparent !important;
@@ -39,7 +49,7 @@
 
 /* Inactive window entries */
 #searchbar:-moz-window-inactive,
-#search-box:-moz-window-inactive #input,
+#input:-moz-window-inactive,
 #loginTextbox:-moz-window-inactive,
 #password1Textbox:-moz-window-inactive {
 	background-color: var(--gnome-inactive-urlbar-background) !important;
diff --git a/src/other/firefox/common/parts/sidebar.css b/src/other/firefox/common/parts/sidebar.css
index f55001a5..624fa20b 100644
--- a/src/other/firefox/common/parts/sidebar.css
+++ b/src/other/firefox/common/parts/sidebar.css
@@ -54,8 +54,8 @@ fxview-search-textbox {
 }
 
 .sidebar-splitter {
-	width: 1px !important;
-	background-color: var(--gnome-toolbar-border-color, var(--gnome-toolbar-background)) !important;
-	background-image: linear-gradient(to top, var(--sidebar-background-color) 0%, var(--sidebar-background-color) 100%);
-	border: none !important;
+	min-width: 1px !important;
+	background: var(--gnome-browser-before-load-background) !important;
+	border-left: 1px solid var(--gnome-sidebar-border-color) !important;
+	border-right: none !important;
 }