diff --git a/web/app/src/views/FirstTimeWizardView.vue b/web/app/src/views/FirstTimeWizardView.vue
index c114bd69..f434aff7 100644
--- a/web/app/src/views/FirstTimeWizardView.vue
+++ b/web/app/src/views/FirstTimeWizardView.vue
@@ -7,7 +7,9 @@
         @click="jumpToStep(step)"
         :class="{
           current: step == currentSetupStep,
-          done: step < currentSetupStep,
+          done: step < overallSetupStep,
+          done_previously: (step < overallSetupStep && currentSetupStep > step),
+          done_and_current: step == currentSetupStep && (step < overallSetupStep || step == 1),
           disabled: step > overallSetupStep,
         }"
         >
@@ -498,6 +500,11 @@ export default {
 }
 
 .progress li.done span {
+  background-color: var(--setup-progress-indicator-color);
+  box-shadow: 0 0 0 var(--setup-progress-indicator-border-width) var(--setup-progress-indicator-color);
+}
+
+.progress li.done_previously span {
   background-color: var(--setup-progress-indicator-color-done);
   box-shadow: 0 0 0 var(--setup-progress-indicator-border-width) var(--setup-progress-indicator-color-done);
 }
@@ -507,6 +514,11 @@ export default {
   box-shadow: 0 0 0 var(--setup-progress-indicator-border-width) var(--setup-progress-indicator-color-current);
 }
 
+.progress li.done_and_current span {
+  background-color: var(--setup-progress-indicator-color-current);
+  box-shadow: 0 0 0 var(--setup-progress-indicator-border-width) var(--setup-progress-indicator-color-current);
+}
+
 body.is-setup-assistant #app {
   grid-template-areas:
     "header"