diff --git a/theme/parts/icons.css b/theme/parts/icons.css
index 00ffe12..0c565d4 100644
--- a/theme/parts/icons.css
+++ b/theme/parts/icons.css
@@ -46,6 +46,7 @@ button.close::before,
 #permissions-granted-icon,
 #downloads-indicator-icon,
 .textbox-search-clear,
+.urlbarView-type-icon,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore .toolbarbutton-icon,
@@ -363,7 +364,7 @@ button.close::before {
 }
 /* Preferences button */
 #preferences-button,
-.search-setting-button-compact > .button-box > .button-icon,
+.search-setting-button > .button-box > .button-icon,
 .unified-extensions-item-menu-button.subviewbutton {
 	list-style-image: url("../icons/settings-symbolic.svg") !important;
 }
diff --git a/theme/parts/urlbar.css b/theme/parts/urlbar.css
index 4fed219..e1706d2 100644
--- a/theme/parts/urlbar.css
+++ b/theme/parts/urlbar.css
@@ -75,12 +75,22 @@ toolbarspring {
 	border-radius: 5px !important;
 }
 
-.urlbarView-row[selected] .urlbarView-row-inner {
-	background: var(--gnome-accent-bg) !important;
-	color: white !important;
+.urlbarView-row[selected] {
+	background: var(--gnome-selected-color) !important;
+	color: var(--gnome-window-color) !important;
 }
-.urlbarView-row:not([selected]):hover .urlbarView-row-inner {
-	background: var(--gnome-menu-button-hover-background) !important;
+.urlbarView-row[selected]:hover {
+	background: var(--gnome-selected-hover-color) !important;
+}
+.urlbarView-row:not([selected]):hover {
+	background: var(--gnome-hover-color) !important;
+}
+.urlbarView-row:not([selected]):active {
+	background: var(--gnome-active-color) !important;
+}
+
+.urlbarView-url {
+	color: var(--gnome-accent) !important;
 }
 
 .urlbarView-action {