diff --git a/Graphics/drawables/drawer_header.svg b/Graphics/drawables/drawer_header.svg
index a431b5ac5..b8896d6ad 100644
--- a/Graphics/drawables/drawer_header.svg
+++ b/Graphics/drawables/drawer_header.svg
@@ -231,14 +231,14 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="546.50452"
- inkscape:cy="96.739494"
+ inkscape:zoom="0.9899495"
+ inkscape:cx="554.63796"
+ inkscape:cy="-13.509829"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
- inkscape:window-width="2558"
- inkscape:window-height="1419"
+ inkscape:window-width="1918"
+ inkscape:window-height="1179"
inkscape:window-x="0"
inkscape:window-y="19"
inkscape:window-maximized="1" />
@@ -259,295 +259,6 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-764.36218)">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- %#&$!
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="g3310"
+ transform="matrix(1.3814851,0,0,1.3814851,-594.7198,-687.84793)">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="g3333">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Open
+ Keychain
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Open
- Keychain
diff --git a/Graphics/material-launcher/Feature Graphic.psd b/Graphics/drawables/material-launcher/Feature Graphic.psd
similarity index 100%
rename from Graphics/material-launcher/Feature Graphic.psd
rename to Graphics/drawables/material-launcher/Feature Graphic.psd
diff --git a/Graphics/material-launcher/Feature-Graphic.png b/Graphics/drawables/material-launcher/Feature-Graphic.png
similarity index 100%
rename from Graphics/material-launcher/Feature-Graphic.png
rename to Graphics/drawables/material-launcher/Feature-Graphic.png
diff --git a/Graphics/material-launcher/preview.psd b/Graphics/drawables/material-launcher/preview.psd
similarity index 100%
rename from Graphics/material-launcher/preview.psd
rename to Graphics/drawables/material-launcher/preview.psd
diff --git a/Graphics/material-launcher/preview1.png b/Graphics/drawables/material-launcher/preview1.png
similarity index 100%
rename from Graphics/material-launcher/preview1.png
rename to Graphics/drawables/material-launcher/preview1.png
diff --git a/Graphics/material-launcher/preview2.png b/Graphics/drawables/material-launcher/preview2.png
similarity index 100%
rename from Graphics/material-launcher/preview2.png
rename to Graphics/drawables/material-launcher/preview2.png
diff --git a/Graphics/material-launcher/preview3.png b/Graphics/drawables/material-launcher/preview3.png
similarity index 100%
rename from Graphics/material-launcher/preview3.png
rename to Graphics/drawables/material-launcher/preview3.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/144/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-blue.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/144/vector-src-blue.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-blue.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/144/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-purple.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/144/vector-src-purple.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src-purple.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/144/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/144/vector-src.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/144/vector-src.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/192/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-blue.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/192/vector-src-blue.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-blue.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/192/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-purple.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/192/vector-src-purple.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src-purple.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/192/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/192/vector-src.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/192/vector-src.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/48/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-blue.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/48/vector-src-blue.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-blue.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/48/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-purple.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/48/vector-src-purple.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src-purple.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/48/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/48/vector-src.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/48/vector-src.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/512/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-blue.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/512/vector-src-blue.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-blue.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/512/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-purple.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/512/vector-src-purple.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src-purple.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/512/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/512/vector-src.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/512/vector-src.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/72/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-blue.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/72/vector-src-blue.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-blue.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/72/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-purple.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/72/vector-src-purple.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src-purple.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/72/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/72/vector-src.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/72/vector-src.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/96/vector-src-blue.png b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-blue.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/96/vector-src-blue.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-blue.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/96/vector-src-purple.png b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-purple.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/96/vector-src-purple.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src-purple.png
diff --git a/Graphics/material-launcher/ready-launcher-icons/96/vector-src.png b/Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src.png
similarity index 100%
rename from Graphics/material-launcher/ready-launcher-icons/96/vector-src.png
rename to Graphics/drawables/material-launcher/ready-launcher-icons/96/vector-src.png
diff --git a/Graphics/material-launcher/vector-src blue.ai b/Graphics/drawables/material-launcher/vector-src blue.ai
similarity index 100%
rename from Graphics/material-launcher/vector-src blue.ai
rename to Graphics/drawables/material-launcher/vector-src blue.ai
diff --git a/Graphics/material-launcher/vector-src purple.ai b/Graphics/drawables/material-launcher/vector-src purple.ai
similarity index 100%
rename from Graphics/material-launcher/vector-src purple.ai
rename to Graphics/drawables/material-launcher/vector-src purple.ai
diff --git a/Graphics/material-launcher/vector-src purple.psd b/Graphics/drawables/material-launcher/vector-src purple.psd
similarity index 100%
rename from Graphics/material-launcher/vector-src purple.psd
rename to Graphics/drawables/material-launcher/vector-src purple.psd
diff --git a/Graphics/material-launcher/vector-src.ai b/Graphics/drawables/material-launcher/vector-src.ai
similarity index 100%
rename from Graphics/material-launcher/vector-src.ai
rename to Graphics/drawables/material-launcher/vector-src.ai
diff --git a/Graphics/material-launcher/vector-src.psd b/Graphics/drawables/material-launcher/vector-src.psd
similarity index 100%
rename from Graphics/material-launcher/vector-src.psd
rename to Graphics/drawables/material-launcher/vector-src.psd
diff --git a/Graphics/material-launcher/vector-src.svg b/Graphics/drawables/material-launcher/vector-src.svg
similarity index 100%
rename from Graphics/material-launcher/vector-src.svg
rename to Graphics/drawables/material-launcher/vector-src.svg
diff --git a/Graphics/material-launcher/vector.psd b/Graphics/drawables/material-launcher/vector.psd
similarity index 100%
rename from Graphics/material-launcher/vector.psd
rename to Graphics/drawables/material-launcher/vector.psd
diff --git a/Graphics/drawables/originals/ic_launcher/AUTHORS b/Graphics/drawables/originals/ic_launcher-old/AUTHORS
similarity index 100%
rename from Graphics/drawables/originals/ic_launcher/AUTHORS
rename to Graphics/drawables/originals/ic_launcher-old/AUTHORS
diff --git a/Graphics/drawables/originals/ic_launcher/COPYING b/Graphics/drawables/originals/ic_launcher-old/COPYING
similarity index 100%
rename from Graphics/drawables/originals/ic_launcher/COPYING
rename to Graphics/drawables/originals/ic_launcher-old/COPYING
diff --git a/Graphics/drawables/originals/ic_launcher/kgpg_key2_kopete.svgz b/Graphics/drawables/originals/ic_launcher-old/kgpg_key2_kopete.svgz
similarity index 100%
rename from Graphics/drawables/originals/ic_launcher/kgpg_key2_kopete.svgz
rename to Graphics/drawables/originals/ic_launcher-old/kgpg_key2_kopete.svgz
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_black_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_black_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_black_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_black_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_black_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_grey600_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_grey600_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_grey600_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_grey600_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_grey600_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_white_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_white_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_white_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-hdpi/ic_qrcode_white_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-hdpi/ic_qrcode_white_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_black_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_black_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_black_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_black_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_black_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_grey600_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_grey600_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_grey600_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_grey600_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_grey600_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_white_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_white_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_white_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-mdpi/ic_qrcode_white_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-mdpi/ic_qrcode_white_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_black_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_black_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_black_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_black_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_black_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_grey600_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_grey600_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_grey600_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_grey600_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_grey600_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_white_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_white_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_white_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xhdpi/ic_qrcode_white_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xhdpi/ic_qrcode_white_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_black_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_black_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_black_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_black_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_black_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_grey600_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_grey600_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_grey600_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_grey600_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_grey600_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_white_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_white_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_white_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxhdpi/ic_qrcode_white_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxhdpi/ic_qrcode_white_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_black_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_black_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_black_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_black_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_black_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_black_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_black_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_black_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_black_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_grey600_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_white_18dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_18dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_white_18dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_18dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_white_24dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_24dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_white_24dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_24dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_white_36dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_36dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_white_36dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_36dp.png
diff --git a/Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_white_48dp.png b/Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_48dp.png
similarity index 100%
rename from Graphics/drawables/qrcode/drawable-xxxhdpi/ic_qrcode_white_48dp.png
rename to Graphics/drawables/originals/qrcode/drawable-xxxhdpi/ic_qrcode_white_48dp.png
diff --git a/Graphics/drawables/qrcode/drawable/qrcode.xml b/Graphics/drawables/originals/qrcode/drawable/qrcode.xml
similarity index 100%
rename from Graphics/drawables/qrcode/drawable/qrcode.xml
rename to Graphics/drawables/originals/qrcode/drawable/qrcode.xml
diff --git a/Graphics/drawables/qrcode/readme.txt b/Graphics/drawables/originals/qrcode/readme.txt
similarity index 100%
rename from Graphics/drawables/qrcode/readme.txt
rename to Graphics/drawables/originals/qrcode/readme.txt
diff --git a/OpenKeychain/src/main/res/drawable/drawer_header.png b/OpenKeychain/src/main/res/drawable/drawer_header.png
index 927d818e6..c8fdccf8d 100644
Binary files a/OpenKeychain/src/main/res/drawable/drawer_header.png and b/OpenKeychain/src/main/res/drawable/drawer_header.png differ
diff --git a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml
index 021226ba3..86465db98 100644
--- a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml
+++ b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml
@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:background="@color/colorPrimary">
+ android:background="@color/primary">
@@ -77,8 +77,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_cloud_search_24px"
- fab:fab_colorNormal="@color/fab"
- fab:fab_colorPressed="@color/fab_pressed"
+ fab:fab_colorNormal="@color/primary"
+ fab:fab_colorPressed="@color/primary_dark"
fab:fab_title="Search Cloud"
fab:fab_size="mini" />
@@ -87,8 +87,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
fab:fab_icon="@drawable/ic_folder_white_24dp"
- fab:fab_colorNormal="@color/fab"
- fab:fab_colorPressed="@color/fab_pressed"
+ fab:fab_colorNormal="@color/primary"
+ fab:fab_colorPressed="@color/primary_dark"
fab:fab_title="Import from File"
fab:fab_size="mini" />
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 4bce321ec..006b9b9b5 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -1,27 +1,21 @@
-
-
+
-
+
+
+ #7bad45
+
+ #6c983d
+
+ #2196F3
- @color/material_deep_teal_200
- @color/material_deep_teal_500
-
- #80000000
+
-
- #8bc34a
- #558b2f
-
-
- #8bc34a
- #558b2f
#C8E6C9
- #00BCD4
- #00BCD4
- #0097A7
+ #2196F3
+ #1976D2
#212121
#727272
#FFFFFF
@@ -39,26 +33,26 @@
#33CCCCCC
-
+
#B2000000
#e5e5e5
#808080
#fafafa
#f1f1f1
- #e91e63
- #ec407a
#f44336
#b71c1c
#ff9800
#e65100
- #4caf50
- #1b5e20
+ @color/primary
+ @color/primary_dark
#673ab7
#311b92
diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml
index 885d5e682..147bd8d4c 100644
--- a/OpenKeychain/src/main/res/values/themes.xml
+++ b/OpenKeychain/src/main/res/values/themes.xml
@@ -5,8 +5,8 @@