diff --git a/photon-client/src/components/cameras/CameraSettingsCard.vue b/photon-client/src/components/cameras/CameraSettingsCard.vue
index a4d91b64a8..7d32386c9e 100644
--- a/photon-client/src/components/cameras/CameraSettingsCard.vue
+++ b/photon-client/src/components/cameras/CameraSettingsCard.vue
@@ -177,7 +177,7 @@ const wrappedCameras = computed<SelectItem[]>(() =>
         <v-btn
           block
           size="small"
-          color="primary"
+          color="buttonActive"
           :disabled="!settingsHaveChanged()"
           :variant="theme.global.name.value === 'LightTheme' ? 'elevated' : 'outlined'"
           @click="saveCameraSettings"
diff --git a/photon-client/src/lib/ThemeManager.ts b/photon-client/src/lib/ThemeManager.ts
index 4d6a7c585c..110257b066 100644
--- a/photon-client/src/lib/ThemeManager.ts
+++ b/photon-client/src/lib/ThemeManager.ts
@@ -52,11 +52,12 @@ export const restoreThemeConfig = (theme: ThemeInstance) => {
     : (customSurface ?? defaultTheme.colors!.sidebar!);
 
   theme.themes.value[theme.global.name.value].colors.primary = customPrimary ?? defaultTheme.colors!.primary!;
-  theme.themes.value[theme.global.name.value].colors.buttonActive = customPrimary ?? defaultTheme.colors!.buttonActive!;
+  theme.themes.value[theme.global.name.value].colors.buttonActive =
+    (themeType === "light" ? customPrimary : customSecondary) ?? defaultTheme.colors!.buttonActive!;
 
   theme.themes.value[theme.global.name.value].colors.secondary = customSecondary ?? defaultTheme.colors!.secondary!;
   theme.themes.value[theme.global.name.value].colors.buttonPassive =
-    customSecondary ?? defaultTheme.colors!.buttonPassive!;
+    (themeType === "light" ? customSecondary : customPrimary) ?? defaultTheme.colors!.buttonPassive!;
 
   theme.themes.value[theme.global.name.value].colors.accent = customSecondary ?? defaultTheme.colors!.accent!;
   theme.themes.value[theme.global.name.value].colors.toggle = customSecondary ?? defaultTheme.colors!.toggle!;