diff --git a/src/app/screens/airgap_update_screen.py b/src/app/screens/airgap_update_screen.py
index 0a3f990..0c4a9ac 100644
--- a/src/app/screens/airgap_update_screen.py
+++ b/src/app/screens/airgap_update_screen.py
@@ -82,11 +82,16 @@ def on_release(instance):
             self.set_background(wid=instance.id, rgba=(0, 0, 0, 1))
             self.set_screen(name="WarningAfterAirgapUpdateScreen", direction="left")
 
+        select = self.translate("Select")
+        to_copy = self.translate("to copy firmware")
+
         # Now build the button
         self.make_button(
             root_widget=f"{self.id}_grid",
             wid=f"{self.id}_button_{row}",
-            text=f"Select {drive} to copy firmware",
+            text="".join(
+                [select, "\n", f"[color=#efcc00]{drive}[/color]", "\n", to_copy]
+            ),
             row=row,
             halign="center",
             font_factor=36,
diff --git a/src/app/screens/warning_before_airgap_update_screen.py b/src/app/screens/warning_before_airgap_update_screen.py
index 7a7728d..559f281 100644
--- a/src/app/screens/warning_before_airgap_update_screen.py
+++ b/src/app/screens/warning_before_airgap_update_screen.py
@@ -122,7 +122,7 @@ def make_label_text(self):
             "Insert a FAT32 formatted SDCard into your computer"
         )
         select_warn_0 = self.translate(
-            "On the next screen, choose its root folder to copy the firmware"
+            "On the next screen, choose the drive to copy firmware"
         )
         proceed = self.translate("Proceed")
         back = self.translate("Back")
diff --git a/src/i18n/af_ZA.UTF-8.json b/src/i18n/af_ZA.UTF-8.json
index 246b870..6ec9b19 100644
--- a/src/i18n/af_ZA.UTF-8.json
+++ b/src/i18n/af_ZA.UTF-8.json
@@ -135,13 +135,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "Voordat u voortgaan met die opdatering met die luggaping",
     "Insert a FAT32 formatted SDCard into your computer": "Plaas 'n FAT32-geformateerde SDCard in jou rekenaar",
-    "On the next screen, choose its root folder to copy the firmware": "Op die volgende skerm, kies sy wortelgids om die firmware te kopieer",
+    "On the next screen, choose the drive to copy firmware": "Kies op die volgende skerm die skyf om firmware te kopieer",
     "Proceed": "Voortgaan",
     "Back": "Terug"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "Kies vouer om firmware te kopieer",
-    "Copy firmware to": "Kopieer firmware na"
+    "Select": "Kies",
+    "to copy firmware": "om firmware te kopieer"
   },
   "warning_after_airgap_update_screen": {
     "and": "en",
diff --git a/src/i18n/de_DE.UTF-8.json b/src/i18n/de_DE.UTF-8.json
index cec1794..fb553e5 100644
--- a/src/i18n/de_DE.UTF-8.json
+++ b/src/i18n/de_DE.UTF-8.json
@@ -132,12 +132,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "Bevor Sie mit dem air-gapped Update fortfahren",
     "Insert a FAT32 formatted SDCard into your computer": "Legen Sie eine FAT32-formatierte SD-Karte in Ihren Computer ein",
+    "On the next screen, choose the drive to copy firmware": "Wählen Sie im nächsten Bildschirm das Laufwerk zum Kopieren der Firmware aus",
     "Proceed": "Fortfahren",
     "Back": "Zurück"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "Ordner zum Kopieren der Firmware auswählen",
-    "Copy firmware to": "Firmware kopieren nach"
+    "Select": "Auswählen",
+    "to copy firmware": "um die Firmware zu kopieren"
   },
   "warning_after_airgap_update_screen": {
     "and": "und",
diff --git a/src/i18n/en_US.UTF-8.json b/src/i18n/en_US.UTF-8.json
index 6384df2..35b9fab 100644
--- a/src/i18n/en_US.UTF-8.json
+++ b/src/i18n/en_US.UTF-8.json
@@ -132,12 +132,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "Before proceeding with the air-gapped update",
     "Insert a FAT32 formatted SDCard into your computer": "Insert a FAT32 formatted SDCard into your computer",
+    "On the next screen, choose the drive to copy firmware": "On the next screen, choose the drive to copy firmware",
     "Proceed": "Proceed",
     "Back": "Back"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "Select folder to copy firmware",
-    "Copy firmware to": "Copy firmware to"
+    "Select": "Select",
+    "to copy firmware": "to copy firmware"
   },
   "warning_after_airgap_update_screen": {
     "and": "and",
diff --git a/src/i18n/es_ES.UTF-8.json b/src/i18n/es_ES.UTF-8.json
index 9a06bf9..c30d57c 100644
--- a/src/i18n/es_ES.UTF-8.json
+++ b/src/i18n/es_ES.UTF-8.json
@@ -136,13 +136,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "Antes de continuar con la actualización aislada",
     "Insert a FAT32 formatted SDCard into your computer": "Inserte una tarjeta SD con formato FAT32 en su computadora",
-    "On the next screen, choose its root folder to copy the firmware": "En la siguiente pantalla, elija su carpeta raíz para copiar el firmware",
+    "On the next screen, choose the drive to copy firmware": "En la siguiente pantalla, elija la unidad para copiar el firmware",
     "Proceed": "Proceder",
     "Back": "Volver"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "Seleccione carpeta para copiar el firmware",
-    "Copy firmware to": "Copiar firmware a"
+    "Select": "Seleccionar",
+    "to copy firmware": "para copiar el firmware"
   },
   "warning_after_airgap_update_screen": {
     "and": "y",
diff --git a/src/i18n/fr_FR.UTF-8.json b/src/i18n/fr_FR.UTF-8.json
index 48c0348..8aed113 100644
--- a/src/i18n/fr_FR.UTF-8.json
+++ b/src/i18n/fr_FR.UTF-8.json
@@ -135,14 +135,14 @@
   },
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "Avant de procéder à la mise à jour isolée",
-    "Insert a FAT32 formatted SDCard into your computer": "Insérez une SDCard formatée en FAT32 dans votre ordinateur",
-    "On the next screen, choose its root folder to copy the firmware": "Sur l'écran suivant, choisissez son dossier racine pour copier le firmware",
+    "Insert a FAT32 formatted SDCard into your computer": "Insérez une SDCard formatée en FAT32 dans votre ordinateur",    
+    "On the next screen, choose the drive to copy firmware": "Sur l'écran suivant, choisissez le lecteur pour copier le firmware",
     "Proceed": "Continuer",
     "Back": "Retour"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "Sélectionnez le dossier pour copier le firmware",
