diff --git a/chrome/urlbar/urlbar.css b/chrome/urlbar/urlbar.css
index a78e228..703529d 100644
--- a/chrome/urlbar/urlbar.css
+++ b/chrome/urlbar/urlbar.css
@@ -1,12 +1,3 @@
-.urlbar-icon, #identity-box, #tracking-protection-icon-box {
-	fill: currentColor !important;
-	color: #666 !important;
-}
-:root[lwthemetextcolor="bright"] :-moz-any(.urlbar-icon, #identity-box, #tracking-protection-icon-box) {
-	fill: currentColor !important;
-	color: #bbb !important;
-}
-
 .urlbarView-body-inner
 {
 	border: 0 !important;
@@ -199,7 +190,8 @@
 #searchbar:hover
 {
 	background-color: var(--toolbar-field-hover-background-color) !important;
-	border: 1px solid var(--toolbar-field-hover-border-color) !important;
+	border: 1px solid var(--toolbar-field-hover-background-color) !important;
+	border-color: var(--toolbar-field-hover-border-color) !important;
 	padding: 1px !important;
 }
 
@@ -231,7 +223,7 @@
 {
 	border: 0 !important;
 	padding: 0 !important;
-	padding-inline: 1px 10px !important;
+	padding-inline: 1px 1px !important;
 	border-radius: 6px !important;
 	min-height: 37px !important;
 	margin: -4px 0 -1px !important;
@@ -247,6 +239,9 @@
 	left: 0 !important;
 	width: 100% !important;
 }
+#urlbar[open] #urlbar-input {
+	margin-right: 10px !important;
+}
 
 /* 71+ */
 #urlbar-background
@@ -284,6 +279,12 @@
 {
 	color: var(--lwt-toolbar-field-color) !important;
 }
+#urlbar[focused],
+#urlbar[focused] #urlbar-input,
+.searchbar-textbox:focus
+{
+	color: var(--lwt-toolbar-field-focus-color) !important;
+}
 
 #urlbar-input::placeholder,
 .searchbar-textbox::placeholder