diff --git a/res/drawable/ic_qr_code.xml b/res/drawable/ic_qr_code.xml
deleted file mode 100644
index a14566b955..0000000000
--- a/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="25dp"
-    android:viewportWidth="25"
-    android:viewportHeight="25"
-    android:tint="?attr/colorControlNormal">
-  <group>
-    <clip-path android:pathData="M7.81,7.81H1.56V1.56h6.25V7.81zM9.38,0H0v9.38h9.38V0z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M-5,-5h19.38v19.38h-19.38z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M3.12,3.12h3.12v3.12h-3.12z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M-1.88,-1.88h13.12v13.12h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M1.56,17.19h6.25v6.25H1.56V17.19zM0,25h9.38v-9.38H0V25z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M-5,10.62h19.38v19.38h-19.38z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M3.12,18.75h3.12v3.12h-3.12z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M-1.88,13.75h13.12v13.12h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M23.44,7.81h-6.25V1.56h6.25V7.81zM15.62,0v9.38H25V0H15.62z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M10.62,-5h19.38v19.38h-19.38z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M18.75,3.12h3.12v3.12h-3.12z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M13.75,-1.88h13.12v13.12h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M3.12,10.94l-3.12,0l0,3.12l4.69,0l0,-1.56l-1.57,0z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M-5,5.94h14.69v13.12h-14.69z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M10.94,14.06h3.12v3.12h-3.12z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M5.94,9.06h13.12v13.12h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M4.69,10.94h3.12v1.56h-3.12z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M-0.31,5.94h13.12v11.56h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M14.06,18.75l-3.12,0l0,1.56l1.56,0l0,1.57l1.56,0l0,-1.57z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M5.94,13.75h13.12v13.12h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M9.38,10.94l0,1.56l-1.57,0l0,1.56l3.13,0l0,-3.12z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M2.81,5.94h13.12v13.12h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M12.5,6.25h1.56v3.12h-1.56z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M7.5,1.25h11.56v13.12h-11.56z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M14.06,12.5l0,1.56l3.13,0l0,-3.12l-4.69,0l0,1.56z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M7.5,5.94h14.69v13.12h-14.69z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M10.94,9.38h1.56v1.56h-1.56z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M5.94,4.38h11.56v11.56h-11.56z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M14.06,21.88h3.12v3.12h-3.12z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M9.06,16.88h13.12v13.12h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M10.94,21.88h1.56v3.12h-1.56z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M5.94,16.88h11.56v13.12h-11.56z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M14.06,17.19h1.56v1.56h-1.56z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M9.06,12.19h11.56v11.56h-11.56z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M14.06,4.69l0,-3.13l-1.56,0l0,-1.56l-1.56,0l0,6.25l1.56,0l0,-1.56z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M5.94,-5h13.12v16.25h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M18.75,21.88h1.56v3.12h-1.56z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M13.75,16.88h11.56v13.12h-11.56z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M18.75,18.75h3.12v1.56h-3.12z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M13.75,13.75h13.12v11.56h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M17.19,20.31h1.56v1.56h-1.56z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M12.19,15.31h11.56v11.56h-11.56z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M15.62,18.75h1.56v1.56h-1.56z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M10.62,13.75h11.56v11.56h-11.56z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M21.88,15.62l0,1.57l1.56,0l0,1.56l1.56,0l0,-3.13l-1.56,0z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M16.88,10.62h13.12v13.12h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M23.44,20.31l-1.56,0l0,4.69l3.12,0l0,-3.12l-1.56,0z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M16.88,15.31h13.12v14.69h-13.12z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M15.62,15.62l0,1.57l4.69,0l0,-3.13l-3.12,0l0,1.56z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M10.62,9.06h14.69v13.12h-14.69z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-  <group>
-    <clip-path android:pathData="M18.75,10.94l0,1.56l3.13,0l0,1.56l3.12,0l0,-3.12l-3.12,0z M 0,0"/>
-    <group>
-      <clip-path android:pathData="M-335,-28h375v908h-375z M 0,0"/>
-      <path
-          android:pathData="M13.75,5.94h16.25v13.12h-16.25z"
-          android:fillColor="@android:color/white"/>
-    </group>
-  </group>
-</vector>
diff --git a/res/drawable/ic_qr_code_24.xml b/res/drawable/ic_qr_code_24.xml
new file mode 100644
index 0000000000..acd7573fdd
--- /dev/null
+++ b/res/drawable/ic_qr_code_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="27dp"
+    android:height="27dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15,21h-2v-2h2V21zM13,14h-2v5h2V14zM21,12h-2v4h2V12zM19,10h-2v2h2V10zM7,12H5v2h2V12zM5,10H3v2h2V10zM12,5h2V3h-2V5zM4.5,4.5v3h3v-3H4.5zM9,9H3V3h6V9zM4.5,16.5v3h3v-3H4.5zM9,21H3v-6h6V21zM16.5,4.5v3h3v-3H16.5zM21,9h-6V3h6V9zM19,19v-3l-4,0v2h2v3h4v-2H19zM17,12l-4,0v2h4V12zM13,10H7v2h2v2h2v-2h2V10zM14,9V7h-2V5h-2v4L14,9zM6.75,5.25h-1.5v1.5h1.5V5.25zM6.75,17.25h-1.5v1.5h1.5V17.25zM18.75,5.25h-1.5v1.5h1.5V5.25z"/>
+</vector>
diff --git a/res/drawable/icon_qr_code.xml b/res/drawable/icon_qr_code.xml
deleted file mode 100644
index d694c7297f..0000000000
--- a/res/drawable/icon_qr_code.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="448"
-    android:viewportHeight="512">
-    <group
-        android:scaleX="0.88"
-        android:scaleY="0.88"
-        android:translateX="64">
-        <path
-            android:fillColor="?attr/pref_icon_tint"
-            android:pathData="M0,224h192L192,32L0,32v192zM64,96h64v64L64,160L64,96zM256,32v192h192L448,32L256,32zM384,160h-64L320,96h64v64zM0,480h192L192,288L0,288v192zM64,352h64v64L64,416v-64zM416,288h32v128h-96v-32h-32v96h-64L256,288h96v32h64v-32zM416,448h32v32h-32v-32zM352,448h32v32h-32v-32z"/>
-    </group>
-</vector>
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index aa62a3bbd5..f4512b9a97 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -6,8 +6,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/default_session_background"
+    tools:context="org.thoughtcrime.securesms.loki.activities.SettingsActivity"
     tools:theme="@style/Session.DarkTheme.NoActionBar"