-    "Copy firmware to": "Copier le firmware vers"
+    "Select": "Sélectionner",
+    "to copy firmware": "pour copier le firmware"
   },
   "warning_after_airgap_update_screen": {
     "and": "et",
diff --git a/src/i18n/it_IT.UTF-8.json b/src/i18n/it_IT.UTF-8.json
index dd29eca..8844048 100644
--- a/src/i18n/it_IT.UTF-8.json
+++ b/src/i18n/it_IT.UTF-8.json
@@ -136,13 +136,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "Prima di procedere con l'aggiornamento air-gapped",
     "Insert a FAT32 formatted SDCard into your computer": "Inserisci una SDCard formattata FAT32 nel tuo computer",
-    "On the next screen, choose its root folder to copy the firmware": "Nella schermata successiva\nscegli la sua cartella principale per copiare il firmware",
+    "On the next screen, choose the drive to copy firmware": "Nella schermata successiva, scegli l'unità per copiare il firmware",
     "Proceed": "Procedere",
     "Back": "Indietro"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "Seleziona la cartella per copiare il firmware",
-    "Copy firmware to": "Copia il firmware su"
+    "Select": "Seleziona",
+    "to copy firmware": "per copiare il firmware"
   },
   "warning_after_airgap_update_screen": {
     "and": "e",
diff --git a/src/i18n/ja_JP.UTF-8.json b/src/i18n/ja_JP.UTF-8.json
index 8aec69a..e001f91 100644
--- a/src/i18n/ja_JP.UTF-8.json
+++ b/src/i18n/ja_JP.UTF-8.json
@@ -136,12 +136,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "エアギャップアップデートを進める前に",
     "Insert a FAT32 formatted SDCard into your computer": "FAT32でフォーマットされたSDカードをコンピュータに挿入してください",
+    "On the next screen, choose the drive to copy firmware": "次の画面で、ファームウェアをコピーするドライブを選択してください",
     "Proceed": "続行",
     "Back": "戻る"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "ファームウェアをコピーするフォルダーを選択",
-    "Copy firmware to": "ファームウェアをコピー先"
+    "Select": "選択",
+    "to copy firmware": "ファームウェアをコピーするために"
   },
   "warning_after_airgap_update_screen": {
     "and": "および",
diff --git a/src/i18n/ko_KR.UTF-8.json b/src/i18n/ko_KR.UTF-8.json
index 2d73740..f51fcb8 100644
--- a/src/i18n/ko_KR.UTF-8.json
+++ b/src/i18n/ko_KR.UTF-8.json
@@ -136,13 +136,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "에어 갭 업데이트를 진행하기 전에",
     "Insert a FAT32 formatted SDCard into your computer": "FAT32로 포맷 된 SDCard를 컴퓨터에 삽입하십시오.",
-    "On the next screen, choose its root folder to copy the firmware": "다음 화면에서 펌웨어를 복사할 루트 폴더를 선택합니다",
+    "On the next screen, choose the drive to copy firmware": "다음 화면에서 펌웨어를 복사할 드라이브를 선택하세요",
     "Proceed": "진행",
     "Back": "뒤로"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "펌웨어를 복사할 폴더 선택",
-    "Copy firmware to": "펌웨어 복사 위치"
+    "Select": "선택",
+    "to copy firmware": "펌웨어를 복사하기 위해"
   },
   "warning_after_airgap_update_screen": {
     "and": "그리고",
diff --git a/src/i18n/nl_NL.UTF-8.json b/src/i18n/nl_NL.UTF-8.json
index a960a1e..c3d6e65 100644
--- a/src/i18n/nl_NL.UTF-8.json
+++ b/src/i18n/nl_NL.UTF-8.json
@@ -134,13 +134,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "Voordat u doorgaat met de air-gapped update",
     "Insert a FAT32 formatted SDCard into your computer": "Plaats een FAT32-geformatteerde SDCard in uw computer",
-    "On the next screen, choose its root folder to copy the firmware": "Kies op het volgende scherm de hoofdmap om de firmware te kopiëren",
+    "On the next screen, choose the drive to copy firmware": "Kies op het volgende scherm de schijf om firmware te kopiëren",
     "Proceed": "Doorgaan",
     "Back": "Terug"
   },
