diff --git a/app/javascript/submission_form/attachment_step.vue b/app/javascript/submission_form/attachment_step.vue
index 81557da7..ce6efd37 100644
--- a/app/javascript/submission_form/attachment_step.vue
+++ b/app/javascript/submission_form/attachment_step.vue
@@ -28,6 +28,7 @@
         </a>
         <button
           class="remove-attachment-button"
+          :aria-label="t('remove_attachment')"
           @click.prevent="removeAttachment(val)"
         >
           <IconTrashX
diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue
index e071e9ee..c6307fde 100644
--- a/app/javascript/template_builder/area.vue
+++ b/app/javascript/template_builder/area.vue
@@ -164,6 +164,7 @@
         v-else-if="editable"
         class="pr-1"
         :title="t('remove')"
+        :aria-label="t('remove')"
         @click.prevent="$emit('remove')"
       >
         <IconX width="14" />
diff --git a/app/javascript/template_builder/controls.vue b/app/javascript/template_builder/controls.vue
index 2196fe56..3a3713c8 100644
--- a/app/javascript/template_builder/controls.vue
+++ b/app/javascript/template_builder/controls.vue
@@ -17,6 +17,7 @@
       v-if="withArrows"
       class="btn border-base-200 bg-white text-base-content btn-xs rounded hover:text-base-100 hover:bg-base-content hover:border-base-content w-full transition-colors document-control-button"
       style="width: 24px; height: 24px"
+      aria-label="Move document up"
       @click.stop="$emit('up', item)"
     >
       &uarr;
@@ -25,6 +26,7 @@
       v-if="withArrows"
       class="btn border-base-200 bg-white text-base-content btn-xs rounded hover:text-base-100 hover:bg-base-content hover:border-base-content w-full transition-colors document-control-button"
       style="width: 24px; height: 24px"
+      aria-label="Move document down"
       @click.stop="$emit('down', item)"
     >
       &darr;
@@ -32,6 +34,7 @@
     <button
       class="btn border-base-200 bg-white text-base-content btn-xs rounded hover:text-base-100 hover:bg-base-content hover:border-base-content w-full transition-colors document-control-button"
       style="width: 24px; height: 24px"
+      aria-label="Remove document"
       @click.stop="$emit('remove', item)"
     >
       &times;
diff --git a/app/javascript/template_builder/custom_field.vue b/app/javascript/template_builder/custom_field.vue
index 21317261..afc1dd8d 100644
--- a/app/javascript/template_builder/custom_field.vue
+++ b/app/javascript/template_builder/custom_field.vue
@@ -61,6 +61,8 @@
             <label
               tabindex="0"
               :title="t('settings')"
+              :aria-label="t('settings')"
+              role="button"
               class="cursor-pointer text-transparent group-hover:text-base-content"
             >
               <IconSettings
@@ -96,6 +98,7 @@
             v-if="isNew && !$refs.name"
             class="relative text-base-content pr-1 field-save-button"
             :title="t('save')"
+            :aria-label="t('save')"
             @click="field.name ? $emit('save', field) : focusName()"
           >
             <IconCheck
@@ -107,6 +110,7 @@
             class="relative group-hover:text-base-content pr-1 field-remove-button"
             :class="isNew ? 'text-base-content' : 'text-transparent group-hover:text-base-content'"
             :title="t('remove')"
+            :aria-label="t('remove')"
             @click="onRemoveClick"
           >
             <IconTrashX
diff --git a/app/views/shared/_html_modal.html.erb b/app/views/shared/_html_modal.html.erb
index 419f04df..7ddcca5e 100644
--- a/app/views/shared/_html_modal.html.erb
+++ b/app/views/shared/_html_modal.html.erb
@@ -7,7 +7,7 @@
         <span>
           <%= local_assigns[:title] %>
         </span>
-        <label for="<%= uuid %>" class="text-xl">&times;</label>
+        <label for="<%= uuid %>" class="text-xl" aria-label="<%= t('close') %>">&times;</label>
       </div>
     <% end %>
     <div>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index 75d055b1..fb7b7db1 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -24,8 +24,8 @@
         </div>
       <% end %>
       <div class="dropdown dropdown-end">
-        <label tabindex="0" class="cursor-pointer bg-base-content text-purple-300 rounded-full p-2 w-9 justify-center flex">
-          <span class="text-sm align-text-top"><%= current_user.initials %></span>
+        <label tabindex="0" class="cursor-pointer bg-base-content text-purple-300 rounded-full p-2 w-9 justify-center flex" role="button" aria-label="<%= t('user_menu') %>" aria-haspopup="true" aria-expanded="false">
+          <span class="text-sm align-text-top" aria-hidden="true"><%= current_user.initials %></span>
         </label>
         <ul tabindex="0" class="z-10 dropdown-content p-2 mt-2 shadow menu text-base bg-base-100 rounded-box min-w-[160px] text-right">
           <li>
diff --git a/app/views/shared/_turbo_modal.html.erb b/app/views/shared/_turbo_modal.html.erb
index 33af1175..b18c347f 100644
--- a/app/views/shared/_turbo_modal.html.erb
+++ b/app/views/shared/_turbo_modal.html.erb
@@ -7,7 +7,7 @@
           <span>
             <%= local_assigns[:title] %>
           </span>
-          <a href="#" class="text-xl" data-action="click:turbo-modal#close">&times;</a>
+          <a href="#" class="text-xl" data-action="click:turbo-modal#close" aria-label="<%= t('close') %>">&times;</a>
         </div>
       <% end %>
       <div>
diff --git a/app/views/shared/_turbo_modal_large.html.erb b/app/views/shared/_turbo_modal_large.html.erb
index 7a1c841d..720ab83e 100644
--- a/app/views/shared/_turbo_modal_large.html.erb
+++ b/app/views/shared/_turbo_modal_large.html.erb
@@ -7,7 +7,7 @@
           <span>
             <%= local_assigns[:title] %>
           </span>
-          <a href="#" class="text-xl" data-action="click:turbo-modal#close">&times;</a>
+          <a href="#" class="text-xl" data-action="click:turbo-modal#close" aria-label="<%= t('close') %>">&times;</a>
         </div>
       <% end %>
       <div class="w-full md:w-[590px] overflow-y-auto" style="max-height: calc(100vh - 14px - 45px)">