diff --git a/src/Android/Resources/values/strings.xml b/src/Android/Resources/values/strings.xml
index 53c6195b6..5e489f56f 100644
--- a/src/Android/Resources/values/strings.xml
+++ b/src/Android/Resources/values/strings.xml
@@ -16,8 +16,8 @@
Password Generator
-
- Scan & Fill
+
+ Auto-fill
Self-hosted server URL
diff --git a/src/Android/Tiles/AutofillTileService.cs b/src/Android/Tiles/AutofillTileService.cs
index 71db23805..305afce37 100644
--- a/src/Android/Tiles/AutofillTileService.cs
+++ b/src/Android/Tiles/AutofillTileService.cs
@@ -12,7 +12,7 @@ using Java.Lang;
namespace Bit.Droid.Tile
{
- [Service(Permission = Manifest.Permission.BindQuickSettingsTile, Label = "@string/ScanAndFill",
+ [Service(Permission = Manifest.Permission.BindQuickSettingsTile, Label = "@string/AutoFillTile",
Icon = "@drawable/shield")]
[IntentFilter(new string[] { ActionQsTile })]
[Register("com.x8bit.bitwarden.AutofillTileService")]
diff --git a/src/App/Pages/Vault/AutofillCiphersPage.xaml b/src/App/Pages/Vault/AutofillCiphersPage.xaml
index 8a310eca3..6465d89d4 100644
--- a/src/App/Pages/Vault/AutofillCiphersPage.xaml
+++ b/src/App/Pages/Vault/AutofillCiphersPage.xaml
@@ -96,6 +96,7 @@