diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 348bcf62cc..ad1be1e0f0 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -10,3 +10,4 @@
## Improved
- For UPI Intent an error message will be shown when "Continue" button is pressed without selecting any UPI option.
+- For drop-in, improved accessibility of back/close button in the navigation bar.
diff --git a/drop-in/src/main/res/template/values/strings.xml.tt b/drop-in/src/main/res/template/values/strings.xml.tt
index 535f554cda..cfd7f9246c 100644
--- a/drop-in/src/main/res/template/values/strings.xml.tt
+++ b/drop-in/src/main/res/template/values/strings.xml.tt
@@ -33,6 +33,9 @@
%%storagePermission.rationaleMsg%%
%%oneClick.confirmationAlert.title%%
%%cancelButton%%
+ %%close%%
+ %%backButton%%
+
- %s
•••• %s
diff --git a/drop-in/src/main/res/values-ar/strings.xml b/drop-in/src/main/res/values-ar/strings.xml
index 13a406a101..a55a846092 100644
--- a/drop-in/src/main/res/values-ar/strings.xml
+++ b/drop-in/src/main/res/values-ar/strings.xml
@@ -33,4 +33,7 @@
من أجل حفظ هذه الصورة على جهازك، تحتاج إلى تمكين إذن التخزين
تأكيد الدفع باستخدام %s
إلغاء
+ إغلاق
+ العودة
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-cs-rCZ/strings.xml b/drop-in/src/main/res/values-cs-rCZ/strings.xml
index 3b4678e004..d53b7ecb2b 100644
--- a/drop-in/src/main/res/values-cs-rCZ/strings.xml
+++ b/drop-in/src/main/res/values-cs-rCZ/strings.xml
@@ -33,4 +33,7 @@
Chcete-li tento obrázek uložit do vašeho zařízení, musíte povolit oprávnění k uložení
Potvrdit platbu %s
Zrušit
+ Zavřít
+ Zpět
+
diff --git a/drop-in/src/main/res/values-da-rDK/strings.xml b/drop-in/src/main/res/values-da-rDK/strings.xml
index d8dc499f76..abdf6ed8d3 100644
--- a/drop-in/src/main/res/values-da-rDK/strings.xml
+++ b/drop-in/src/main/res/values-da-rDK/strings.xml
@@ -33,4 +33,7 @@
For at kunne gemme dette billede på din enhed skal du aktivere lagringstilladelse
Bekræft %s-betaling
Annuller
+ Luk
+ Tilbage
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-de-rDE/strings.xml b/drop-in/src/main/res/values-de-rDE/strings.xml
index b9924e8605..b26cba44e6 100644
--- a/drop-in/src/main/res/values-de-rDE/strings.xml
+++ b/drop-in/src/main/res/values-de-rDE/strings.xml
@@ -33,4 +33,7 @@
Um dieses Bild auf Ihrem Gerät zu speichern, müssen Sie uns Speicherberechtigung erteilen.
Bestätige %s Zahlung
Abbrechen
+ Schließen
+ Zurück
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-el-rGR/strings.xml b/drop-in/src/main/res/values-el-rGR/strings.xml
index 3cd130f2d8..dd837959a6 100644
--- a/drop-in/src/main/res/values-el-rGR/strings.xml
+++ b/drop-in/src/main/res/values-el-rGR/strings.xml
@@ -33,4 +33,7 @@
Για να αποθηκεύσετε αυτήν την εικόνα στη συσκευή σας, πρέπει να εκχωρήσετε δικαίωμα για τον χώρο αποθήκευσης
Επιβεβαίωση πληρωμής μέσω %s
Άκυρο
+ Κλείσιμο
+ Πίσω
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-es-rES/strings.xml b/drop-in/src/main/res/values-es-rES/strings.xml
index 274cc9cc36..0b36771337 100644
--- a/drop-in/src/main/res/values-es-rES/strings.xml
+++ b/drop-in/src/main/res/values-es-rES/strings.xml
@@ -33,4 +33,7 @@
Para guardar esta imagen en su dispositivo, debe conceder permiso de almacenamiento
Confirmar pago de %s
Cancelar
+ Cerrar
+ Atrás
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-fi-rFI/strings.xml b/drop-in/src/main/res/values-fi-rFI/strings.xml
index 1c5cf4c9b9..97de02150b 100644
--- a/drop-in/src/main/res/values-fi-rFI/strings.xml
+++ b/drop-in/src/main/res/values-fi-rFI/strings.xml
@@ -33,4 +33,7 @@
Sinun on otettava käyttöön tallennusoikeus tallentaaksesi tämän kuvan laitteeseesi
Vahvista %s maksu
Peruuta
+ Sulje
+ Takaisin
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-fr-rFR/strings.xml b/drop-in/src/main/res/values-fr-rFR/strings.xml
index d9724e92cd..c1a546547e 100644
--- a/drop-in/src/main/res/values-fr-rFR/strings.xml
+++ b/drop-in/src/main/res/values-fr-rFR/strings.xml
@@ -33,4 +33,7 @@
Pour enregistrer cette image sur votre appareil, vous devez activer l\'autorisation de stockage
Confirmer paiement de %s
Annuler
+ Fermer
+ Retour
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-hr-rHR/strings.xml b/drop-in/src/main/res/values-hr-rHR/strings.xml
index 11b3f8c0d7..02f7ff1499 100644
--- a/drop-in/src/main/res/values-hr-rHR/strings.xml
+++ b/drop-in/src/main/res/values-hr-rHR/strings.xml
@@ -33,4 +33,7 @@
Kako biste spremili ovu sliku na svoj uređaj, morate omogućiti dopuštenje za pohranu
Potvrdite plaćanje: %s
Otkaži
+ Zatvori
+ Natrag
+
diff --git a/drop-in/src/main/res/values-hu-rHU/strings.xml b/drop-in/src/main/res/values-hu-rHU/strings.xml
index 70cbc5b161..a8fc3b7848 100644
--- a/drop-in/src/main/res/values-hu-rHU/strings.xml
+++ b/drop-in/src/main/res/values-hu-rHU/strings.xml
@@ -33,4 +33,7 @@
Ahhoz, hogy a képet el tudja menteni a készülékére, hozzáférési engedélyt kell adnia a tárhelyhez
%s használatával történő fizetés jóváhagyása
Mégse
+ Bezárás
+ Vissza
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-it-rIT/strings.xml b/drop-in/src/main/res/values-it-rIT/strings.xml
index 902739f207..a165d079a1 100644
--- a/drop-in/src/main/res/values-it-rIT/strings.xml
+++ b/drop-in/src/main/res/values-it-rIT/strings.xml
@@ -33,4 +33,7 @@
Per salvare l\'immagine sul tuo dispositivo, devi abilitare l\'autorizzazione all\'archiviazione
Conferma il pagamento di %s
Annulla
+ Chiudi
+ Indietro
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-ja-rJP/strings.xml b/drop-in/src/main/res/values-ja-rJP/strings.xml
index b09a1a00cb..173544a96f 100644
--- a/drop-in/src/main/res/values-ja-rJP/strings.xml
+++ b/drop-in/src/main/res/values-ja-rJP/strings.xml
@@ -33,4 +33,7 @@
この画像をデバイスに保存するには、ストレージ権限を有効にする必要があります
%sのお支払いをご確認下さい
キャンセル
+ 終了
+ 戻る
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-ko-rKR/strings.xml b/drop-in/src/main/res/values-ko-rKR/strings.xml
index 9838f05771..43dc484450 100644
--- a/drop-in/src/main/res/values-ko-rKR/strings.xml
+++ b/drop-in/src/main/res/values-ko-rKR/strings.xml
@@ -33,4 +33,7 @@
이 이미지를 장치에 저장하려면 저장 권한을 활성화해야 합니다.
%s 결제 확인
취소
+ 닫기
+ 뒤로
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-nb-rNO/strings.xml b/drop-in/src/main/res/values-nb-rNO/strings.xml
index 170f31d8b7..1cf5e03d83 100644
--- a/drop-in/src/main/res/values-nb-rNO/strings.xml
+++ b/drop-in/src/main/res/values-nb-rNO/strings.xml
@@ -33,4 +33,7 @@
Du må aktivere lagringstillatelse for å kunne lagre dette bildet på enheten din
Bekreft betaling med %s
Avbryt
+ Lukk
+ Tilbake
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-nl-rNL/strings.xml b/drop-in/src/main/res/values-nl-rNL/strings.xml
index a1fe68ced9..00d3260988 100644
--- a/drop-in/src/main/res/values-nl-rNL/strings.xml
+++ b/drop-in/src/main/res/values-nl-rNL/strings.xml
@@ -33,4 +33,7 @@
Om deze afbeelding op te slaan op uw apparaat, moet u toestemming voor opslag inschakelen
Bevestig %s betaling
Annuleer
+ Sluiten
+ Terug
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-pl-rPL/strings.xml b/drop-in/src/main/res/values-pl-rPL/strings.xml
index 437d6d8798..5704ee0413 100644
--- a/drop-in/src/main/res/values-pl-rPL/strings.xml
+++ b/drop-in/src/main/res/values-pl-rPL/strings.xml
@@ -33,4 +33,7 @@
Aby zapisać ten obraz w urządzeniu, należy włączyć zezwolenie na przechowywanie
Potwierdź płatność %s
Anuluj
+ Zamknij
+ Wstecz
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-pt-rBR/strings.xml b/drop-in/src/main/res/values-pt-rBR/strings.xml
index 8fbef55e62..6b0cd8187e 100644
--- a/drop-in/src/main/res/values-pt-rBR/strings.xml
+++ b/drop-in/src/main/res/values-pt-rBR/strings.xml
@@ -33,4 +33,7 @@
Para salvar esta imagem no seu dispositivo, habilite a permissão de armazenamento
Confirmar pagamento %s
Cancelar
+ Fechar
+ Voltar
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-pt-rPT/strings.xml b/drop-in/src/main/res/values-pt-rPT/strings.xml
index 63d919b12a..0af30c748a 100644
--- a/drop-in/src/main/res/values-pt-rPT/strings.xml
+++ b/drop-in/src/main/res/values-pt-rPT/strings.xml
@@ -33,4 +33,7 @@
Para guardar esta imagem no seu dispositivo, tem de ativar a permissão de armazenamento
Confirmar %s pagamento
Cancelar
+ Fechar
+ Voltar
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-ro-rRO/strings.xml b/drop-in/src/main/res/values-ro-rRO/strings.xml
index 36096cee9c..d687a48eb6 100644
--- a/drop-in/src/main/res/values-ro-rRO/strings.xml
+++ b/drop-in/src/main/res/values-ro-rRO/strings.xml
@@ -33,4 +33,7 @@
Pentru a salva această imagine pe dispozitivul dvs., trebuie să activați permisiunea de stocare
Confirmați plata %s
Anulare
+ Închidere
+ Înapoi
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-ru-rRU/strings.xml b/drop-in/src/main/res/values-ru-rRU/strings.xml
index fcca8ba4b3..d47d946378 100644
--- a/drop-in/src/main/res/values-ru-rRU/strings.xml
+++ b/drop-in/src/main/res/values-ru-rRU/strings.xml
@@ -33,4 +33,7 @@
Для сохранения данного изображения на устройстве необходимо предоставить на это разрешение
Подтвердить оплату %s
Отменить
+ Закрыть
+ Назад
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-sk-rSK/strings.xml b/drop-in/src/main/res/values-sk-rSK/strings.xml
index 17c07634d7..2f3f59cd77 100644
--- a/drop-in/src/main/res/values-sk-rSK/strings.xml
+++ b/drop-in/src/main/res/values-sk-rSK/strings.xml
@@ -33,4 +33,7 @@
Ak chcete tento obrázok uložiť do zariadenia, musíte zapnúť povolenie na ukladanie
Potvrďte platbu pomocou %s
Zrušiť
+ Zavrieť
+ Späť
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-sl-rSI/strings.xml b/drop-in/src/main/res/values-sl-rSI/strings.xml
index 647aff2481..2d621fecaf 100644
--- a/drop-in/src/main/res/values-sl-rSI/strings.xml
+++ b/drop-in/src/main/res/values-sl-rSI/strings.xml
@@ -33,4 +33,7 @@
Če želite to sliko shraniti v napravo, morate omogočiti dovoljenje za shranjevanje
Potrdite plačilo: %s
Prekliči
+ Zapri
+ Nazaj
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-sv-rSE/strings.xml b/drop-in/src/main/res/values-sv-rSE/strings.xml
index 4226431eeb..c87458eae2 100644
--- a/drop-in/src/main/res/values-sv-rSE/strings.xml
+++ b/drop-in/src/main/res/values-sv-rSE/strings.xml
@@ -33,4 +33,7 @@
För att kunna spara bilden på din enhet måste du aktivera lagringsbehörighet
Bekräfta %s-betalning
Avbryt
+ Stäng
+ Tillbaka
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-zh-rCN/strings.xml b/drop-in/src/main/res/values-zh-rCN/strings.xml
index 46ad47e1a1..03ed43a32d 100644
--- a/drop-in/src/main/res/values-zh-rCN/strings.xml
+++ b/drop-in/src/main/res/values-zh-rCN/strings.xml
@@ -33,4 +33,7 @@
要将此图片保存到设备,您需要启用存储权限
确认 %s 支付
取消
+ 关闭
+ 返回
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values-zh-rTW/strings.xml b/drop-in/src/main/res/values-zh-rTW/strings.xml
index 6f2e08181e..9dad39b000 100644
--- a/drop-in/src/main/res/values-zh-rTW/strings.xml
+++ b/drop-in/src/main/res/values-zh-rTW/strings.xml
@@ -33,4 +33,7 @@
必須啟用儲存空間權限,才能將此影像儲存到您的裝置
確認 %s 付款
取消
+ 關閉
+ 返回
+
\ No newline at end of file
diff --git a/drop-in/src/main/res/values/strings.xml b/drop-in/src/main/res/values/strings.xml
index c3305a8f66..9ff08df44d 100644
--- a/drop-in/src/main/res/values/strings.xml
+++ b/drop-in/src/main/res/values/strings.xml
@@ -33,6 +33,9 @@
In order to save this image to your device, you need to enable storage permission
Confirm %s payment
Cancel
+ Close
+ Back
+
- %s
•••• %s
diff --git a/drop-in/src/main/res/values/styles.xml b/drop-in/src/main/res/values/styles.xml
index 2249997aff..66f2bf46df 100644
--- a/drop-in/src/main/res/values/styles.xml
+++ b/drop-in/src/main/res/values/styles.xml
@@ -12,26 +12,26 @@