-  "airgap_update_screen": {  
-    "Select folder to copy firmware": "Selecteer map om firmware te kopiëren",
-    "Copy firmware to": "Kopieer firmware naar"
+  "airgap_update_screen": {
+    "Select": "Selecteren",
+    "to copy firmware": "om firmware te kopiëren"
   },
   "warning_after_airgap_update_screen": {
     "and": "en",
diff --git a/src/i18n/pt_BR.UTF-8.json b/src/i18n/pt_BR.UTF-8.json
index a32d12f..aebe3db 100644
--- a/src/i18n/pt_BR.UTF-8.json
+++ b/src/i18n/pt_BR.UTF-8.json
@@ -136,13 +136,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "Antes de continuar com a atualização isolada",
     "Insert a FAT32 formatted SDCard into your computer": "Insira no seu computador um SDCard formatado em FAT32",
-    "On the next screen, choose its root folder to copy the firmware": "Na próxima tela, escolha sua pasta raiz para copiar o firmware",
+    "On the next screen, choose the drive to copy firmware": "Na próxima tela, escolha a unidade para copiar o firmware",
     "Proceed": "Continuar",
     "Back": "Voltar"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "Selecione a pasta para copiar o firmware",
-    "Copy firmware to": "Copiar firmware para"
+    "Select": "Selecionar",
+    "to copy firmware": "para copiar o firmware"
   },
   "warning_after_airgap_update_screen": {
     "and": "e",
diff --git a/src/i18n/ru_RU.UTF-8.json b/src/i18n/ru_RU.UTF-8.json
index 6cddccf..fe61120 100644
--- a/src/i18n/ru_RU.UTF-8.json
+++ b/src/i18n/ru_RU.UTF-8.json
@@ -136,13 +136,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "Прежде чем приступить к\nобновлению с воздушным зазором",
     "Insert a FAT32 formatted SDCard into your computer": "Вставьте SDCard в файловой\nсистеме FAT32 в компьютер",
-    "On the next screen, choose its root folder to copy the firmware": "На следующем экране выберите его\nкорневую папку для копирования прошивки",
+    "On the next screen, choose the drive to copy firmware": "На следующем экране выберите диск для копирования прошивки",
     "Proceed": "Продолжать",
     "Back": "Вернись"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "Выберите папку для копирования прошивки",
-    "Copy firmware to": "Скопировать прошивку в"
+    "Select": "Выбрать",
+    "to copy firmware": "чтобы скопировать прошивку"
   },
   "warning_after_airgap_update_screen": {
     "and": "и",
diff --git a/src/i18n/zh_CN.UTF-8.json b/src/i18n/zh_CN.UTF-8.json
index 60d0967..20b66dd 100644
--- a/src/i18n/zh_CN.UTF-8.json
+++ b/src/i18n/zh_CN.UTF-8.json
@@ -136,13 +136,13 @@
   "warning_before_airgap_update_screen": {
     "Before proceeding with the air-gapped update": "在继续进行气隙更新之前",
     "Insert a FAT32 formatted SDCard into your computer": "将 FAT32 格式的 SD 卡插入计算机",
-    "On the next screen, choose its root folder to copy the firmware": "在下一个屏幕上，选择其根文件夹以复制固件",
+    "On the next screen, choose the drive to copy firmware": "在下一个屏幕上，选择要复制固件的驱动器",
     "Proceed": "进行",
     "Back": "返回"
   },
   "airgap_update_screen": {
-    "Select folder to copy firmware": "选择文件夹以复制固件",
-    "Copy firmware to": "复制固件到"
+    "Select": "选择",
+    "to copy firmware": "以复制固件"
   },
   "warning_after_airgap_update_screen": {
     "and": "和",