diff --git a/frontend/src/components/AskingExpert.vue b/frontend/src/components/AskingExpert.vue
index de8a8fd1..72ab76c1 100644
--- a/frontend/src/components/AskingExpert.vue
+++ b/frontend/src/components/AskingExpert.vue
@@ -46,7 +46,6 @@ async function sendTutorialFeedback () {
       setMessage({ type: 'error', message: 'Une erreur a eu lieu en enregistrant de votre message.' })
     })
     .finally(() => setTimeout(() => {
-      stepsStore.setCurrentStep(1)
       stepsStore.tutorialFeedback = ''
       router.push({ name: 'ResultPage' })
     }, 3000))
diff --git a/frontend/src/components/HeaderMain.vue b/frontend/src/components/HeaderMain.vue
index d0be8b9c..69301470 100644
--- a/frontend/src/components/HeaderMain.vue
+++ b/frontend/src/components/HeaderMain.vue
@@ -62,8 +62,13 @@ const quickLinks: InstanceType<typeof DsfrHeader>['$props']['quickLinks'] = [
   }
 }
 
+:deep(.fr-header__navbar) {
+  margin-top: 0 !important;
+}
+
 :deep(.fr-header__navbar .fr-btn--menu) {
   color : var(--text-action-high-blue-france);
+  box-shadow: none;
 }
 
 .marianne-only :deep(.fr-header__logo .fr-logo::before) {
diff --git a/frontend/src/stores/steps.ts b/frontend/src/stores/steps.ts
index fc2fb12c..677688f0 100644
--- a/frontend/src/stores/steps.ts
+++ b/frontend/src/stores/steps.ts
@@ -6,7 +6,6 @@ import { serializer } from '@/utils/storage-utils'
 type Step = Record<'1' | '2' | '3', string>
 
 export const useStepsStore = defineStore('steps', () => {
-  const currentStep = useLocalStorage<1 | 2 | 3>('currentStep', 1)
   const currentOptionStep = useLocalStorage<Partial<Step>>('currentOptionStep', {})
 
   const selectedAmmo = useLocalStorage<string | undefined>('selectedAmmo', undefined, { serializer })
@@ -17,10 +16,6 @@ export const useStepsStore = defineStore('steps', () => {
 
   const isModalTransparentAmmoOpened = useLocalStorage<boolean | undefined>('isModalTransparentAmmoOpened', undefined, { serializer })
 
-  function setCurrentStep (newStep: 1 | 2 | 3) {
-    currentStep.value = newStep
-  }
-
   function setAmmo (ammo?: string) {
     selectedAmmo.value = ammo
   }
@@ -34,7 +29,6 @@ export const useStepsStore = defineStore('steps', () => {
   }
 
   return {
-    currentStep,
     currentOptionStep,
     selectedAmmo,
     selectedAlarmGun,
@@ -45,7 +39,6 @@ export const useStepsStore = defineStore('steps', () => {
       isModalTransparentAmmoOpened.value = val
     },
     isModalTransparentAmmoOpened,
-    setCurrentStep,
     setAmmo,
     $reset,
   }
diff --git a/frontend/src/utils/storage-utils.ts b/frontend/src/utils/storage-utils.ts
index 760faf1d..4db130d8 100644
--- a/frontend/src/utils/storage-utils.ts
+++ b/frontend/src/utils/storage-utils.ts
@@ -9,7 +9,7 @@ export const serializer = {
 }
 
 export const clearLocalStorage: NavigationGuardWithThis<undefined> = (to, from, next) => {
-  const { setAmmo, setOptionStep, setCurrentStep, setModalTransparentAmmoOpened } = useStepsStore()
+  const { setAmmo, setOptionStep, setModalTransparentAmmoOpened } = useStepsStore()
   const resultStore = useResultStore()
 
   setModalTransparentAmmoOpened(undefined)
@@ -17,7 +17,6 @@ export const clearLocalStorage: NavigationGuardWithThis<undefined> = (to, from,
   setOptionStep(1, undefined)
   setOptionStep(2, undefined)
   setOptionStep(3, undefined)
-  setCurrentStep(0)
 
   resultStore.$patch({
     typology: undefined,
diff --git a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
index 3e6d3496..16bf7610 100644
--- a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
+++ b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
@@ -3,8 +3,6 @@ import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
 import {
-  identificationRoutePaths,
-  identificationRoutePathsWithArmeAlarme,
   identificationGuideSteps,
   identificationGuideStepsWithArmeAlarme,
   resultTree,
@@ -21,14 +19,7 @@ const route = useRoute()
 const confidenceLevel = computed(() => resultStore.confidenceLevel)
 const typology = computed(() => resultStore.typology)
 
-const currentStep = computed({
-  get () {
-    return stepsStore.currentStep + 1
-  },
-  set (value) {
-    stepsStore.setCurrentStep(value as 1 | 2 | 3)
-  },
-})
+const currentStep = ref(1)
 
 const isDummyTypology = resultTree[resultStore.typology].isDummyTypology
 const isLowConfidence = confidenceLevel.value === 'low'
@@ -47,29 +38,16 @@ const steps = computed(() => {
 
 const disabledValidation = computed(() => currentStep.value === 3 && stepsStore.selectedAmmo === undefined)
 
-const goToNewRoute = () => (
-  router.push({ name: `${identificationGuideSteps[currentStep.value - 1]}` }).catch(() => { })
-)
+const goToNewRoute = () => {
+  router.push({ name: identificationGuideSteps[currentStep.value - 1] })
+}
 
 const goToNewRouteWithArmeAlarme = () => (
-  router.push({ name: `${identificationGuideStepsWithArmeAlarme[currentStep.value - 1]}` })
+  router.push({ name: identificationGuideStepsWithArmeAlarme[currentStep.value - 1] })
 )
 
 const isArmeAlarme = computed(() => route.path === '/guide-identification/armes-alarme')
 
-const goToPreviousStep = () => (
-  currentStep.value = currentStep.value - 2
-)
-
-const stepsNumber = computed(() => ALARM_GUNS_TYPOLOGIES.includes(resultStore.typology)
-  ? identificationRoutePaths.length
-  : identificationRoutePathsWithArmeAlarme.length,
-)
-
-const goToNextStep = () => (
-  currentStep.value = currentStep.value < stepsNumber.value ? currentStep.value : stepsNumber.value
-)
-
 const goOnAndFollow = computed(() => (
   currentStep.value === 1
     ? 'Continuer'
@@ -89,7 +67,7 @@ const calculateRoute = (stepsStore) => {
 // showDiv is used to create a mini steper for alarm guns. Need to be reworked.
 const backStepButtonAction = () => {
   if (showDiv.value === false) {
-    goToPreviousStep()
+    currentStep.value--
     goToNewRouteWithArmeAlarme()
   } else {
     showDiv.value = false
@@ -100,15 +78,15 @@ const nextStepButtonAction = () => {
   if (showDiv.value === false) {
     showDiv.value = true
   } else {
-    goToNextStep(); goToNewRouteWithArmeAlarme()
+    currentStep.value++; goToNewRouteWithArmeAlarme()
   }
 }
 
 function handlePreviousButtonClick () {
-  goToPreviousStep()
+  currentStep.value--
   if (ALARM_GUNS_TYPOLOGIES.includes(typology.value)) {
     goToNewRouteWithArmeAlarme()
-  } else if (resultTree[typology]?.isDummyTypology) {
+  } else {
     goToNewRoute()
   }
 }
@@ -122,7 +100,7 @@ const showDiv = ref(false)
     <div class="result fr-col-11 fr-col-lg-6 mx-auto">
       <StepsGuide
         v-if="resultTree[typology]?.isDummyTypology"
-        class="!fr-container steps-guide"
+        class="!fr-container my-auto"
         :steps="steps"
         :current-step="currentStep"
       />
@@ -160,12 +138,12 @@ const showDiv = ref(false)
       class="fr-col-11 fr-col-lg-6 footer-actions mx-auto"
     >
       <DsfrButton
-        v-if="currentStep > 1"
+        v-if="currentStep > 0"
         class="m-1 flex justify-center !w-full"
         icon="ri-arrow-left-line"
         :secondary="true"
         label="Précédent"
-        @click="goToPreviousStep(); goToNewRoute()"
+        @click="currentStep--; goToNewRoute()"
       />
       <DsfrButton
         class="fr-btn--md m-1 flex justify-center !w-full"
@@ -174,7 +152,7 @@ const showDiv = ref(false)
         :icon="arrowOrCircleIcon()"
         :label="goOnAndFollow"
         :icon-right="true"
-        @click="$router.push(calculateRoute(stepsStore)); goToNextStep()"
+        @click="$router.push(calculateRoute(stepsStore)); currentStep++"
       />
     </div>
   </div>
@@ -185,15 +163,15 @@ const showDiv = ref(false)
   >
     <div class="fr-col-11 fr-col-lg-6 footer-actions mx-auto">
       <DsfrButton
-        v-if="currentStep > 1"
-        class="m-1 flex justify-center !w-full"
+        v-if="currentStep > 0"
+        class="m-1 flex justify-center w-100"
         icon="ri-arrow-left-line"
         :secondary="true"
         label="Précédent"
         @click="backStepButtonAction"
       />
       <DsfrButton
-        class="m-1 flex justify-center !w-full"
+        class="m-1 flex justify-center w-100"
         icon="ri-arrow-right-line"
         :label="goOnAndFollow"
         :icon-right="true"
@@ -212,14 +190,14 @@ const showDiv = ref(false)
       class="fr-col-11 fr-col-lg-6 mx-auto"
     >
       <DsfrButton
-        class="flex justify-center !w-full"
+        class="flex justify-center w-100"
         label="Identifier une nouvelle arme"
         icon="ri-camera-fill"
         :icon-right="true"
         @click="$router.push({name: 'InstructionsPage'})"
       />
       <DsfrButton
-        class="mt-3 flex justify-center !w-full"
+        class="mt-3 flex justify-center w-100"
         label="Retour à l'accueil"
         icon="ri-home-4-line"
         :icon-right="true"
@@ -233,45 +211,31 @@ const showDiv = ref(false)
     >
       <DsfrButton
         v-if="currentStep > 1"
-        class="m-1 flex justify-center w-50"
+        class="m-1 flex justify-center w-100"
         icon="ri-arrow-left-line"
         :secondary="true"
         label="Précédent"
-        @click="goToPreviousStep(); goToNewRoute()"
+        @click="currentStep--; goToNewRoute()"
       />
       <DsfrButton
         v-if="confidenceLevel !== 'low'"
         :disabled="disabledValidation"
-        class="m-1 flex justify-center w-50"
+        class="m-1 flex justify-center w-100"
         :icon="arrowOrCircleIcon()"
         :label="goOnAndFollow"
         :icon-right="true"
         data-testid="next-step"
-        @click="goToNextStep(); goToNewRoute()"
+        @click="currentStep++; goToNewRoute()"
       />
     </div>
   </div>
 </template>
 
 <style scoped>
-.steps-guide {
-  margin: auto;
-}
 
 .result {
-margin: 0 auto;
-max-width: 1000px;
-}
-
-.go-home {
-width: 3em;
-height: 3em;
-}
-
-.go-result {
-  font-size: 0.9em;
-  color:  080894;
-  background-image: none !important;
+  margin: 0 auto;
+  max-width: 1000px;
 }
 
 :deep(div.fr-stepper__steps) {
@@ -286,24 +250,9 @@ height: 3em;
   color: var(--blue-france-sun-113-625);
 }
 
-.fr-link--close {
-  visibility: hidden;
-}
-
-.wrapper-btn {
-  margin: 0.8em;
-  padding: 0;
-  display: flex;
-  justify-content: center;
-  flex-direction: column;
-}
-
 .footer {
   text-align: center;
   background-color: #fff;
   box-shadow: 0 -4px 16px rgb(0 0 0 / 25%);
 }
-.w-50 {
-  width: 50%;
-}
 </style>
diff --git a/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue b/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue
index 8a3bf66c..785f1711 100644
--- a/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue
+++ b/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue
@@ -1,35 +1,24 @@
 <script lang="ts" setup>
-import { computed } from 'vue'
 import { useRouter } from 'vue-router'
 
-import { securingRoutePaths, securingGuideSteps } from '@/utils/firearms-utils/index'
+import { securingGuideSteps } from '@/utils/firearms-utils/index'
 import StepsGuide from '@/components/StepsGuide.vue'
-import { useStepsStore } from '@/stores/steps'
 
-const currentStep = computed<1 | 2 | 3>({
-  get () {
-    return stepsStore.currentStep + 1 as 1 | 2 | 3
-  },
-  set (value: 1 | 2 | 3) {
-    stepsStore.setCurrentStep(value)
-  },
-})
 const steps = ['Mise en garde', 'Consignes de sécurité', 'Photo']
+const currentStep = ref(0)
 
-const stepsStore = useStepsStore()
 const router = useRouter()
 
-const goToNewRoute = () => (
-  router.push({ name: `${securingGuideSteps[currentStep.value - 1]}` }).catch(() => { })
-)
-
-const goToPreviousStep = () => (
-  currentStep.value = currentStep.value - 2 as 1 | 2 | 3
-)
+const getNextRoute = () => {
+  if (currentStep.value < 0) {
+    router.push({ name: 'StartPage' })
+  } else if (currentStep.value >= steps.length) {
+    router.push({ name: 'InstructionsPage' })
+  } else {
+    router.push({ name: securingGuideSteps[currentStep.value] })
+  }
+}
 
-const goToNextStep = () => (
-  currentStep.value = currentStep.value < securingRoutePaths.length ? currentStep.value : securingRoutePaths.length
-)
 </script>
 
 <template>
@@ -37,9 +26,9 @@ const goToNextStep = () => (
     <div class="result fr-col-11 fr-col-lg-6 mx-auto">
       <div>
         <StepsGuide
-          class="steps-guide"
+          class="my-auto"
           :steps="steps"
-          :current-step="currentStep"
+          :current-step="currentStep + 1"
         />
         <h2 class="m-2.5">
           Mettre en sécurité mon arme
@@ -52,29 +41,19 @@ const goToNextStep = () => (
         class="fr-col-11 fr-col-lg-6 footer-actions mx-auto"
       >
         <DsfrButton
-          class="m-1 flex justify-center"
+          class="m-1 flex justify-center w-100"
           icon="ri-arrow-left-line"
           :secondary="true"
           label="Précédent"
-          @click="goToPreviousStep(); router.back()"
-        />
-        <DsfrButton
-          v-if="currentStep < steps.length"
-          class="m-1 flex justify-center"
-          icon="ri-arrow-right-line"
-          data-testid="button-next"
-          label="Suivant"
-          :icon-right="true"
-          @click="goToNextStep(); goToNewRoute()"
+          @click="currentStep--; getNextRoute()"
         />
         <DsfrButton
-          v-if="currentStep === steps.length"
-          class="m-1 flex justify-center"
+          class="m-1 flex justify-center w-100"
           icon="ri-arrow-right-line"
           data-testid="button-next"
           label="Suivant"
           :icon-right="true"
-          @click="router.push({ name:'InstructionsPage'})"
+          @click="currentStep++; getNextRoute()"
         />
       </div>
     </div>
@@ -82,24 +61,16 @@ const goToNextStep = () => (
 </template>
 
 <style scoped>
-.steps-guide {
-margin: auto;
-}
 
 .result {
-margin: 0 auto;
-max-width: 1000px;
-}
-
-.go-home {
-width: 3em;
-height: 3em;
+  margin: 0 auto;
+  max-width: 1000px;
 }
 
 .go-result {
-font-size: 0.9em;
-color: #080894;
-background-image: none !important;
+  font-size: 0.9em;
+  color: #080894;
+  background-image: none !important;
 }
 
 h4 {
@@ -118,23 +89,8 @@ h4 {
   color: var(--blue-france-sun-113-625);
 }
 
-.fr-link--close {
-visibility: hidden;
-}
-
-.wrapper-btn {
-margin: 0.8em;
-padding: 0;
-display: flex;
-justify-content: center;
-flex-direction: column;
-}
-
 .footer {
-background-color: #fff;
-box-shadow: 0 -4px 16px rgb(0 0 0 / 25%);
-}
-.footer button {
-width: 50%;
+  background-color: #fff;
+  box-shadow: 0 -4px 16px rgb(0 0 0 / 25%);
 }
-  </style>
+</style>