diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index f03f2776e..94691d6a3 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -150,6 +150,7 @@
+
diff --git a/src/Android/Renderers/CustomPageRenderer.cs b/src/Android/Renderers/CustomPageRenderer.cs
new file mode 100644
index 000000000..5dec9821a
--- /dev/null
+++ b/src/Android/Renderers/CustomPageRenderer.cs
@@ -0,0 +1,31 @@
+using System;
+using Android.App;
+using Android.Content;
+using AndroidX.AppCompat.Widget;
+using Bit.App.Resources;
+using Bit.Droid.Renderers;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(ContentPage), typeof(CustomPageRenderer))]
+namespace Bit.Droid.Renderers
+{
+ public class CustomPageRenderer : PageRenderer
+ {
+ public CustomPageRenderer(Context context) : base(context)
+ {
+ }
+
+ protected override void OnElementChanged(ElementChangedEventArgs e)
+ {
+ base.OnElementChanged(e);
+
+ Activity context = (Activity)this.Context;
+ var toolbar = context.FindViewById(Resource.Id.toolbar);
+ if(toolbar != null)
+ {
+ toolbar.NavigationContentDescription = AppResources.TapToGoBack;
+ }
+ }
+ }
+}
diff --git a/src/App/Pages/Vault/CiphersPage.xaml b/src/App/Pages/Vault/CiphersPage.xaml
index d9a31fa53..8b463e1a3 100644
--- a/src/App/Pages/Vault/CiphersPage.xaml
+++ b/src/App/Pages/Vault/CiphersPage.xaml
@@ -33,7 +33,9 @@
Text=""
VerticalOptions="CenterAndExpand"
Clicked="BackButton_Clicked"
- x:Name="_backButton" />
+ x:Name="_backButton"
+ AutomationProperties.IsInAccessibleTree="True"
+ AutomationProperties.Name="{u:I18n TapToGoBack}"/>
Special Characters (!@#$%^&*)
+
+ Tap to go back
+
Password is visible, tap to hide.