diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index b3a4d5960..48677431c 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -65,7 +65,7 @@
         android:name=".KeychainApplication"
         android:allowBackup="false"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/icon"
+        android:icon="@drawable/ic_launcher"
         android:theme="@style/KeychainTheme"
         android:label="@string/app_name">
         <activity
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png
new file mode 100644
index 000000000..635633709
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png
index e15a055db..1c65e5af8 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/icon.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-hdpi/icon.png
rename to OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/icon.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-ldpi/icon.png
rename to OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png
new file mode 100644
index 000000000..da5e267d0
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png
index 1c65e5af8..570212461 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/icon.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-mdpi/icon.png
rename to OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png
new file mode 100644
index 000000000..ff569927c
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png
index c56b128e4..ce8965396 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xhdpi/icon.png
rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png
new file mode 100644
index 000000000..1f96ce37b
Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png
index c718aee0b..c56b128e4 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxhdpi/icon.png
rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png
rename to OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
index 09a31b4a8..3f131b9ce 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml
@@ -33,12 +33,12 @@
             android:layout_marginTop="8dp"
             android:background="?android:attr/listDivider" />
 
-        <Button
+        <ImageButton
             android:id="@+id/import_nfc_button"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:padding="8dp"
-            android:text="NFC?"
+            android:src="@drawable/ic_action_nfc"
             android:layout_gravity="center_vertical"
             style="@style/SelectableItem" />
 
