diff --git a/fittrackee_client/src/components/Common/Dropdown.vue b/fittrackee_client/src/components/Common/Dropdown.vue
index 43074a5b..daf692ba 100644
--- a/fittrackee_client/src/components/Common/Dropdown.vue
+++ b/fittrackee_client/src/components/Common/Dropdown.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="dropdown-wrapper">
     <button
+      :aria-label="buttonLabel"
       :aria-expanded="isOpen"
       class="dropdown-selector transparent"
       @click="toggleDropdown"
@@ -32,6 +33,7 @@
   interface Props {
     options: TDropdownOptions
     selected: string
+    buttonLabel: string
   }
   const props = defineProps<Props>()
 
diff --git a/fittrackee_client/src/components/NavBar.vue b/fittrackee_client/src/components/NavBar.vue
index a99cc019..3495e972 100644
--- a/fittrackee_client/src/components/NavBar.vue
+++ b/fittrackee_client/src/components/NavBar.vue
@@ -82,6 +82,7 @@
             :options="availableLanguages"
             :selected="language"
             @selected="updateLanguage"
+            :buttonLabel="$t('user.REGISTER')"
           >
             <i class="fa fa-language"></i>
           </Dropdown>
diff --git a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutCardTitle.vue b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutCardTitle.vue
index 3debbeec..ce0d4891 100644
--- a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutCardTitle.vue
+++ b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutCardTitle.vue
@@ -30,6 +30,7 @@
                 params: { workoutId: workoutObject.workoutId },
               })
             "
+            :aria-label="$t(`workouts.EDIT_WORKOUT`)"
           >
             <i class="fa fa-edit" aria-hidden="true" />
           </button>
@@ -37,6 +38,7 @@
             v-if="workoutObject.with_gpx"
             class="transparent icon-button"
             @click.prevent="downloadGpx(workoutObject.workoutId)"
+            :aria-label="$t(`workouts.DOWNLOAD_WORKOUT`)"
           >
             <i class="fa fa-download" aria-hidden="true" />
           </button>
@@ -44,6 +46,7 @@
             id="delete-workout-button"
             class="transparent icon-button"
             @click="displayDeleteModal"
+            :aria-label="$t(`workouts.DELETE_WORKOUT`)"
           >
             <i class="fa fa-trash" aria-hidden="true" />
           </button>
diff --git a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue
index e3e2d1e8..a6b23ce2 100644
--- a/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue
+++ b/fittrackee_client/src/components/Workout/WorkoutDetail/WorkoutMap/index.vue
@@ -23,6 +23,7 @@
               class="map-control"
               tabindex="0"
               role="button"
+              :aria-label="$t('workouts.RESET_ZOOM')"
               @click="resetZoom"
             >
               <i class="fa fa-refresh" aria-hidden="true" />
@@ -32,6 +33,9 @@
               class="map-control"
               tabindex="0"
               role="button"
+              :aria-label="
+                $t(`workouts.${isFullscreen ? 'EXIT' : 'VIEW'}}_FULLSCREEN`)
+              "
               @click="toggleFullscreen"
             >
               <i
diff --git a/fittrackee_client/src/locales/en/workouts.json b/fittrackee_client/src/locales/en/workouts.json
index 0313ae1e..9b172864 100644
--- a/fittrackee_client/src/locales/en/workouts.json
+++ b/fittrackee_client/src/locales/en/workouts.json
@@ -6,13 +6,16 @@
     "AVE_SPEED": "ave. speed",
     "BACK_TO_WORKOUT": "back to workout",
     "DATE": "date",
+    "DELETE_WORKOUT": "Delete the workout",
     "DESCENT": "descent",
     "DISPLAY_FILTERS": "display filters",
     "DISTANCE": "distance",
+    "DOWNLOAD_WORKOUT": "Download the workout",
     "DURATION": "duration",
     "EDIT_WORKOUT": "Edit the workout",
     "ELEVATION": "elevation",
     "END": "end",
+    "EXIT_FULLSCREEN": "Exit Fullscreen",
     "FROM": "from",
     "GPX_FILE": ".gpx file",
     "HIDE_FILTERS": "hide filters",
@@ -50,6 +53,7 @@
     "RECORD_LD": "Longest duration",
     "RECORD_MS": "Max. speed",
     "REMAINING_CHARS": "remaining characters",
+    "RESET_ZOOM": "Reset zoom",
     "SEGMENT": "segment | segments",
     "SPEED": "speed",
     "SPORT": "sport | sports",
@@ -60,6 +64,7 @@
     "TO": "to",
     "TOTAL_DURATION": "total duration",
     "UPLOAD_FIRST_WORKOUT": "Upload one!",
+    "VIEW_FULLSCREEN": "View Fullscreen",
     "WEATHER": {
         "DARK_SKY": {
             "clear-day": "clear day",
diff --git a/fittrackee_client/src/locales/fr/workouts.json b/fittrackee_client/src/locales/fr/workouts.json
index ae7ecb81..8ca04a5e 100644
--- a/fittrackee_client/src/locales/fr/workouts.json
+++ b/fittrackee_client/src/locales/fr/workouts.json
@@ -6,13 +6,16 @@
     "AVE_SPEED": "vitesse moy.",
     "BACK_TO_WORKOUT": "revenir à la séance",
     "DATE": "date",
+    "DELETE_WORKOUT": "Supprimer la séance",
     "DESCENT": "dénivelé négatif",
     "DISPLAY_FILTERS": "afficher les filtres",
     "DISTANCE": "distance",
+    "DOWNLOAD_WORKOUT": "Télécharger la séance",
     "DURATION": "durée",
     "EDIT_WORKOUT": "Modifier la séance",
     "ELEVATION": "altitude",
     "END": "fin",
+    "EXIT_FULLSCREEN": "Sortir du plein-écran",
     "FROM": "à partir de",
     "GPX_FILE": "fichier .gpx",
     "HIDE_FILTERS": "masquer les filtres",
@@ -50,6 +53,7 @@
     "RECORD_LD": "Durée la + longue",
     "RECORD_MS": "Vitesse max.",
     "REMAINING_CHARS": "nombre de caractères restants ",
+    "RESET_ZOOM": "Réinitialiser le zoom",
     "SEGMENT": "segment | segments",
     "SPEED": "vitesse",
     "SPORT": "sport | sports",
@@ -60,6 +64,7 @@
     "TO": "jusqu'au",
     "TOTAL_DURATION": "durée totale",
     "UPLOAD_FIRST_WORKOUT": "Ajoutez votre première séance !",
+    "VIEW_FULLSCREEN": "Afficher en plein-écran",
     "WEATHER": {
         "DARK_SKY": {
             "clear-day": "ensoleillé",