diff --git a/grafana-plugin/src/components/ScheduleQuality/ScheduleQuality.module.css b/grafana-plugin/src/components/ScheduleQuality/ScheduleQuality.module.css
index 5f9d2674..24f1ab48 100644
--- a/grafana-plugin/src/components/ScheduleQuality/ScheduleQuality.module.css
+++ b/grafana-plugin/src/components/ScheduleQuality/ScheduleQuality.module.css
@@ -14,7 +14,7 @@
 .progress {
   width: 100%;
   height: 16px;
-  background-color: var(--secondary-background-shade);
+  background-color: var(--secondary-background);
   position: relative;
 }
 
diff --git a/grafana-plugin/src/containers/RotationForm/RotationForm.module.css b/grafana-plugin/src/containers/RotationForm/RotationForm.module.css
index b913ddb3..26042e17 100644
--- a/grafana-plugin/src/containers/RotationForm/RotationForm.module.css
+++ b/grafana-plugin/src/containers/RotationForm/RotationForm.module.css
@@ -45,7 +45,7 @@
 .day {
   width: 28px;
   height: 28px;
-  background: var(--secondary-background-shade);
+  background: var(--secondary-background);
   border-radius: 2px;
   line-height: 28px;
   text-align: center;
diff --git a/grafana-plugin/src/containers/RotationForm/RotationForm.tsx b/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
index 61be6987..da364a44 100644
--- a/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
+++ b/grafana-plugin/src/containers/RotationForm/RotationForm.tsx
@@ -154,7 +154,7 @@ const RotationForm: FC<RotationFormProps> = observer((props) => {
       rolling_users: userGroups,
       interval: repeatEveryValue,
       frequency: repeatEveryPeriod,
-      by_day: repeatEveryPeriod === 1 || repeatEveryPeriod === 0 ? selectedDays : null,
+      by_day: (repeatEveryPeriod === 0 && repeatEveryValue === 1) || repeatEveryPeriod === 1 ? selectedDays : null,
       priority_level: shiftId === 'new' ? layerPriority : shift?.priority_level,
     }),
     [
@@ -343,7 +343,7 @@ const RotationForm: FC<RotationFormProps> = observer((props) => {
                 />
               </Field>
             </HorizontalGroup>
-            {(repeatEveryPeriod === 1 || repeatEveryPeriod === 0) && (
+            {((repeatEveryPeriod === 0 && repeatEveryValue === 1) || repeatEveryPeriod === 1) && (
               <Field label="Select days to repeat">
                 <DaysSelector
                   options={store.scheduleStore.byDayOptions}
diff --git a/grafana-plugin/src/style/vars.css b/grafana-plugin/src/style/vars.css
index bf3e3852..748530b2 100644
--- a/grafana-plugin/src/style/vars.css
+++ b/grafana-plugin/src/style/vars.css
@@ -63,7 +63,6 @@
   --focused-box-shadow: rgb(17 18 23) 0 0 0 2px, rgb(61 113 217) 0 0 0 4px;
   --hover-selected: rgba(204, 204, 220, 0.12);
   --hover-selected-hardcoded: #34363d;
-  --secondary-background-shade: rgba(204, 204, 220, 0.2);
   --oncall-icon-stroke-color: #181b1f;
   --background-canvas: #111217;
   --background-primary: #181b1f;