10 files changed, 16 insertions, 1 deletions
diff --git a/src/main/res/drawable-hdpi/ic_barcode_scan_white_24dp.png b/src/main/res/drawable-hdpi/ic_barcode_scan_white_24dp.png
new file mode 100644
index 000000000..705f40296
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_barcode_scan_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_barcode_scan_white_24dp.png b/src/main/res/drawable-mdpi/ic_barcode_scan_white_24dp.png
new file mode 100644
index 000000000..b952be675
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_barcode_scan_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_barcode_scan_white_24dp.png b/src/main/res/drawable-xhdpi/ic_barcode_scan_white_24dp.png
new file mode 100644
index 000000000..f0d2b0e59
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_barcode_scan_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_barcode_scan_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_barcode_scan_white_24dp.png
new file mode 100644
index 000000000..cd8375f5b
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_barcode_scan_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_barcode_scan_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_barcode_scan_white_24dp.png
new file mode 100644
index 000000000..f8b6f3f3b
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_barcode_scan_white_24dp.png
diff --git a/src/main/res/menu/trust_keys.xml b/src/main/res/menu/trust_keys.xml
new file mode 100644
index 000000000..7c63bd7fe
--- /dev/null
+++ b/src/main/res/menu/trust_keys.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_scan_qr_code"
+        android:title="@string/scan_qr_code"
+        android:showAsAction="always"
+        android:icon="?attr/icon_scan_qr_code"/>
+</menu>
+\ No newline at end of file
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index b686c5f6d..80e140f0c 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -37,6 +37,7 @@
         <item name="attr/icon_settings">@drawable/ic_settings_grey600_24dp</item>
         <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item>
         <item name="attr/icon_share">@drawable/ic_share_white_24dp</item>
+        <item name="attr/icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
 
     </style>
 
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 309c1fb30..da88d1f44 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -26,6 +26,7 @@
     <attr name="icon_settings" format="reference" />
     <attr name="icon_share" format="reference" />
     <attr name="icon_import_export" format="reference" />
+    <attr name="icon_scan_qr_code" format="reference"/>
 
     <attr name="icon_notifications" format="reference" />
     <attr name="icon_notifications_off" format="reference" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6415acaab..1d33ecffd 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -711,4 +711,8 @@
     <string name="this_device_has_been_verified">This device has been verified</string>
     <string name="copy_fingerprint">Copy fingerprint</string>
     <string name="all_omemo_keys_have_been_verified">All OMEMO keys have been verified</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Barcode does not contain fingerprints for this conversation.</string>
+    <string name="verified_fingerprints">Verified fingerprints</string>
+    <string name="use_camera_icon_to_scan_barcode">Use the camera to scan a contacts barcode</string>
+    <string name="please_wait_for_keys_to_be_fetched">Please wait for keys to be fetched</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 071d26d3c..61a2d2bb1 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -32,7 +32,7 @@
         <item name="attr/icon_settings">@drawable/ic_settings_grey600_24dp</item>
         <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item>
         <item name="attr/icon_share">@drawable/ic_share_white_24dp</item>
-
+        <item name="attr/icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
         <item name="attr/dialog_horizontal_padding">16dp</item>
         <item name="attr/dialog_vertical_padding">16dp</item>
     </style>