diff --git a/app/src/main/res/layout/activity_auth.xml b/app/src/main/res/layout/activity_auth.xml
index be1e052f..a2a8d735 100644
--- a/app/src/main/res/layout/activity_auth.xml
+++ b/app/src/main/res/layout/activity_auth.xml
@@ -40,7 +40,7 @@
                 android:id="@+id/button_decrypt"
                 android:layout_width="125dp"
                 android:layout_height="wrap_content"
-                android:text="Decrypt" />
+                android:text="@string/unlock" />
         </LinearLayout>
         <LinearLayout
             android:id="@+id/box_fingerprint"
@@ -82,7 +82,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="A fingerprint slot was found, but it appears to have been invalidated by the Android keystore. Go to &quot;Settings -> Key slots&quot; to readd your fingerprint."/>
+                android:text="@string/invalidated_fingerprint"/>
         </LinearLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_edit_entry.xml b/app/src/main/res/layout/activity_edit_entry.xml
index 7935fa6c..d36084bd 100644
--- a/app/src/main/res/layout/activity_edit_entry.xml
+++ b/app/src/main/res/layout/activity_edit_entry.xml
@@ -86,7 +86,7 @@
                 android:layout_marginBottom="5dp">
                 <EditText android:layout_column="1"
                     android:id="@+id/text_issuer"
-                    android:hint="Issuer"
+                    android:hint="@string/issuer"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:backgroundTint="#949494"
@@ -120,7 +120,7 @@
                 android:layout_marginStart="12dp"
                 android:layout_toEndOf="@+id/down_btn"
                 android:padding="16dp"
-                android:text="Advanced"
+                android:text="@string/advanced"
                 android:textStyle="bold" />
 
         </RelativeLayout>
@@ -228,7 +228,7 @@
                             android:layout_alignParentEnd="true"
                             android:backgroundTint="#949494"
                             android:layout_centerVertical="true"
-                            android:text="seconds"
+                            android:text="@string/seconds"
                             android:textSize="18sp"
                             android:layout_marginEnd="10dp"
                             android:textColor="#808080"/>
@@ -261,7 +261,7 @@
                     android:orientation="horizontal">
                     <EditText
                         android:id="@+id/text_counter"
-                        android:hint="Counter"
+                        android:hint="@string/counter"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -302,7 +302,7 @@
                         android:layout_height="wrap_content"
 
                         android:backgroundTint="#949494"
-                        android:hint="Secret (base32)"
+                        android:hint="@string/secret"
                         android:inputType="textPassword"/>
                 </com.google.android.material.textfield.TextInputLayout>
             </TableRow>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3302f7e8..e7c659f4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -32,7 +32,7 @@
             android:id="@+id/fab_scan"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:fab_title="Scan QR code"
+            app:fab_title="@string/scan"
             app:fab_size="mini"
             app:fab_colorNormal="@color/background"
             app:fab_colorPressed="@color/background"
@@ -42,7 +42,7 @@
             android:id="@+id/fab_enter"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:fab_title="Enter manually"
+            app:fab_title="@string/enter_manually"
             app:fab_size="mini"
             app:fab_colorNormal="@color/background"
             app:fab_colorPressed="@color/background"
diff --git a/app/src/main/res/layout/activity_slots.xml b/app/src/main/res/layout/activity_slots.xml
index f82b8f9b..9d8d18d2 100644
--- a/app/src/main/res/layout/activity_slots.xml
+++ b/app/src/main/res/layout/activity_slots.xml
@@ -48,7 +48,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="Add fingerprint"
+                    android:text="@string/add_fingerprint"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="?android:attr/textColorSecondary"/>
             </LinearLayout>
@@ -77,7 +77,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="The database is only as secure as your weakest key.\n\nWhen a new fingerprint is enrolled, all keys are wiped from the keystore. You should always have at least one password slot to prevent accidental data loss."/>
+                    android:text="@string/slots_warning"/>
             </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_edit_entry.xml b/app/src/main/res/layout/bottom_sheet_edit_entry.xml
index 3ea82486..db54fb27 100644
--- a/app/src/main/res/layout/bottom_sheet_edit_entry.xml
+++ b/app/src/main/res/layout/bottom_sheet_edit_entry.xml
@@ -22,7 +22,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Copy"/>
+            android:text="@string/copy"/>
 
     </LinearLayout>
     <LinearLayout
@@ -43,7 +43,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Edit"/>
+            android:text="@string/edit"/>
 
     </LinearLayout>
     <LinearLayout
@@ -64,7 +64,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Delete"/>
+            android:text="@string/delete"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/card_entry.xml b/app/src/main/res/layout/card_entry.xml
index f410a61f..11f173b9 100644
--- a/app/src/main/res/layout/card_entry.xml
+++ b/app/src/main/res/layout/card_entry.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
               android:foreground="?android:attr/selectableItemBackground"
               android:clickable="true"
               android:focusable="true"
@@ -53,7 +54,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/profile_issuer"
-                android:text="Issuer"
+                android:text="@string/issuer"
                 android:textColor="?attr/secondaryText"
                 android:includeFontPadding="false"
                 android:textSize="15sp"