-    tools:context="org.thoughtcrime.securesms.loki.activities.SettingsActivity">
+    tools:menu="@menu/settings_general">
 
     <ScrollView
         android:layout_width="match_parent"
diff --git a/res/menu/menu_settings.xml b/res/menu/menu_settings.xml
deleted file mode 100644
index 55f56b1233..0000000000
--- a/res/menu/menu_settings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/showQRCodeItem"
-        android:title="Show QR Code"
-        android:icon="@drawable/ic_qr_code"
-        app:showAsAction="always" />
-
-</menu>
\ No newline at end of file
diff --git a/res/menu/settings_general.xml b/res/menu/settings_general.xml
index 0d9788a28a..a965be5fb1 100644
--- a/res/menu/settings_general.xml
+++ b/res/menu/settings_general.xml
@@ -6,7 +6,7 @@
     <item
         android:id="@+id/action_qr_code"
         android:title=""
-        android:icon="@drawable/ic_qr_code"
+        android:icon="@drawable/ic_qr_code_24"
         app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 4f8b6e4663..0710e1f03a 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -43,7 +43,7 @@
 
     <Preference android:key="preference_category_qr_code"
                 android:title="@string/activity_settings_show_qr_code_button_title"
-                android:icon="@drawable/icon_qr_code"/>
+                android:icon="@drawable/ic_qr_code_24"/>
 
     <Preference android:key="preference_category_seed"
                 android:title="@string/activity_settings_show_seed_button_title"
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 7f75443aed..e453c9eeae 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -247,7 +247,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
       Drawable devices       = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_laptop_white_24dp));
       Drawable advanced      = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_advanced_white_24dp));
       Drawable publicKey     = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_textsms_24dp));
-      Drawable qrCode        = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.icon_qr_code));
+      Drawable qrCode        = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_qr_code_24));
       Drawable linkDevice    = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.icon_link));
       Drawable seed          = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.icon_seedling));