diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MetadataExtractorSafeXmpReader.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MetadataExtractorSafeXmpReader.kt
new file mode 100644
index 000000000..fc0f96624
--- /dev/null
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MetadataExtractorSafeXmpReader.kt
@@ -0,0 +1,4 @@
+package deckers.thibault.aves.metadata
+
+class MetadataExtractorSafeXMPReader {
+}
\ No newline at end of file
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 1c49c6928..83470ca0a 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -58,7 +58,6 @@
   "entryActionPrint": "Drucken",
   "entryActionShare": "Teilen",
   "entryActionViewSource": "Quelle anzeigen",
-  "entryActionViewMotionPhotoVideo": "Bewegtes Foto öffnen",
   "entryActionEdit": "Bearbeiten",
   "entryActionOpen": "Öffnen mit",
   "entryActionSetAs": "Einstellen als",
@@ -184,7 +183,6 @@
   "videoStartOverButtonLabel": "NEU BEGINNEN",
   "videoResumeButtonLabel": "FORTSETZTEN",
 
-  "setCoverDialogTitle": "Titelbild bestimmen",
   "setCoverDialogLatest": "Letzter Artikel",
   "setCoverDialogCustom": "Benutzerdefiniert",
 
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 2899f23bd..96359ab8d 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -306,7 +306,6 @@
   "videoStartOverButtonLabel": "START OVER",
   "videoResumeButtonLabel": "RESUME",
 
-  "setCoverDialogTitle": "Set Cover",
   "setCoverDialogLatest": "Latest item",
   "setCoverDialogAuto": "Auto",
   "setCoverDialogCustom": "Custom",
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 15da9e8a3..78ca559fc 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -58,7 +58,6 @@
   "entryActionPrint": "Imprimir",
   "entryActionShare": "Compartir",
   "entryActionViewSource": "Ver fuente",
-  "entryActionViewMotionPhotoVideo": "Abrir foto en movimiento",
   "entryActionEdit": "Editar",
   "entryActionOpen": "Abrir con",
   "entryActionSetAs": "Establecer como",
@@ -184,7 +183,6 @@
   "videoStartOverButtonLabel": "VOLVER A EMPEZAR",
   "videoResumeButtonLabel": "REANUDAR",
 
-  "setCoverDialogTitle": "Elegir carátula",
   "setCoverDialogLatest": "Elemento más reciente",
   "setCoverDialogCustom": "Personalizado",
 
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 70c61c831..574a709b1 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -58,7 +58,9 @@
   "entryActionPrint": "Imprimer",
   "entryActionShare": "Partager",
   "entryActionViewSource": "Voir le code",
-  "entryActionViewMotionPhotoVideo": "Ouvrir le clip vidéo",
+  "entryActionShowGeoTiffOnMap": "Superposer sur la carte",
+  "entryActionConvertMotionPhotoToStillImage": "Convertir en image fixe",
+  "entryActionViewMotionPhotoVideo": "Ouvrir la vidéo",
   "entryActionEdit": "Modifier",
   "entryActionOpen": "Ouvrir avec",
   "entryActionSetAs": "Utiliser comme",
@@ -184,8 +186,8 @@
   "videoStartOverButtonLabel": "RECOMMENCER",
   "videoResumeButtonLabel": "REPRENDRE",
 
-  "setCoverDialogTitle": "Modifier la couverture",
   "setCoverDialogLatest": "dernier élément",
+  "setCoverDialogAuto": "automatique",
   "setCoverDialogCustom": "personnalisé",
 
   "hideFilterConfirmationDialogMessage": "Les images et vidéos correspondantes n’apparaîtront plus dans votre collection. Vous pouvez les montrer à nouveau via les réglages de «\u00A0Confidentialité\u00A0».\n\nVoulez-vous vraiment les masquer ?",
@@ -239,6 +241,7 @@
   "removeEntryMetadataDialogMore": "Voir plus",
 
   "removeEntryMetadataMotionPhotoXmpWarningDialogMessage": "Les métadonnées XMP sont nécessaires pour lire la vidéo d’une photo animée.\n\nVoulez-vous vraiment les supprimer ?",
+  "convertMotionPhotoToStillImageWarningDialogMessage": "Êtes-vous sûr ?",
 
   "videoSpeedDialogLabel": "Vitesse de lecture",
 
@@ -266,6 +269,13 @@
   "tileLayoutGrid": "Grille",
   "tileLayoutList": "Liste",
 
+  "coverDialogTabCover": "Image",
+  "coverDialogTabApp": "App",
+  "coverDialogTabColor": "Couleur",
+
+  "appPickDialogTitle": "Sélection",
+  "appPickDialogNone": "Aucune",
+
   "aboutPageTitle": "À propos",
   "aboutLinkSources": "Sources",
   "aboutLinkLicense": "Licence",
diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb
index 51fe37880..e4376bb64 100644
--- a/lib/l10n/app_id.arb
+++ b/lib/l10n/app_id.arb
@@ -58,7 +58,6 @@
   "entryActionPrint": "Cetak",
   "entryActionShare": "Bagikan",
   "entryActionViewSource": "Lihat sumber",
-  "entryActionViewMotionPhotoVideo": "Buka Foto bergerak",
   "entryActionEdit": "Ubah",
   "entryActionOpen": "Buka dengan",
   "entryActionSetAs": "Tetapkan sebagai",
@@ -184,7 +183,6 @@
   "videoStartOverButtonLabel": "ULANG DARI AWAL",
   "videoResumeButtonLabel": "LANJUT",
 
-  "setCoverDialogTitle": "Setel Sampul",
   "setCoverDialogLatest": "Benda terbaru",
   "setCoverDialogCustom": "Kustom",
 
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 9e203201f..d968b8bd2 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -58,7 +58,6 @@
   "entryActionPrint": "Stampa",
   "entryActionShare": "Condividi",
   "entryActionViewSource": "Visualizza sorgente",
-  "entryActionViewMotionPhotoVideo": "Apri foto in movimento",
   "entryActionEdit": "Modifica",
   "entryActionOpen": "Apri con",
   "entryActionSetAs": "Imposta come",
@@ -184,7 +183,6 @@
   "videoStartOverButtonLabel": "RICOMINCIA",
   "videoResumeButtonLabel": "RIPRENDI",
 
-  "setCoverDialogTitle": "Modifica la copertina",
   "setCoverDialogLatest": "Ultimo elemento",
   "setCoverDialogCustom": "Personalizzato",
 
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index b1c9d825b..cebf8e16a 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -58,7 +58,6 @@
   "entryActionPrint": "印刷",
   "entryActionShare": "共有",
   "entryActionViewSource": "ソースを表示",
-  "entryActionViewMotionPhotoVideo": "モーションフォトを開く",
   "entryActionEdit": "編集",
   "entryActionOpen": "アプリで開く",
   "entryActionSetAs": "登録",
@@ -184,7 +183,6 @@
   "videoStartOverButtonLabel": "最初から再生",
   "videoResumeButtonLabel": "再開",
 
-  "setCoverDialogTitle": "カバーを設定",
   "setCoverDialogLatest": "最新のアイテム",
   "setCoverDialogCustom": "カスタム",
 
diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
index 9f4adb474..f97ae14b8 100644
--- a/lib/l10n/app_ko.arb
+++ b/lib/l10n/app_ko.arb
@@ -58,7 +58,6 @@
   "entryActionPrint": "인쇄",
   "entryActionShare": "공유",
   "entryActionViewSource": "소스 코드 보기",
-  "entryActionViewMotionPhotoVideo": "모션 포토 보기",
   "entryActionEdit": "편집",
   "entryActionOpen": "다른 앱에서 열기",
   "entryActionSetAs": "다음 용도로 사용",
@@ -184,7 +183,6 @@
   "videoStartOverButtonLabel": "처음부터",
   "videoResumeButtonLabel": "이어서",
 
-  "setCoverDialogTitle": "대표 이미지 변경",
   "setCoverDialogLatest": "최근 항목",
   "setCoverDialogCustom": "직접 설정",
 
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 8eedc96c6..3f17255d0 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -58,7 +58,6 @@
   "entryActionPrint": "Imprimir",
   "entryActionShare": "Compartilhado",
   "entryActionViewSource": "Ver fonte",
-  "entryActionViewMotionPhotoVideo": "Abrir foto em movimento",
   "entryActionEdit": "Editar",
   "entryActionOpen": "Abrir com",
   "entryActionSetAs": "Definir como",
@@ -184,7 +183,6 @@
   "videoStartOverButtonLabel": "RECOMEÇAR",
   "videoResumeButtonLabel": "RETOMAR",
 
-  "setCoverDialogTitle": "Definir capa",
   "setCoverDialogLatest": "Último item",
   "setCoverDialogCustom": "Personalizado",
 
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index 633ca3a4e..a1c3595da 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -58,7 +58,6 @@
   "entryActionPrint": "Печать",
   "entryActionShare": "Поделиться",
   "entryActionViewSource": "Посмотреть источник",
-  "entryActionViewMotionPhotoVideo": "Открыть «Живые фото»",
   "entryActionEdit": "Изменить",
   "entryActionOpen": "Открыть с помощью",
   "entryActionSetAs": "Установить как",
