diff --git a/src/components/ha-combo-box.ts b/src/components/ha-combo-box.ts
index 5dd0c0527f..c80a131dca 100644
--- a/src/components/ha-combo-box.ts
+++ b/src/components/ha-combo-box.ts
@@ -19,7 +19,7 @@ registerStyles(
       padding: 0;
     }
     :host([focused]:not([disabled])) {
-      background-color: rgba(0, 0, 0, 0.12);
+      background-color: rgba(var(--rgb-primary-text-color, 0, 0, 0), 0.12);
     }
     :host([selected]:not([disabled])) {
       background-color: transparent;
diff --git a/src/components/ha-icon-picker.ts b/src/components/ha-icon-picker.ts
index 2d7c1002c5..57ec368cdc 100644
--- a/src/components/ha-icon-picker.ts
+++ b/src/components/ha-icon-picker.ts
@@ -174,6 +174,7 @@ export class HaIconPicker extends LitElement {
     return css`
       ha-icon,
       ha-svg-icon {
+        color: var(--primary-text-color);
         position: relative;
         bottom: 2px;
       }