diff --git a/Resources/graphics/ic_action_nfc.svg b/Resources/graphics/ic_action_nfc.svg
new file mode 100644
index 000000000..23ec040ff
--- /dev/null
+++ b/Resources/graphics/ic_action_nfc.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="ic_action_nfc.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="55.015233"
+     inkscape:cy="28.459126"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1918"
+     inkscape:window-height="1179"
+     inkscape:window-x="0"
+     inkscape:window-y="19"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       style="fill:#333333;fill-opacity:1;opacity:0.6"
+       d="m 5.8721355,1048.2554 c -0.4529966,-0.1375 -0.740227,-0.4023 -0.9002787,-0.8301 -0.1191051,-0.3184 -0.1207083,-0.4654 -0.1210019,-11.0625 -2.937e-4,-10.087 0.00614,-10.7582 0.1054687,-11.0385 0.1209465,-0.3414 0.3739125,-0.6212 0.714231,-0.7901 0.2298623,-0.1143 0.4666295,-0.1167 10.3597324,-0.1167 9.762967,0 10.132027,0 10.33542,0.1119 0.293646,0.1565 0.533124,0.3907 0.668434,0.6537 0.11192,0.2176 0.115013,0.517 0.115013,11.171 l 0,10.9473 -0.158878,0.292 c -0.170555,0.3133 -0.479601,0.5651 -0.810206,0.6599 -0.246895,0.071 -20.0747083,0.072 -20.3079261,0 z m 16.2976125,-2.4107 c 0.23156,-0.072 0.233209,-0.075 0.197176,-0.3243 -0.01999,-0.1382 -0.06539,-0.3531 -0.100895,-0.4778 -0.05999,-0.2104 -0.07395,-0.2212 -0.197176,-0.1528 -0.08059,0.045 -0.380826,0.075 -0.765398,0.075 -0.599986,0 -0.648397,-0.012 -0.934105,-0.1829 -0.791251,-0.4824 -0.931603,-1.6091 -0.289037,-2.3203 0.358193,-0.3965 0.834326,-0.478 2.00208,-0.3427 0.130096,0.016 0.159263,-0.024 0.265386,-0.3525 0.06557,-0.203 0.10323,-0.411 0.08367,-0.4619 -0.09945,-0.2592 -1.822581,-0.2986 -2.442687,-0.055 -0.730348,0.2858 -1.380503,1.0115 -1.523992,1.7009 -0.163151,0.7839 0.03489,1.6739 0.487021,2.1889 0.242512,0.2762 0.819987,0.6217 1.231169,0.7366 0.365786,0.1023 1.625695,0.083 1.986785,-0.03 z m -11.484429,-1.5922 -0.01861,-1.6494 0.305471,0.5797 c 0.168009,0.3188 0.590546,1.0543 0.938971,1.6343 l 0.633498,1.0547 0.627916,0 0.627916,0 0.01577,-2.3655 0.01577,-2.3653 -0.579954,0 -0.579953,0 0.02229,1.4971 0.02229,1.497 -0.393102,-0.7287 c -0.216208,-0.4008 -0.449401,-0.81 -0.518211,-0.9095 -0.137702,-0.199 -0.444752,-0.7018 -0.671555,-1.0998 l -0.145965,-0.2561 -0.718026,0 -0.7180255,0 0,2.3805 0,2.3804 0.5760585,0 0.576058,0 -0.01861,-1.6494 z m 5.254566,0.7169 0,-0.9325 0.888907,-0.017 0.888907,-0.017 0.0176,-0.467 0.01761,-0.4671 -0.906507,0 -0.906509,0 0,-0.4806 0,-0.4806 0.949172,-0.017 0.949173,-0.017 0.0176,-0.467 0.01761,-0.4671 -1.569422,0 -1.569421,0 0,2.3806 0,2.3804 0.602649,0 0.602648,0 0,-0.9326 z m 6.273699,-6.4951 c 0.263993,-0.1748 0.61016,-0.8748 0.983357,-1.9885 0.326831,-0.9753 0.423664,-1.4032 0.58101,-2.5681 0.146707,-1.0861 0.146304,-1.9076 -0.0016,-3.0218 -0.154191,-1.1622 -0.252803,-1.6038 -0.569457,-2.5496 -0.370747,-1.1074 -0.703918,-1.8019 -0.957103,-1.995 -0.398108,-0.3037 -1.035569,-0.1671 -1.308366,0.2804 -0.1709,0.2803 -0.152866,0.4134 0.144075,1.0638 0.748762,1.6401 1.136923,3.7484 0.996979,5.4153 -0.126969,1.5121 -0.448209,2.7968 -1.003437,4.0129 -0.286491,0.6275 -0.3029,0.8042 -0.103013,1.1092 0.247511,0.3778 0.853068,0.4959 1.237432,0.2414 z m -3.212265,-1.1548 c 0.08951,-0.047 0.234524,-0.162 0.322265,-0.2561 0.350427,-0.3759 0.948601,-2.1223 1.142298,-3.335 0.09437,-0.5908 0.09141,-2.0711 -0.0054,-2.6818 -0.199949,-1.2618 -0.839385,-3.0751 -1.195876,-3.3914 -0.324129,-0.2875 -0.671846,-0.3307 -1.031906,-0.1284 -0.496876,0.2792 -0.547131,0.6948 -0.179059,1.4805 0.135063,0.2883 0.343972,0.8922 0.464242,1.342 0.21768,0.8142 0.218674,0.8235 0.218674,2.0533 0,1.2298 -9.28e-4,1.2392 -0.218674,2.0533 -0.120272,0.4497 -0.325465,1.0465 -0.45599,1.3258 -0.315221,0.6747 -0.334073,0.7469 -0.256435,0.9821 0.160477,0.4864 0.778774,0.7737 1.195836,0.5557 z m -3.174159,-1.6681 c 0.186492,-0.1329 0.54841,-0.7896 0.691807,-1.2555 0.508888,-1.6532 0.377076,-3.2602 -0.388485,-4.7361 -0.327298,-0.6311 -0.615499,-0.8731 -1.039587,-0.8731 -0.674978,0 -0.899355,0.6963 -0.495246,1.5367 0.24473,0.5091 0.384292,1.1084 0.42106,1.808 0.03924,0.7467 -0.04997,1.3559 -0.198551,1.3559 -0.07304,0 -2.190719,-1.4926 -4.081753,-2.877 -1.1019127,-0.8066 -1.3287251,-0.9434 -1.5671351,-0.9452 -0.4533423,0 -0.7275993,0.4736 -0.9154451,1.5925 -0.1551399,0.924 -0.097393,1.9682 0.1566469,2.8324 0.1502703,0.5113 0.2975533,0.7419 0.6027144,0.9438 0.2927514,0.1937 0.5593056,0.2103 0.8029728,0.051 0.3564331,-0.2345 0.4157281,-0.6689 0.2187151,-1.6023 -0.1185758,-0.5619 -0.1563702,-1.0842 -0.083696,-1.1568 0.048046,-0.048 0.316088,0.09 0.775803,0.3986 0.396405,0.2664 2.231928,1.5694 3.043374,2.1604 1.077365,0.7846 1.270646,0.8934 1.587716,0.8936 0.19986,10e-5 0.347904,-0.04 0.469094,-0.1259 z"
+       id="path3047"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Resources/graphics/ic_action_nfc/NFC.png b/Resources/graphics/ic_action_nfc/NFC.png
new file mode 100644
index 000000000..96af64049
Binary files /dev/null and b/Resources/graphics/ic_action_nfc/NFC.png differ
diff --git a/Resources/graphics/ic_action_qr_code.png b/Resources/graphics/ic_action_qr_code.png
deleted file mode 100644
index 3c311c7df..000000000
Binary files a/Resources/graphics/ic_action_qr_code.png and /dev/null differ
diff --git a/Resources/graphics/ic_action_qr_code/ic_menu_qr_code.svg b/Resources/graphics/ic_action_qr_code/ic_menu_qr_code.svg
new file mode 100644
index 000000000..5cbe9defc
--- /dev/null
+++ b/Resources/graphics/ic_action_qr_code/ic_menu_qr_code.svg
@@ -0,0 +1,753 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="48px"
+   height="48px"
+   viewBox="0 0 48 48"
+   enable-background="new 0 0 48 48"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="ic_menu_qr_code.svg"><metadata
+   id="metadata231"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs229">
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1280"
+   inkscape:window-height="921"
+   id="namedview227"
+   showgrid="false"
+   inkscape:zoom="8.4558186"
+   inkscape:cx="9.2917208"
+   inkscape:cy="14.446251"
+   inkscape:window-x="-4"
+   inkscape:window-y="-4"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect25"
+   height="6.8569999"
+   width="2.286"
+   y="4.5710001"
+   x="4.5710001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect39"
+   height="6.8569999"
+   width="2.286"
+   y="4.5710001"
+   x="6.8569999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect55"
+   height="6.8569999"
+   width="2.2850001"
+   y="4.5710001"
+   x="9.1440001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect33"
+   height="6.8569999"
+   width="2.286"
+   y="36.57"
+   x="4.5710001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect49"
+   height="6.8569999"
+   width="2.286"
+   y="36.57"
+   x="6.8569999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect61"
+   height="6.8569999"
+   width="2.2850001"
+   y="36.57"
+   x="9.1440001" /><rect
+   y="0"
+   x="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect5"
+   height="16"
+   width="2.2850001" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect13"
+   height="2.2850001"
+   width="2.286"
+   x="2.2850001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect15"
+   height="2.286"
+   width="2.286"
+   y="13.714"
+   x="2.2850001" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect23"
+   height="2.2850001"
+   width="2.286"
+   x="4.5710001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect27"
+   height="2.286"
+   width="2.286"
+   y="13.714"
+   x="4.5710001" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect37"
+   height="2.2850001"
+   width="2.286"
+   x="6.8569999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect41"
+   height="2.286"
+   width="2.286"
+   y="13.714"
+   x="6.8569999" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect53"
+   height="2.2850001"
+   width="2.2850001"
+   x="9.1440001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect57"
+   height="2.286"
+   width="2.2850001"
+   y="13.714"
+   x="9.1440001" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect65"
+   height="2.2850001"
+   width="2.2850001"
+   x="11.429" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect67"
+   height="2.286"
+   width="2.2850001"
+   y="13.714"
+   x="11.429" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect75"
+   height="16"
+   width="2.286"
+   x="13.714" /><rect
+   x="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect11"
+   height="16"
+   width="2.2850001"
+   y="32" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect19"
+   height="2.2850001"
+   width="2.286"
+   y="32"
+   x="2.2850001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect21"
+   height="2.286"
+   width="2.286"
+   y="45.714001"
+   x="2.2850001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect31"
+   height="2.2850001"
+   width="2.286"
+   y="32"
+   x="4.5710001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect35"
+   height="2.286"
+   width="2.286"
+   y="45.714001"
+   x="4.5710001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect47"
+   height="2.2850001"
+   width="2.286"
+   y="32"
+   x="6.8569999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect51"
+   height="2.286"
+   width="2.286"
+   y="45.714001"
+   x="6.8569999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect59"
+   height="2.2850001"
+   width="2.2850001"
+   y="32"
+   x="9.1440001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect63"
+   height="2.286"
+   width="2.2850001"
+   y="45.714001"
+   x="9.1440001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect71"
+   height="2.2850001"
+   width="2.2850001"
+   y="32"
+   x="11.429" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect73"
+   height="2.286"
+   width="2.2850001"
+   y="45.714001"
+   x="11.429" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect83"
+   height="16"
+   width="2.286"
+   y="32"
+   x="13.714" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect163"
+   height="6.8569999"
+   width="2.2869999"
+   y="4.5710001"
+   x="36.57" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect177"
+   height="6.8569999"
+   width="2.2850001"
+   y="4.5710001"
+   x="38.856998" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect191"
+   height="6.8569999"
+   width="2.2869999"
+   y="4.5710001"
+   x="41.143002" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect141"
+   height="16"
+   width="2.2850001"
+   x="32" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect151"
+   height="2.2850001"
+   width="2.2850001"
+   x="34.285" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect153"
+   height="2.286"
+   width="2.2850001"
+   y="13.714"
+   x="34.285" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect161"
+   height="2.2850001"
+   width="2.2869999"
+   x="36.57" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect165"
+   height="2.286"
+   width="2.2869999"
+   y="13.714"
+   x="36.57" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect175"
+   height="2.2850001"
+   width="2.2850001"
+   x="38.856998" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect179"
+   height="2.286"
+   width="2.2850001"
+   y="13.714"
+   x="38.856998" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect189"
+   height="2.2850001"
+   width="2.2869999"
+   x="41.143002" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect193"
+   height="2.286"
+   width="2.2869999"
+   y="13.714"
+   x="41.143002" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect203"
+   height="2.2850001"
+   width="2.2839999"
+   x="43.43" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect205"
+   height="2.286"
+   width="2.2839999"
+   y="13.714"
+   x="43.43" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect217"
+   height="16"
+   width="2.286"
+   x="45.714001" /><rect
+   x="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect7"
+   height="4.572"
+   width="2.2850001"
+   y="18.285" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect17"
+   height="2.2869999"
+   width="2.286"
+   y="27.427999"
+   x="2.2850001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect29"
+   height="6.8559999"
+   width="2.286"
+   y="20.570999"
+   x="4.5710001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect43"
+   height="2.286"
+   width="2.286"
+   y="20.570999"
+   x="6.8569999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect45"
+   height="4.572"
+   width="2.286"
+   y="25.143"
+   x="6.8569999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect69"
+   height="2.286"
+   width="2.2850001"
+   y="22.857"
+   x="11.429" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect77"
+   height="2.286"
+   width="2.286"
+   y="18.285"
+   x="13.714" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect79"
+   height="2.286"
+   width="2.286"
+   y="22.857"
+   x="13.714" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect81"
+   height="2.2869999"
+   width="2.286"
+   y="27.427999"
+   x="13.714" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect85"
+   height="4.572"
+   width="2.286"
+   y="20.570999"
+   x="16" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect87"
+   height="6.8569999"
+   width="2.286"
+   y="2.2850001"
+   x="18.285999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect89"
+   height="18.285999"
+   width="2.286"
+   y="13.714"
+   x="18.285999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect91"
+   height="2.286"
+   width="2.286"
+   y="45.714001"
+   x="18.285999" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect93"
+   height="2.2850001"
+   width="2.2850001"
+   x="20.572001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect95"
+   height="2.286"
+   width="2.2850001"
+   y="9.1429996"
+   x="20.572001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect97"
+   height="6.8569999"
+   width="2.2850001"
+   y="25.143"
+   x="20.572001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect99"
+   height="2.2850001"
+   width="2.2850001"
+   y="34.285"
+   x="20.572001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect101"
+   height="9.1429996"
+   width="2.2850001"
+   y="38.856998"
+   x="20.572001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect103"
+   height="2.2850001"
+   width="2.286"
+   y="6.8569999"
+   x="22.857" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect107"
+   height="6.8569999"
+   width="2.286"
+   y="18.285"
+   x="22.857" /><rect
+   y="0"
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect113"
+   height="2.2850001"
+   width="2.2850001"
+   x="25.143" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect117"
+   height="2.2850001"
+   width="2.2850001"
+   y="16"
+   x="25.143" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect119"
+   height="2.286"
+   width="2.2850001"
+   y="22.857"
+   x="25.143" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect121"
+   height="2.2850001"
+   width="2.2850001"
+   y="29.715"
+   x="25.143" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect123"
+   height="2.2850001"
+   width="2.2850001"
+   y="34.285"
+   x="25.143" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect125"
+   height="2.286"
+   width="2.2850001"
+   y="45.714001"
+   x="25.143" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect127"
+   height="4.572"
+   width="2.286"
+   y="2.2850001"
+   x="27.427999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect129"
+   height="13.715"
+   width="2.286"
+   y="9.1429996"
+   x="27.427999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect131"
+   height="11.428"
+   width="2.286"
+   y="29.715"
+   x="27.427999" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect135"
+   height="4.572"
+   width="2.286"
+   y="27.427999"
+   x="29.714001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect137"
+   height="2.2850001"
+   width="2.286"
+   y="34.285"
+   x="29.714001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect139"
+   height="2.286"
+   width="2.286"
+   y="45.714001"
+   x="29.714001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect145"
+   height="2.286"
+   width="2.2850001"
+   y="22.857"
+   x="32" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect149"
+   height="2.2869999"
+   width="2.2850001"
+   y="41.143002"
+   x="32" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect155"
+   height="6.8559999"
+   width="2.2850001"
+   y="20.570999"
+   x="34.285" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect157"
+   height="4.572"
+   width="2.2850001"
+   y="34.285"
+   x="34.285" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect169"
+   height="2.2869999"
+   width="2.2869999"
+   y="27.427999"
+   x="36.57" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect171"
+   height="4.5700002"
+   width="2.2869999"
+   y="32"
+   x="36.57" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect173"
+   height="9.1429996"
+   width="2.2869999"
+   y="38.856998"
+   x="36.57" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect181"
+   height="2.286"
+   width="2.2850001"
+   y="18.285"
+   x="38.856998" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect183"
+   height="4.5700002"
+   width="2.2850001"
+   y="22.857"
+   x="38.856998" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect185"
+   height="2.2850001"
+   width="2.2850001"
+   y="34.285"
+   x="38.856998" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect187"
+   height="2.2839999"
+   width="2.2850001"
+   y="43.43"
+   x="38.856998" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect195"
+   height="9.1429996"
+   width="2.2869999"
+   y="18.285"
+   x="41.143002" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect197"
+   height="2.2850001"
+   width="2.2869999"
+   y="29.715"
+   x="41.143002" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect199"
+   height="2.2850001"
+   width="2.2869999"
+   y="34.285"
+   x="41.143002" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect201"
+   height="6.855"
+   width="2.2869999"
+   y="38.856998"
+   x="41.143002" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect207"
+   height="2.286"
+   width="2.2839999"
+   y="18.285"
+   x="43.43" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect209"
+   height="6.8569999"
+   width="2.2839999"
+   y="22.857"
+   x="43.43" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect211"
+   height="2.2850001"
+   width="2.2839999"
+   y="32"
+   x="43.43" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect215"
+   height="2.286"
+   width="2.2839999"
+   y="45.714001"
+   x="43.43" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect219"
+   height="2.2850001"
+   width="2.286"
+   y="25.143"
+   x="45.714001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect223"
+   height="4.572"
+   width="2.286"
+   y="34.285"
+   x="45.714001" /><rect
+   style="opacity:0.6;fill:#333333;fill-opacity:1"
+   id="rect225"
+   height="2.2869999"
+   width="2.286"
+   y="41.143002"
+   x="45.714001" />
+</svg>
\ No newline at end of file
diff --git a/Resources/graphics/icon.png b/Resources/graphics/ic_launcher.png
similarity index 100%
rename from Resources/graphics/icon.png
rename to Resources/graphics/ic_launcher.png
diff --git a/Resources/graphics/icon.svg b/Resources/graphics/ic_launcher.svg
similarity index 100%
rename from Resources/graphics/icon.svg
rename to Resources/graphics/ic_launcher.svg
diff --git a/Resources/graphics/icon/AUTHORS b/Resources/graphics/ic_launcher/AUTHORS
similarity index 100%
rename from Resources/graphics/icon/AUTHORS
rename to Resources/graphics/ic_launcher/AUTHORS
diff --git a/Resources/graphics/icon/COPYING b/Resources/graphics/ic_launcher/COPYING
similarity index 100%
rename from Resources/graphics/icon/COPYING
rename to Resources/graphics/ic_launcher/COPYING
diff --git a/Resources/graphics/icon/kgpg_key2_kopete.svgz b/Resources/graphics/ic_launcher/kgpg_key2_kopete.svgz
similarity index 100%
rename from Resources/graphics/icon/kgpg_key2_kopete.svgz
rename to Resources/graphics/ic_launcher/kgpg_key2_kopete.svgz
diff --git a/Resources/graphics/update-icon.sh b/Resources/graphics/update-drawables.sh
similarity index 67%
rename from Resources/graphics/update-icon.sh
rename to Resources/graphics/update-drawables.sh
index 05b80e6b3..c1dfc77e6 100755
--- a/Resources/graphics/update-icon.sh
+++ b/Resources/graphics/update-drawables.sh
@@ -20,7 +20,7 @@ PLAY_DIR=./
 # xxxhdpi 192x192.
 # google play: 512x512
 
-NAME="icon"
+NAME="ic_launcher"
 
 inkscape -w 36 -h 36 -e "$LDPI_DIR/$NAME.png" $NAME.svg
 inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" $NAME.svg
@@ -30,3 +30,17 @@ inkscape -w 144 -h 144 -e "$XXDPI_DIR/$NAME.png" $NAME.svg
 inkscape -w 192 -h 192 -e "$XXXDPI_DIR/$NAME.png" $NAME.svg
 inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg
 
+# Actionbar Icons
+# -----------------------
+# mdpi: 32x32
+# hdpi: 48x48
+# xhdpi: 64x64
+# xxhdpi: 96x96
+
+for NAME in "ic_action_nfc" "ic_action_qr_code"
+do
+inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" $NAME.svg
+inkscape -w 48 -h 48 -e "$HDPI_DIR/$NAME.png" $NAME.svg
+inkscape -w 64 -h 64 -e "$XDPI_DIR/$NAME.png" $NAME.svg
+inkscape -w 96 -h 96 -e "$XXDPI_DIR/$NAME.png" $NAME.svg
+done
\ No newline at end of file