@@ -175,7 +174,6 @@
   "videoStartOverButtonLabel": "ВОСПРОИЗВЕСТИ СНАЧАЛА",
   "videoResumeButtonLabel": "ПРОДОЛЖИТЬ",
 
-  "setCoverDialogTitle": "Установить обложку",
   "setCoverDialogLatest": "Последний объект",
   "setCoverDialogCustom": "Собственная",
 
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 3865631d4..41768a171 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -59,7 +59,6 @@
   "entryActionShare": "分享",
   "entryActionViewSource": "查看源码",
   "entryActionShowGeoTiffOnMap": "显示为地图叠加层",
-  "entryActionViewMotionPhotoVideo": "打开动态照片",
   "entryActionEdit": "编辑",
   "entryActionOpen": "打开方式",
   "entryActionSetAs": "设置为",
@@ -185,7 +184,6 @@
   "videoStartOverButtonLabel": "从头播放",
   "videoResumeButtonLabel": "继续",
 
-  "setCoverDialogTitle": "设置封面",
   "setCoverDialogLatest": "最新项",
   "setCoverDialogCustom": "自定义",
 
diff --git a/untranslated.json b/untranslated.json
index 5281f4551..7a677b0f6 100644
--- a/untranslated.json
+++ b/untranslated.json
@@ -2,6 +2,7 @@
   "de": [
     "entryActionShowGeoTiffOnMap",
     "entryActionConvertMotionPhotoToStillImage",
+    "entryActionViewMotionPhotoVideo",
     "setCoverDialogAuto",
     "convertMotionPhotoToStillImageWarningDialogMessage",
     "coverDialogTabCover",
@@ -14,18 +15,7 @@
   "es": [
     "entryActionShowGeoTiffOnMap",
     "entryActionConvertMotionPhotoToStillImage",
-    "setCoverDialogAuto",
-    "convertMotionPhotoToStillImageWarningDialogMessage",
-    "coverDialogTabCover",
-    "coverDialogTabApp",
-    "coverDialogTabColor",
-    "appPickDialogTitle",
-    "appPickDialogNone"
-  ],
-
-  "fr": [
-    "entryActionShowGeoTiffOnMap",
-    "entryActionConvertMotionPhotoToStillImage",
+    "entryActionViewMotionPhotoVideo",
     "setCoverDialogAuto",
     "convertMotionPhotoToStillImageWarningDialogMessage",
     "coverDialogTabCover",
@@ -38,6 +28,7 @@
   "id": [
     "entryActionShowGeoTiffOnMap",
     "entryActionConvertMotionPhotoToStillImage",
+    "entryActionViewMotionPhotoVideo",
     "setCoverDialogAuto",
     "convertMotionPhotoToStillImageWarningDialogMessage",
     "coverDialogTabCover",
@@ -50,6 +41,7 @@
   "it": [
     "entryActionShowGeoTiffOnMap",
     "entryActionConvertMotionPhotoToStillImage",
+    "entryActionViewMotionPhotoVideo",
     "setCoverDialogAuto",
     "convertMotionPhotoToStillImageWarningDialogMessage",
     "coverDialogTabCover",
@@ -62,6 +54,7 @@
   "ja": [
     "entryActionShowGeoTiffOnMap",
     "entryActionConvertMotionPhotoToStillImage",
+    "entryActionViewMotionPhotoVideo",
     "setCoverDialogAuto",
     "convertMotionPhotoToStillImageWarningDialogMessage",
     "coverDialogTabCover",
@@ -74,6 +67,7 @@
   "ko": [
     "entryActionShowGeoTiffOnMap",
     "entryActionConvertMotionPhotoToStillImage",
+    "entryActionViewMotionPhotoVideo",
     "setCoverDialogAuto",
     "convertMotionPhotoToStillImageWarningDialogMessage",
     "coverDialogTabCover",
@@ -86,6 +80,7 @@
   "pt": [
     "entryActionShowGeoTiffOnMap",
     "entryActionConvertMotionPhotoToStillImage",
+    "entryActionViewMotionPhotoVideo",
     "setCoverDialogAuto",
     "convertMotionPhotoToStillImageWarningDialogMessage",
     "coverDialogTabCover",
@@ -98,6 +93,7 @@
   "ru": [
     "entryActionShowGeoTiffOnMap",
     "entryActionConvertMotionPhotoToStillImage",
+    "entryActionViewMotionPhotoVideo",
     "displayRefreshRatePreferHighest",
     "displayRefreshRatePreferLowest",
     "themeBrightnessLight",
@@ -131,6 +127,7 @@
 
   "zh": [
     "entryActionConvertMotionPhotoToStillImage",
+    "entryActionViewMotionPhotoVideo",
     "setCoverDialogAuto",
     "convertMotionPhotoToStillImageWarningDialogMessage",
     "coverDialogTabCover",