@@ -64,17 +65,17 @@
                 android:maxLines="1"/>
 
             <TextView
+                android:id="@+id/profile_account_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/profile_account_name"
-                android:text=" - AccountName"
-                android:textColor="@color/extra_info_text"
-                android:includeFontPadding="false"
-                android:textSize="15sp"
-                android:layout_toRightOf="@id/profile_issuer"
                 android:layout_below="@id/profile_code"
+                android:layout_toRightOf="@id/profile_issuer"
                 android:ellipsize="end"
-                android:maxLines="1"/>
+                android:includeFontPadding="false"
+                android:maxLines="1"
+                android:textColor="@color/extra_info_text"
+                android:textSize="15sp"
+                tools:text=" - AccountName" />
 
 
             <TextView
@@ -82,7 +83,7 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:fontFamily="sans-serif-light"
-                android:text="Medium Text"
+                tools:text="012 345"
                 android:id="@+id/profile_code"
                 android:includeFontPadding="false"
                 android:textSize="34sp"
diff --git a/app/src/main/res/layout/dialog_password.xml b/app/src/main/res/layout/dialog_password.xml
index f66ba768..d73ae2c7 100644
--- a/app/src/main/res/layout/dialog_password.xml
+++ b/app/src/main/res/layout/dialog_password.xml
@@ -8,12 +8,12 @@
     android:paddingTop="20dp">
     <EditText
         android:id="@+id/text_password"
-        android:hint="Password"
+        android:hint="@string/password"
         android:inputType="textPassword"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
     <EditText
-        android:hint="Confirm password"
+        android:hint="@string/confirm_password"
         android:id="@+id/text_password_confirm"
         android:inputType="textPassword"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_authenticated_slide.xml b/app/src/main/res/layout/fragment_authenticated_slide.xml
index a79b7b93..8c14b03a 100644
--- a/app/src/main/res/layout/fragment_authenticated_slide.xml
+++ b/app/src/main/res/layout/fragment_authenticated_slide.xml
@@ -70,7 +70,7 @@
         android:visibility="invisible">
 
         <TextView
-            android:text="Fingerprint"
+            android:text="@string/authentication_method_fingerprint"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="24sp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 135af05d..c5f0f5cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="action_default_icon">Restore default icon</string>
     <string name="discard">Discard</string>
     <string name="save">Save</string>
+    <string name="issuer">Issuer</string>
     <string name="title_activity_intro">IntroActivity</string>
 
     <string name="settings">Preferences</string>
@@ -27,21 +28,23 @@
     <string name="pref_encryption_summary">Encrypt the database and unlock it with a password or fingerprint</string>
 
     <string name="fingerprint_hint">Touch sensor</string>
-    <string name="fingerprint_not_recognized">Fingerprint not recognized. Try again</string>
+    <string name="fingerprint_not_recognized">Fingerprint not recognized. Try again.</string>
     <string name="fingerprint_success">Fingerprint recognized</string>
 
-    <string name="choose_authentication_method">Encryption</string>
+    <string name="choose_authentication_method">Security</string>
     <string name="authentication_method_none">None</string>
-    <string name="authentication_method_none_description">The database will be stored in plain text</string>
+    <string name="authentication_method_none_description">You don\'t need a password to unlock the vault and it will not be encrypted. This option is not recommended.</string>
     <string name="authentication_method_password">Password</string>
-    <string name="authentication_method_password_description">The database will be encrypted with a key derived from a password</string>
+    <string name="authentication_method_password_description">You need a password to unlock the vault.</string>
     <string name="authentication_method_fingerprint">Fingerprint</string>
-    <string name="authentication_method_fingerprint_description">In addition to a password, fingerprints registered on this device can be used to decrypt the database</string>
+    <string name="authentication_method_fingerprint_description">In addition to a password, fingerprints registered on this device can be used to unlock the vault.</string>
     <string name="authentication_method_set_password">Password</string>
     <string name="authentication_enter_password">Enter your password</string>
-    <string name="authentication">Open the database</string>
+    <string name="authentication">Unlock the vault</string>
     <string name="set_password">Please enter a password</string>
     <string name="set_password_confirm">Please confirm the password</string>
+    <string name="invalidated_fingerprint">A change in your device\'s security settings has been detected. Please go to \"Settings -> Key slots\" and re-add your fingerprint.</string>
+
 
     <string-array name="authentication_methods">
         <item>None</item>
@@ -67,4 +70,18 @@
 
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="unlock">Unlock</string>
+    <string name="advanced">Advanced</string>
+    <string name="seconds">seconds</string>
+    <string name="counter">Counter</string>
+    <string name="secret">Secret</string>
+    <string name="scan">Scan QR code</string>
+    <string name="enter_manually">Enter manually</string>
+    <string name="add_fingerprint">Add fingerprint</string>
+    <string name="slots_warning">The vault is only as secure as your weakest secret.  When a new fingerprint is added to your device, you will to reactivate fingerprint authentication within Aegis.</string>
+    <string name="copy">Copy</string>
+    <string name="edit">Edit</string>
+    <string name="delete">Delete</string>
+    <string name="password">Password</string>
+    <string name="confirm_password">Confirm password</string>
 </resources>