diff --git a/src/components/BikeMarker.vue b/src/components/BikeMarker.vue
new file mode 100644
index 0000000..3b2a06b
--- /dev/null
+++ b/src/components/BikeMarker.vue
@@ -0,0 +1,49 @@
+<script lang="ts" setup>
+import type { BikeParking } from '@/types/Bikes';
+import { PhBicycle, PhLockKey, PhSquareHalf, PhWarehouse } from '@phosphor-icons/vue';
+import { LIcon, LMarker, LPopup } from '@vue-leaflet/vue-leaflet';
+import type { PointTuple } from 'leaflet';
+import { computed, ref } from 'vue';
+
+defineProps<{
+  park: BikeParking
+}>()
+
+const normalIconSize: PointTuple = [30, 30]
+
+const iconSize = ref<PointTuple>(normalIconSize)
+const iconAnchor = computed<PointTuple>(() => [iconSize.value[0] / 2, iconSize.value[1]])
+const popupOffset = [0, iconSize.value[0] * -0.66]
+</script>
+
+<template>
+  <LMarker :lat-lng="[park.geo_point_2d.lat, park.geo_point_2d.lon]">
+    <LPopup :options="{ offset: popupOffset, maxWidth: 380, minWidth: 180 }">
+      <div>
+        <h2 class="font-bold">
+          {{ park.nom_voie }}, {{ park.nom_commune }}
+        </h2>
+
+        <div class="text-xs">
+          {{ park.type }}, <strong>{{ park.nb_total_place }} places</strong>
+        </div>
+
+        <hr class="border-muted-foreground opacity-50 my-1">
+
+        <div v-if="park.annee_mes" class="italic text-xs">
+          Mis en service en {{ park.annee_mes }}
+        </div>
+
+        <div v-if="park.commentaire" v-html="park.commentaire"
+          class="before:content-[''] before:inline-block before:w-1 before:h-[1em] before:-my-0.5 before:mr-1 before:rounded-xs before:bg-muted-foreground italic text-xs text-muted-foreground" />
+      </div>
+    </LPopup>
+
+    <LIcon :icon-size :icon-anchor>
+      <PhBicycle v-if="park.type === 'Non abrité'" size="18" />
+      <PhWarehouse v-else-if="park.type === 'Abrité'" size="18" />
+      <PhSquareHalf v-else-if="park.type === 'Box individuel'" size="18" />
+      <PhLockKey v-else-if="park.type === 'Collectif sécurisé'" size="18" weight="fill" />
+    </LIcon>
+  </LMarker>
+</template>
diff --git a/src/components/Map.vue b/src/components/Map.vue
index d15f8a2..0e64b5f 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -2,18 +2,17 @@
 import 'leaflet/dist/leaflet.css'
 import 'vue-leaflet-markercluster/dist/style.css'
 
-import L, { type PointTuple } from 'leaflet'
+import L from 'leaflet'
 globalThis.L = L
 
+import { useMap } from '@/stores/map'
 import type { ApiResponse } from '@/types/Api'
 import type { BikeParking } from '@/types/Bikes'
 import { API_BASE_URL, API_LIMIT } from '@/utils/const'
 import { useQuery } from '@pinia/colada'
-import { LControlZoom, LIcon, LMap, LMarker, LPopup, LTileLayer } from '@vue-leaflet/vue-leaflet'
+import { LControlZoom, LMap, LTileLayer } from '@vue-leaflet/vue-leaflet'
 import { LMarkerClusterGroup } from 'vue-leaflet-markercluster'
-import { useMap } from '@/stores/map'
-import { computed, ref } from 'vue'
-import { PhBicycle } from '@phosphor-icons/vue'
+import BikeMarker from './BikeMarker.vue'
 
 async function fetchAllBikeParkings(): Promise<BikeParking[]> {
   const firstPage = await fetch(`${API_BASE_URL}?limit=${API_LIMIT}`).then(r => r.json()) as ApiResponse
@@ -38,11 +37,6 @@ const { state } = useQuery({
 })
 
 const { zoom, minZoom, center } = useMap()
-const normalIconSize: PointTuple = [30, 30]
-
-const iconSize = ref<PointTuple>(normalIconSize)
-const iconAnchor = computed<PointTuple>(() => [iconSize.value[0] / 2, iconSize.value[1]])
-const popupOffset = [0, iconSize.value[0] * -0.66]
 </script>
 
 <template>
@@ -64,33 +58,7 @@ const popupOffset = [0, iconSize.value[0] * -0.66]
 
         <!-- Review CSGroup -->
         <LMarkerClusterGroup v-if="state.data.length > 0" :max-cluster-radius="30" :disable-clustering-at-zoom="20">
-          <LMarker v-once v-for="park in state.data" :key="park.code_insee"
-            :lat-lng="[park.geo_point_2d.lat, park.geo_point_2d.lon]">
-            <LPopup :options="{ offset: popupOffset, maxWidth: 380, minWidth: 180 }">
-              <div>
-                <h2 class="font-bold">
-                  {{ park.nom_voie }}, {{ park.nom_commune }}
-                </h2>
-
-                <div class="text-xs">
-                  {{ park.type }}, <strong>{{ park.nb_total_place }} places</strong>
-                </div>
-
-                <hr class="border-muted-foreground opacity-50 my-1">
-
-                <div v-if="park.annee_mes" class="italic text-xs">
-                  Mis en service en {{ park.annee_mes }}
-                </div>
-
-                <div v-if="park.commentaire" v-html="park.commentaire"
-                  class="before:content-[''] before:inline-block before:w-1 before:h-[1em] before:-my-0.5 before:mr-1 before:rounded-xs before:bg-muted-foreground italic text-xs text-muted-foreground" />
-              </div>
-            </LPopup>
-
-            <LIcon :icon-size :icon-anchor>
-              <PhBicycle size="18" />
-            </LIcon>
-          </LMarker>
+          <BikeMarker v-once v-for="park in state.data" :key="park.code_insee" :park />
         </LMarkerClusterGroup>
       </LMap>
     </template>
diff --git a/src/stores/map.ts b/src/stores/map.ts
index 183e3f9..a246b64 100644
--- a/src/stores/map.ts
+++ b/src/stores/map.ts
@@ -3,9 +3,9 @@ import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
 export const useMap = defineStore('map', () => {
-  const zoom = ref(7)
-  const minZoom = 4
-  const center = ref<PointTuple>([47.809376, -0.637207])
+  const zoom = ref(10)
+  const minZoom = 6
+  const center = ref<PointTuple>([48.11180645878813, -1.6637869497745246])
 
   return {
     zoom,