diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.scss b/apps/client/src/app/pages/portfolio/fire/fire-page.scss
index 6a5f037e25..9b0c61fcbb 100644
--- a/apps/client/src/app/pages/portfolio/fire/fire-page.scss
+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.scss
@@ -21,6 +21,11 @@
       box-shadow: none;
       outline: 0;
     }
+
+    option {
+      background-color: var(--light-background);
+      color: rgb(var(--dark-primary-text));
+    }
   }
 }
 
@@ -31,7 +36,8 @@
     color: rgb(var(--light-primary-text));
 
     option {
-      color: rgb(var(--dark-primary-text));
+      background-color: var(--dark-background);
+      color: rgb(var(--light-primary-text));
     }
   }
 }
diff --git a/apps/client/src/styles/theme.scss b/apps/client/src/styles/theme.scss
index 3f81250116..12f52684a7 100644
--- a/apps/client/src/styles/theme.scss
+++ b/apps/client/src/styles/theme.scss
@@ -249,6 +249,12 @@ $gf-typography: (
     )
   );
 
+  @include mat.autocomplete-overrides(
+    (
+      background-color: var(--dark-background)
+    )
+  );
+
   @include mat.button-overrides(
     (
       outlined-label-text-color: var(--light-primary-text),
@@ -271,6 +277,30 @@ $gf-typography: (
     )
   );
 
+  @include mat.datepicker-overrides(
+    (
+      calendar-container-background-color: var(--dark-background)
+    )
+  );
+
+  @include mat.dialog-overrides(
+    (
+      container-color: var(--dark-background)
+    )
+  );
+
+  @include mat.menu-overrides(
+    (
+      container-color: var(--dark-background)
+    )
+  );
+
+  @include mat.select-overrides(
+    (
+      panel-background-color: var(--dark-background)
+    )
+  );
+
   @include mat.slide-toggle-overrides(
     (
       selected-track-outline-color: rgba(var(--light-dividers)),