Dark theme, theme switch, icons, style, strings

added some white icons, changed hardcoded icons to theme attributes, changed icon_edit_dark to icon_edit_body to reflect icons position, grey message bubbles in dark theme, misc purged ic_action_chat as it wasn't used preference use_white_background changed to use_green_background, default true grey chat bubbles darker, text white replaced all grey600 with black icons and 0.54 alpha attribute highlightColor in dark grey chat bubble now darker than background
author: Steffen Keiper <github@crystal-mett.de> 2016-05-12 20:00:18 +0200
committer: Daniel Gultsch <daniel@gultsch.de> 2016-06-08 20:07:40 +0200
commit: 7932244c51e7c5e6e5775d282e91ec223fe2a9bf (patch)
tree: d268d139d9de4dd24a29c19eabf3b7b9b6aea553
parent: b88128241eb7deb6599e946dc009fdc5dfd32974 (diff)
324 files changed, 1462 insertions, 237 deletions
diff --git a/art/ic_notifications_none_white80.svg b/art/ic_notifications_none_white80.svg
new file mode 100644
index 00000000..d333130f
--- /dev/null
+++ b/art/ic_notifications_none_white80.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ic_notifications_none_white80.svg">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1543"
+     inkscape:window-height="1093"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.9 2 2 2zm6-6v-5c0-3.07-1.63-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.64 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2zm-2 1H8v-6c0-2.48 1.51-4.5 4-4.5s4 2.02 4 4.5v6z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1;opacity:0.8" />
+</svg>
diff --git a/art/ic_notifications_off_white80.svg b/art/ic_notifications_off_white80.svg
new file mode 100644
index 00000000..f0af47b6
--- /dev/null
+++ b/art/ic_notifications_off_white80.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ic_notifications_off_white80.svg">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1244"
+     inkscape:window-height="936"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M20 18.69L7.84 6.14 5.27 3.49 4 4.76l2.8 2.8v.01c-.52.99-.8 2.16-.8 3.42v5l-2 2v1h13.73l2 2L21 19.72l-1-1.03zM12 22c1.11 0 2-.89 2-2h-4c0 1.11.89 2 2 2zm6-7.32V11c0-3.08-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68c-.15.03-.29.08-.42.12-.1.03-.2.07-.3.11h-.01c-.01 0-.01 0-.02.01-.23.09-.46.2-.68.31 0 0-.01 0-.01.01L18 14.68z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1;opacity:0.8" />
+</svg>
diff --git a/art/ic_notifications_paused_white80.svg b/art/ic_notifications_paused_white80.svg
new file mode 100644
index 00000000..4f92e847
--- /dev/null
+++ b/art/ic_notifications_paused_white80.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ic_notifications_paused_white80.svg">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1375"
+     inkscape:window-height="999"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.89 2 2 2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.93 6 11v5l-2 2v1h16v-1l-2-2zm-3.5-6.2l-2.8 3.4h2.8V15h-5v-1.8l2.8-3.4H9.5V8h5v1.8z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1;opacity:0.8" />
+</svg>
diff --git a/art/ic_notifications_white80.svg b/art/ic_notifications_white80.svg
new file mode 100644
index 00000000..398e5138
--- /dev/null
+++ b/art/ic_notifications_white80.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg32"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ic_notifications_white80.svg">
+  <metadata
+     id="metadata40">
+    <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="defs38" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1471"
+     inkscape:window-height="985"
+     id="namedview36"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg32" />
+  <path
+     d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.89 2 2 2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2z"
+     id="path34"
+     style="fill:#ffffff;fill-opacity:1;opacity:0.8" />
+</svg>
diff --git a/art/ic_send_cancel_offline_white.svg b/art/ic_send_cancel_offline_white.svg
new file mode 100644
index 00000000..f84f62f5
--- /dev/null
+++ b/art/ic_send_cancel_offline_white.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ic_send_cancel_offline_white.svg">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1080"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-36.305085"
+     inkscape:cy="23.898305"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm10 27.17L31.17 34 24 26.83 16.83 34 14 31.17 21.17 24 14 16.83 16.83 14 24 21.17 31.17 14 34 16.83 26.83 24 34 31.17z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:0.627451" />
+</svg>
diff --git a/art/ic_send_location_offline_white.svg b/art/ic_send_location_offline_white.svg
new file mode 100644
index 00000000..f7f60a8f
--- /dev/null
+++ b/art/ic_send_location_offline_white.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ic_send_location_offline_white.svg">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="956"
+     inkscape:window-height="1056"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-36.305085"
+     inkscape:cy="23.898305"
+     inkscape:window-x="2880"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M24 4c-7.73 0-14 6.27-14 14 0 10.5 14 26 14 26s14-15.5 14-26c0-7.73-6.27-14-14-14zm0 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:0.627451" />
+</svg>
diff --git a/art/ic_send_photo_offline_white.svg b/art/ic_send_photo_offline_white.svg
new file mode 100644
index 00000000..45875731
--- /dev/null
+++ b/art/ic_send_photo_offline_white.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ic_send_photo_offline_white.svg">
+  <metadata
+     id="metadata12">
+    <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="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="956"
+     inkscape:window-height="567"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="10.5688"
+     inkscape:cy="23.898305"
+     inkscape:window-x="960"
+     inkscape:window-y="609"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <circle
+     cx="24"
+     cy="24"
+     r="6.4"
+     id="circle4"
+     style="fill:#ffffff;fill-opacity:0.627451" />
+  <path
+     d="M18 4l-3.66 4H8c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4V12c0-2.21-1.79-4-4-4h-6.34L30 4H18zm6 30c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10z"
+     id="path6"
+     style="fill:#ffffff;fill-opacity:0.627451" />
+</svg>
diff --git a/art/ic_send_picture_offline_white.svg b/art/ic_send_picture_offline_white.svg
new file mode 100644
index 00000000..16131740
--- /dev/null
+++ b/art/ic_send_picture_offline_white.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ic_send_picture_offline_white.svg">
+  <metadata
+     id="metadata10">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1392"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-21.864407"
+     inkscape:cy="23.898305"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M42 38V10c0-2.21-1.79-4-4-4H10c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4zM17 27l5 6.01L29 24l9 12H10l7-9z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:0.627451" />
+</svg>
diff --git a/art/ic_send_text_offline_white.svg b/art/ic_send_text_offline_white.svg
new file mode 100644
index 00000000..4434d33d
--- /dev/null
+++ b/art/ic_send_text_offline_white.svg
@@ -0,0 +1,70 @@
+<?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"
+   id="svg3621"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="96"
+   height="96"
+   sodipodi:docname="ic_send_text_offline_white.svg"
+   inkscape:export-filename="/home/daniel/workspace/Conversations/res/drawable-xxhdpi/ic_action_send_now_online.png"
+   inkscape:export-xdpi="154.28572"
+   inkscape:export-ydpi="154.28572">
+  <metadata
+     id="metadata3627">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3625" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1344"
+     inkscape:window-height="1056"
+     id="namedview3623"
+     showgrid="true"
+     showguides="true"
+     inkscape:zoom="8"
+     inkscape:cx="31.783303"
+     inkscape:cy="56.698828"
+     inkscape:window-x="2880"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3621"
+     inkscape:snap-others="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3631" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#ffffff;fill-opacity:0.627451;stroke:none"
+     d="M 3.887575,4.1549246 90.999747,47.676331 3.887575,91.286663 13.203552,52.344101 63.012683,47.720794 13.203552,43.008558 Z"
+     id="path3633"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc"
+     inkscape:export-filename="/home/daniel/workspace/Conversations/res/drawable-mdpi/ic_action_send_now_dnd.png"
+     inkscape:export-xdpi="51.42857"
+     inkscape:export-ydpi="51.42857" />
+</svg>
diff --git a/art/ic_send_voice_offline_white.svg b/art/ic_send_voice_offline_white.svg
new file mode 100644
index 00000000..25ffe322
--- /dev/null
+++ b/art/ic_send_voice_offline_white.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ic_send_voice_offline_white.svg">
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1516"
+     inkscape:window-height="1056"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-36.711864"
+     inkscape:cy="24"
+     inkscape:window-x="2880"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M24 30c3.31 0 5.98-2.69 5.98-6L30 12c0-3.32-2.68-6-6-6-3.31 0-6 2.68-6 6v12c0 3.31 2.69 6 6 6zm10.6-6c0 6-5.07 10.2-10.6 10.2-5.52 0-10.6-4.2-10.6-10.2H10c0 6.83 5.44 12.47 12 13.44V44h4v-6.56c6.56-.97 12-6.61 12-13.44h-3.4z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:0.627451" />
+</svg>
diff --git a/art/message_bubble_received_grey.svg b/art/message_bubble_received_grey.svg
new file mode 100644
index 00000000..e1d8347f
--- /dev/null
+++ b/art/message_bubble_received_grey.svg
@@ -0,0 +1,167 @@
+<?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="36"
+   height="26"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="message_bubble_received_grey.svg">
+  <defs
+     id="defs4">
+    <filter
+       x="-0.25"
+       y="-0.25"
+       width="1.5"
+       height="1.5"
+       inkscape:label="Drop Shadow"
+       id="filter3811"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood3813" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite3815" />
+      <feGaussianBlur
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur3817" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset3819" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite3821" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-9.879743"
+     inkscape:cy="9.618802"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer"
+     showgrid="true"
+     inkscape:window-width="2135"
+     inkscape:window-height="911"
+     inkscape:window-x="22"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     guidecolor="#000000"
+     guideopacity="0.49803922">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       originx="0px"
+       originy="0px"
+       color="#0000ff"
+       opacity="0.03137255" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="20,26"
+       id="guide3060" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="24,26"
+       id="guide3062" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="36,22"
+       id="guide3064" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="36,6"
+       id="guide3066" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="26,0"
+       id="guide3068" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="18,0"
+       id="guide3070" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="0,10"
+       id="guide3074" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="0,8"
+       id="guide3076" />
+  </sodipodi:namedview>
+  <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer"
+     inkscape:groupmode="layer"
+     id="layer"
+     transform="translate(0,-2)">
+    <g
+       id="g3759"
+       style="fill:#424242;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+      <path
+         style="display:none;fill:#424242;fill-opacity:1"
+         d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"
+         id="path3805"
+         inkscape:connector-curvature="0"
+         transform="translate(0,2)"
+         sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2989"
+         d="M 4,4 16,16 16,4 z"
+         sodipodi:nodetypes="cccc"
+         style="fill:#424242;fill-opacity:1" />
+      <rect
+         ry="2"
+         y="4"
+         x="12"
+         height="20"
+         width="20"
+         id="rect2987"
+         style="fill:#424242;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/art/message_bubble_sent_grey.svg b/art/message_bubble_sent_grey.svg
new file mode 100644
index 00000000..23e13d66
--- /dev/null
+++ b/art/message_bubble_sent_grey.svg
@@ -0,0 +1,167 @@
+<?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="36"
+   height="26"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="message_bubble_sent_grey.svg">
+  <defs
+     id="defs4">
+    <filter
+       x="-0.25"
+       y="-0.25"
+       width="1.5"
+       height="1.5"
+       inkscape:label="Drop Shadow"
+       id="filter3811"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood3813" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite3815" />
+      <feGaussianBlur
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur3817" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset3819" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite3821" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="6.244862"
+     inkscape:cy="16.118802"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer"
+     showgrid="true"
+     inkscape:window-width="1554"
+     inkscape:window-height="900"
+     inkscape:window-x="878"
+     inkscape:window-y="369"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     guidecolor="#404040"
+     guideopacity="0.49803922">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       originx="0px"
+       originy="0px"
+       color="#0000ff"
+       opacity="0.03137255" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="12,26"
+       id="guide3146" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,26"
+       id="guide3148" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="36,22"
+       id="guide3150" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="36,6"
+       id="guide3152" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="18,0"
+       id="guide3154" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="10,0"
+       id="guide3160" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="0,20"
+       id="guide3162" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="0,18"
+       id="guide3164" />
+  </sodipodi:namedview>
+  <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer"
+     inkscape:groupmode="layer"
+     id="layer"
+     transform="translate(0,-2)">
+    <g
+       id="g3759"
+       style="fill:#424242;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+      <path
+         style="display:none;fill:#424242;fill-opacity:1"
+         d="M 28,18 C 26,16 24,12 24,8 l -4,10 z"
+         id="path3809"
+         inkscape:connector-curvature="0"
+         transform="translate(0,2)"
+         sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2989"
+         d="m 20,12 0,12 12,0 z"
+         sodipodi:nodetypes="cccc"
+         style="fill:#424242;fill-opacity:1" />
+      <rect
+         ry="2"
+         y="4"
+         x="4"
+         height="20"
+         width="20"
+         id="rect2987"
+         style="fill:#424242;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/art/render.rb b/art/render.rb
index 06100c5a..9f309649 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -12,42 +12,54 @@ resolutions = {
 
 images = {
 	'conversations_baloon.svg' => ['ic_launcher', 48],
-   'conversations_baloon.svg' => ['main_logo', 200],
+    'conversations_baloon.svg' => ['main_logo', 200],
 	'conversations_mono.svg' => ['ic_notification', 24],
 	'ic_received_indicator.svg' => ['ic_received_indicator', 12],
 	'ic_send_text_offline.svg' => ['ic_send_text_offline', 36],
+	'ic_send_text_offline_white.svg' => ['ic_send_text_offline_white', 36],
 	'ic_send_text_online.svg' => ['ic_send_text_online', 36],
 	'ic_send_text_away.svg' => ['ic_send_text_away', 36],
 	'ic_send_text_dnd.svg' => ['ic_send_text_dnd', 36],
 	'ic_send_photo_online.svg' => ['ic_send_photo_online', 36],
 	'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36],
+	'ic_send_photo_offline_white.svg' => ['ic_send_photo_offline_white', 36],
 	'ic_send_photo_away.svg' => ['ic_send_photo_away', 36],
 	'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36],
 	'ic_send_location_online.svg' => ['ic_send_location_online', 36],
 	'ic_send_location_offline.svg' => ['ic_send_location_offline', 36],
+	'ic_send_location_offline_white.svg' => ['ic_send_location_offline_white', 36],
 	'ic_send_location_away.svg' => ['ic_send_location_away', 36],
 	'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36],
 	'ic_send_voice_online.svg' => ['ic_send_voice_online', 36],
 	'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36],
+	'ic_send_voice_offline_white.svg' => ['ic_send_voice_offline_white', 36],
 	'ic_send_voice_away.svg' => ['ic_send_voice_away', 36],
 	'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36],
 	'ic_send_cancel_online.svg' => ['ic_send_cancel_online', 36],
 	'ic_send_cancel_offline.svg' => ['ic_send_cancel_offline', 36],
+	'ic_send_cancel_offline_white.svg' => ['ic_send_cancel_offline_white', 36],
 	'ic_send_cancel_away.svg' => ['ic_send_cancel_away', 36],
 	'ic_send_cancel_dnd.svg' => ['ic_send_cancel_dnd', 36],
 	'ic_send_picture_online.svg' => ['ic_send_picture_online', 36],
 	'ic_send_picture_offline.svg' => ['ic_send_picture_offline', 36],
+	'ic_send_picture_offline_white.svg' => ['ic_send_picture_offline_white', 36],
 	'ic_send_picture_away.svg' => ['ic_send_picture_away', 36],
 	'ic_send_picture_dnd.svg' => ['ic_send_picture_dnd', 36],
+	'ic_notifications_none_white80.svg' => ['ic_notifications_none_white80', 24],
+	'ic_notifications_off_white80.svg' => ['ic_notifications_off_white80', 24],
+	'ic_notifications_paused_white80.svg' => ['ic_notifications_paused_white80', 24],
+	'ic_notifications_white80.svg' => ['ic_notifications_white80', 24],
 	'md_switch_thumb_disable.svg' => ['switch_thumb_disable', 48],
 	'md_switch_thumb_off_normal.svg' => ['switch_thumb_off_normal', 48],
 	'md_switch_thumb_off_pressed.svg' => ['switch_thumb_off_pressed', 48],
 	'md_switch_thumb_on_normal.svg' => ['switch_thumb_on_normal', 48],
 	'md_switch_thumb_on_pressed.svg' => ['switch_thumb_on_pressed', 48],
 	'message_bubble_received.svg' => ['message_bubble_received.9', 0],
+	'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0],
 	'message_bubble_received_warning.svg' => ['message_bubble_received_warning.9', 0],
 	'message_bubble_received_white.svg' => ['message_bubble_received_white.9', 0],
 	'message_bubble_sent.svg' => ['message_bubble_sent.9', 0],
+	'message_bubble_sent_grey.svg' => ['message_bubble_sent_grey.9', 0],
 	}
 
 # Executable paths for Mac OSX
diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
index a61b872a..5d51e8b9 100644
--- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
@@ -1,7 +1,9 @@
 package eu.siacs.conversations.ui;
 
 import android.app.Activity;
+import android.content.res.Resources;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 
 import eu.siacs.conversations.R;
 
@@ -10,6 +12,12 @@ public class AboutActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        Boolean dark = PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
+                        .getString("theme", "light").equals("dark");
+        int mTheme = dark ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
+        setTheme(mTheme);
+
         setContentView(R.layout.activity_about);
     }
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index a82f8245..a39f735e 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -559,18 +559,23 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			}
 		}
 
+		int ic_notifications = 		  getThemeResource(R.attr.icon_notifications, R.drawable.ic_notifications_black54_24dp);
+		int ic_notifications_off = 	  getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black54_24dp);
+		int ic_notifications_paused = getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black54_24dp);
+		int ic_notifications_none =	  getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black54_24dp);
+
 		long mutedTill = mConversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
 		if (mutedTill == Long.MAX_VALUE) {
 			mNotifyStatusText.setText(R.string.notify_never);
-			mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_off_grey600_24dp);
+			mNotifyStatusButton.setImageResource(ic_notifications_off);
 		} else if (System.currentTimeMillis() < mutedTill) {
 			mNotifyStatusText.setText(R.string.notify_paused);
-			mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_paused_grey600_24dp);
+			mNotifyStatusButton.setImageResource(ic_notifications_paused);
 		} else if (mConversation.alwaysNotify()) {
-			mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_grey600_24dp);
+			mNotifyStatusButton.setImageResource(ic_notifications);
 			mNotifyStatusText.setText(R.string.notify_on_all_messages);
 		} else {
-			mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_none_grey600_24dp);
+			mNotifyStatusButton.setImageResource(ic_notifications_none);
 			mNotifyStatusText.setText(R.string.notify_only_when_highlighted);
 		}
 
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 2717aa3d..b0974713 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1569,8 +1569,8 @@ public class ConversationActivity extends XmppActivity
 		return getPreferences().getBoolean("indicate_received", false);
 	}
 
-	public boolean useWhiteBackground() {
-		return getPreferences().getBoolean("use_white_background",false);
+	public boolean useGreenBackground() {
+		return getPreferences().getBoolean("use_green_background",true);
 	}
 
 	protected boolean trustKeysIfNeeded(int requestCode) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 8e0b30a8..53a36525 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentSender.SendIntentException;
+import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.Nullable;
@@ -998,7 +999,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					case DND:
 						return R.drawable.ic_send_text_dnd;
 					default:
-						return R.drawable.ic_send_text_offline;
+						return activity.getThemeResource(R.attr.ic_send_text_offline, R.drawable.ic_send_text_offline);
 				}
 			case TAKE_PHOTO:
 				switch (status) {
@@ -1011,7 +1012,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					case DND:
 						return R.drawable.ic_send_photo_dnd;
 					default:
-						return R.drawable.ic_send_photo_offline;
+						return activity.getThemeResource(R.attr.ic_send_photo_offline, R.drawable.ic_send_photo_offline);
 				}
 			case RECORD_VOICE:
 				switch (status) {
@@ -1024,7 +1025,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					case DND:
 						return R.drawable.ic_send_voice_dnd;
 					default:
-						return R.drawable.ic_send_voice_offline;
+						return activity.getThemeResource(R.attr.ic_send_voice_offline, R.drawable.ic_send_voice_offline);
 				}
 			case SEND_LOCATION:
 				switch (status) {
@@ -1037,7 +1038,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					case DND:
 						return R.drawable.ic_send_location_dnd;
 					default:
-						return R.drawable.ic_send_location_offline;
+						return activity.getThemeResource(R.attr.ic_send_location_offline, R.drawable.ic_send_location_offline);
 				}
 			case CANCEL:
 				switch (status) {
@@ -1050,7 +1051,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					case DND:
 						return R.drawable.ic_send_cancel_dnd;
 					default:
-						return R.drawable.ic_send_cancel_offline;
+						return activity.getThemeResource(R.attr.ic_send_cancel_offline, R.drawable.ic_send_cancel_offline);
 				}
 			case CHOOSE_PICTURE:
 				switch (status) {
@@ -1063,10 +1064,10 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					case DND:
 						return R.drawable.ic_send_picture_dnd;
 					default:
-						return R.drawable.ic_send_picture_offline;
+						return activity.getThemeResource(R.attr.ic_send_picture_offline, R.drawable.ic_send_picture_offline);
 				}
 		}
-		return R.drawable.ic_send_text_offline;
+		return activity.getThemeResource(R.attr.ic_send_text_offline, R.drawable.ic_send_text_offline);
 	}
 
 	public void updateSendButton() {
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 22e12633..17ade702 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -14,7 +14,6 @@ import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
-import android.util.Log;
 import android.widget.Toast;
 
 import java.security.KeyStoreException;
@@ -46,6 +45,13 @@ public class SettingsActivity extends XmppActivity implements
 			mSettingsFragment = new SettingsFragment();
 			fm.beginTransaction().replace(android.R.id.content, mSettingsFragment).commit();
 		}
+
+		this.mTheme = findTheme();
+		setTheme(this.mTheme);
+
+		int bgcolor = getPrimaryBackgroundColor();
+		getWindow().getDecorView().setBackgroundColor(bgcolor);
+
 	}
 
 	@Override
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index c6301643..2d908ff8 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -21,6 +21,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
@@ -379,6 +380,7 @@ public abstract class XmppActivity extends Activity {
 		super.onCreate(savedInstanceState);
 		metrics = getResources().getDisplayMetrics();
 		ExceptionHelper.init(getApplicationContext());
+
 		mPrimaryTextColor = getResources().getColor(R.color.black87);
 		mSecondaryTextColor = getResources().getColor(R.color.black54);
 		mTertiaryTextColor = getResources().getColor(R.color.black12);
@@ -388,8 +390,18 @@ public abstract class XmppActivity extends Activity {
 		mPrimaryColor = getResources().getColor(R.color.primary);
 		mPrimaryBackgroundColor = getResources().getColor(R.color.grey50);
 		mSecondaryBackgroundColor = getResources().getColor(R.color.grey200);
+
+		if(isDarkTheme()) {
+			mPrimaryTextColor = getResources().getColor(R.color.white);
+			mSecondaryTextColor = getResources().getColor(R.color.white70);
+			mTertiaryTextColor = getResources().getColor(R.color.white12);
+			mPrimaryBackgroundColor = getResources().getColor(R.color.grey800);
+			mSecondaryBackgroundColor = getResources().getColor(R.color.grey900);
+		}
+
 		this.mTheme = findTheme();
 		setTheme(this.mTheme);
+
 		this.mUsingEnterKey = usingEnterKey();
 		mUseSubject = getPreferences().getBoolean("use_subject", true);
 		final ActionBar ab = getActionBar();
@@ -398,6 +410,20 @@ public abstract class XmppActivity extends Activity {
 		}
 	}
 
+	public boolean isDarkTheme() {
+		return getPreferences().getString("theme", "light").equals("dark");
+	}
+
+	public int getThemeResource(int r_attr_name, int r_drawable_def) {
+		int[] attrs = {	r_attr_name };
+		TypedArray ta = this.getTheme().obtainStyledAttributes(attrs);
+
+		int res = ta.getResourceId(0, r_drawable_def);
+		ta.recycle();
+
+		return res;
+	}
+
 	protected boolean isOptimizingBattery() {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
@@ -1077,10 +1103,19 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected int findTheme() {
-		if (getPreferences().getBoolean("use_larger_font", false)) {
-			return R.style.ConversationsTheme_LargerText;
+		Boolean dark   = getPreferences().getString("theme", "light").equals("dark");
+		Boolean larger = getPreferences().getBoolean("use_larger_font", false);
+
+		if(dark) {
+			if(larger)
+				return R.style.ConversationsTheme_Dark_LargerText;
+			else
+				return R.style.ConversationsTheme_Dark;
 		} else {
-			return R.style.ConversationsTheme;
+			if (larger)
+				return R.style.ConversationsTheme_LargerText;
+			else
+				return R.style.ConversationsTheme;
 		}
 	}
 
@@ -1098,6 +1133,7 @@ public abstract class XmppActivity extends Activity {
 			final int width = (size.x < size.y ? size.x : size.y);
 			Bitmap bitmap = createQrCodeBitmap(uri, width);
 			ImageView view = new ImageView(this);
+			view.setBackgroundColor(Color.WHITE);
 			view.setImageBitmap(bitmap);
 			AlertDialog.Builder builder = new AlertDialog.Builder(this);
 			builder.setView(view);
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 34c9d7b3..4576dea3 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -98,15 +98,18 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		long muted_till = conversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
 		if (muted_till == Long.MAX_VALUE) {
 			notificationStatus.setVisibility(View.VISIBLE);
-			notificationStatus.setImageResource(R.drawable.ic_notifications_off_grey600_24dp);
+			int ic_notifications_off = 	  activity.getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black54_24dp);
+			notificationStatus.setImageResource(ic_notifications_off);
 		} else if (muted_till >= System.currentTimeMillis()) {
 			notificationStatus.setVisibility(View.VISIBLE);
-			notificationStatus.setImageResource(R.drawable.ic_notifications_paused_grey600_24dp);
+			int ic_notifications_paused = activity.getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black54_24dp);
+			notificationStatus.setImageResource(ic_notifications_paused);
 		} else if (conversation.alwaysNotify()) {
 			notificationStatus.setVisibility(View.GONE);
 		} else {
 			notificationStatus.setVisibility(View.VISIBLE);
-			notificationStatus.setImageResource(R.drawable.ic_notifications_none_grey600_24dp);
+			int ic_notifications_none =	  activity.getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black54_24dp);
+			notificationStatus.setImageResource(ic_notifications_none);
 		}
 
 		mTimestamp.setText(UIHelper.readableTimeDifference(activity,conversation.getLatestMessage().getTimeSent()));
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 5ba29802..1ea2c223 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -80,7 +80,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		}
 	};
 	private boolean mIndicateReceived = false;
-	private boolean mUseWhiteBackground = false;
+	private boolean mUseGreenBackground = false;
 
 	public MessageAdapter(ConversationActivity activity, List<Message> messages) {
 		super(activity, 0, messages);
@@ -294,7 +294,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.messageBody.setText(span);
 	}
 
-	private void displayTextMessage(final ViewHolder viewHolder, final Message message, boolean darkBackground) {
+	private void displayTextMessage(final ViewHolder viewHolder, final Message message, boolean darkBackground, int type) {
 		if (viewHolder.download_button != null) {
 			viewHolder.download_button.setVisibility(View.GONE);
 		}
@@ -388,7 +388,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		}
 		viewHolder.messageBody.setTextColor(this.getMessageTextColor(darkBackground, true));
 		viewHolder.messageBody.setLinkTextColor(this.getMessageTextColor(darkBackground, true));
-		viewHolder.messageBody.setHighlightColor(activity.getResources().getColor(darkBackground ? R.color.grey800 : R.color.grey500));
+		viewHolder.messageBody.setHighlightColor(activity.getResources().getColor(darkBackground ? (type == SENT || !mUseGreenBackground ? R.color.black26 : R.color.grey800) : R.color.grey500));
 		viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
 		viewHolder.messageBody.setOnLongClickListener(openContextMenu);
 	}
@@ -556,7 +556,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			}
 		}
 
-		boolean darkBackground = (type == RECEIVED && (!isInValidSession || !mUseWhiteBackground));
+		boolean darkBackground = type == RECEIVED && (!isInValidSession || mUseGreenBackground) || activity.isDarkTheme();
 
 		if (type == STATUS) {
 			if ("LOAD_MORE".equals(message.getBody())) {
@@ -672,14 +672,15 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 									UIHelper.getFileDescriptionString(activity, message)));
 				}
 			} else {
-				displayTextMessage(viewHolder, message, darkBackground);
+				displayTextMessage(viewHolder, message, darkBackground, type);
 			}
 		}
 
 		if (type == RECEIVED) {
 			if(isInValidSession) {
-				if (mUseWhiteBackground) {
-					viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_white);
+				if (!mUseGreenBackground) {
+					int bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white);
+					viewHolder.message_box.setBackgroundResource(bubble);
 				} else {
 					viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received);
 				}
@@ -734,7 +735,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
 	public void updatePreferences() {
 		this.mIndicateReceived = activity.indicateReceived();
-		this.mUseWhiteBackground = activity.useWhiteBackground();
+		this.mUseGreenBackground = activity.useGreenBackground();
 	}
 
 	public interface OnContactPictureClicked {
diff --git a/src/main/res/drawable-hdpi/ic_action_chat.png b/src/main/res/drawable-hdpi/ic_action_chat.png
deleted file mode 100644
index 0847ac46..00000000
--- a/src/main/res/drawable-hdpi/ic_action_chat.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_action_copy_white.png b/src/main/res/drawable-hdpi/ic_action_copy_white.png
new file mode 100644
index 00000000..f97df1d5
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_copy_white.png
diff --git a/src/main/res/drawable-hdpi/ic_action_refresh_white.png b/src/main/res/drawable-hdpi/ic_action_refresh_white.png
new file mode 100644
index 00000000..dae27903
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_refresh_white.png
diff --git a/src/main/res/drawable-hdpi/ic_action_remove_white.png b/src/main/res/drawable-hdpi/ic_action_remove_white.png
new file mode 100644
index 00000000..e206f296
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_remove_white.png
diff --git a/src/main/res/drawable-hdpi/ic_action_settings_white.png b/src/main/res/drawable-hdpi/ic_action_settings_white.png
new file mode 100644
index 00000000..54eecded
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_settings_white.png
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 00000000..9a9e5706
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 5592d5c8..00000000
--- a/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 00000000..70eb0737
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_delete_black_24dp.png b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png
new file mode 100644
index 00000000..dbbb602a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index b72a9f3c..00000000
--- a/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_edit_black_24dp.png b/src/main/res/drawable-hdpi/ic_edit_black_24dp.png
new file mode 100644
index 00000000..b900af02
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_edit_black_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index b5f88c80..00000000
--- a/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 00000000..d0e987e8
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
new file mode 100644
index 00000000..12969c50
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index 96b329c4..00000000
--- a/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 00000000..6ea331d1
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 00000000..32470b8b
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_none_black_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index 6cd4dfc9..00000000
--- a/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_white80.png b/src/main/res/drawable-hdpi/ic_notifications_none_white80.png
new file mode 100644
index 00000000..258dad41
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_none_white80.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 00000000..b998c8c4
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_none_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 00000000..98c28297
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 00000000..06cfa750
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_off_black_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index 09ebc5d2..00000000
--- a/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_white80.png b/src/main/res/drawable-hdpi/ic_notifications_off_white80.png
new file mode 100644
index 00000000..62bd41c6
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_off_white80.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 00000000..d2b23cf7
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_off_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 00000000..3366fc69
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 00000000..a6cf0b15
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_paused_black_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index e92d43ac..00000000
--- a/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-hdpi/ic_notifications_paused_white80.png
new file mode 100644
index 00000000..396a9247
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_paused_white80.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 00000000..9210e39a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_paused_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_white80.png b/src/main/res/drawable-hdpi/ic_notifications_white80.png
new file mode 100644
index 00000000..9e262175
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_white80.png
diff --git a/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png
new file mode 100644
index 00000000..d792f835
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-hdpi/ic_refresh_black_24dp.png
new file mode 100644
index 00000000..9d94c39c
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_refresh_black_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index 51cc4dbd..00000000
--- a/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
new file mode 100644
index 00000000..ffa7be93
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_cancel_offline_dark.png
new file mode 100644
index 00000000..7eedbb6f
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_cancel_offline_dark.png
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 00000000..d5af1d00
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png
diff --git a/src/main/res/drawable-hdpi/ic_send_location_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_location_offline_dark.png
new file mode 100644
index 00000000..301aac16
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_location_offline_dark.png
diff --git a/src/main/res/drawable-hdpi/ic_send_location_offline_white.png b/src/main/res/drawable-hdpi/ic_send_location_offline_white.png
new file mode 100644
index 00000000..c6f60c2f
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_location_offline_white.png
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_photo_offline_dark.png
new file mode 100644
index 00000000..e90564f1
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_photo_offline_dark.png
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png
new file mode 100644
index 00000000..2ef8d36a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_picture_offline_dark.png
new file mode 100644
index 00000000..8d6a0538
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_picture_offline_dark.png
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png
new file mode 100644
index 00000000..611785bc
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png
diff --git a/src/main/res/drawable-hdpi/ic_send_text_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_text_offline_dark.png
new file mode 100644
index 00000000..dcb74bcd
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_text_offline_dark.png
diff --git a/src/main/res/drawable-hdpi/ic_send_text_offline_white.png b/src/main/res/drawable-hdpi/ic_send_text_offline_white.png
new file mode 100644
index 00000000..8d600e35
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_text_offline_white.png
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_voice_offline_dark.png
new file mode 100644
index 00000000..87111a62
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_voice_offline_dark.png
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png
new file mode 100644
index 00000000..73e3bb97
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png
diff --git a/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
new file mode 100644
index 00000000..acf1ddf8
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 20d2b66e..00000000
--- a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..97ded33b
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png
index dfd857cb..9e6c9551 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received.9.png
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png
new file mode 100644
index 00000000..eaa1fd24
--- /dev/null
+++ b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
index fd07bc20..29cf4844 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
index bec20798..45678001 100644
--- a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
index 10dc2e29..627e3a78 100644
--- a/src/main/res/drawable-hdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 00000000..a59c1236
--- /dev/null
+++ b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png
diff --git a/src/main/res/drawable-mdpi/ic_action_chat.png b/src/main/res/drawable-mdpi/ic_action_chat.png
deleted file mode 100644
index 8fdb5d75..00000000
--- a/src/main/res/drawable-mdpi/ic_action_chat.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_action_copy_white.png b/src/main/res/drawable-mdpi/ic_action_copy_white.png
new file mode 100644
index 00000000..d846e72c
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_action_copy_white.png
diff --git a/src/main/res/drawable-mdpi/ic_action_refresh_white.png b/src/main/res/drawable-mdpi/ic_action_refresh_white.png
new file mode 100644
index 00000000..94ab6f4c
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_action_refresh_white.png
diff --git a/src/main/res/drawable-mdpi/ic_action_remove_white.png b/src/main/res/drawable-mdpi/ic_action_remove_white.png
new file mode 100644
index 00000000..70e6d2d2
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_action_remove_white.png
diff --git a/src/main/res/drawable-mdpi/ic_action_settings_white.png b/src/main/res/drawable-mdpi/ic_action_settings_white.png
new file mode 100644
index 00000000..25c36db4
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_action_settings_white.png
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 00000000..c94cc28f
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index bab9b4d6..00000000
--- a/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 00000000..80c06955
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_delete_black_24dp.png b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png
new file mode 100644
index 00000000..999aa4cc
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index e757fdb0..00000000
--- a/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_edit_black_24dp.png b/src/main/res/drawable-mdpi/ic_edit_black_24dp.png
new file mode 100644
index 00000000..9efbaae2
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_edit_black_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index bae3480c..00000000
--- a/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 00000000..91cd0b84
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png
new file mode 100644
index 00000000..32562b0f
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index d6c20c20..00000000
--- a/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 00000000..7c41a445
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 00000000..883efb08
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_none_black_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index 3e8b0805..00000000
--- a/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_white80.png b/src/main/res/drawable-mdpi/ic_notifications_none_white80.png
new file mode 100644
index 00000000..4851fcb1
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_none_white80.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 00000000..45f4704e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_none_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 00000000..c2ee2de2
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 00000000..8838da99
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_off_black_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index af3b6321..00000000
--- a/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_white80.png b/src/main/res/drawable-mdpi/ic_notifications_off_white80.png
new file mode 100644
index 00000000..f15f7873
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_off_white80.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 00000000..3fec9c71
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_off_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 00000000..0c4fc2ef
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 00000000..7c238fd5
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_paused_black_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index 9d6308d2..00000000
--- a/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-mdpi/ic_notifications_paused_white80.png
new file mode 100644
index 00000000..83091bbf
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_paused_white80.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 00000000..8a48f2f7
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_paused_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_white80.png b/src/main/res/drawable-mdpi/ic_notifications_white80.png
new file mode 100644
index 00000000..983aa454
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_white80.png
diff --git a/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png
new file mode 100644
index 00000000..2a5c93c7
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-mdpi/ic_refresh_black_24dp.png
new file mode 100644
index 00000000..c82efd5f
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_refresh_black_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index c136c59f..00000000
--- a/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
new file mode 100644
index 00000000..97e42b52
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_cancel_offline_dark.png
new file mode 100644
index 00000000..fac99623
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_cancel_offline_dark.png
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 00000000..64cdb991
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png
diff --git a/src/main/res/drawable-mdpi/ic_send_location_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_location_offline_dark.png
new file mode 100644
index 00000000..17185ec2
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_location_offline_dark.png
diff --git a/src/main/res/drawable-mdpi/ic_send_location_offline_white.png b/src/main/res/drawable-mdpi/ic_send_location_offline_white.png
new file mode 100644
index 00000000..6a70df28
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_location_offline_white.png
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_photo_offline_dark.png
new file mode 100644
index 00000000..268182ff
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_photo_offline_dark.png
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png
new file mode 100644
index 00000000..69a05186
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_picture_offline_dark.png
new file mode 100644
index 00000000..f153be99
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_picture_offline_dark.png
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png
new file mode 100644
index 00000000..98428b79
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png
diff --git a/src/main/res/drawable-mdpi/ic_send_text_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_text_offline_dark.png
new file mode 100644
index 00000000..5cf508af
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_text_offline_dark.png
diff --git a/src/main/res/drawable-mdpi/ic_send_text_offline_white.png b/src/main/res/drawable-mdpi/ic_send_text_offline_white.png
new file mode 100644
index 00000000..d8220cf9
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_text_offline_white.png
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_voice_offline_dark.png
new file mode 100644
index 00000000..5ae192c4
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_voice_offline_dark.png
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png
new file mode 100644
index 00000000..1d18b812
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png
diff --git a/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
new file mode 100644
index 00000000..c59419c0
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 5a1b41f0..00000000
--- a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..8909c355
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png
index 9835a736..d5efb931 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received.9.png
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png
new file mode 100644
index 00000000..3cc08a8e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
index ff8f80b6..97b49275 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
index d7a3bb5d..73a99dd7 100644
--- a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
index 596699bb..5776b564 100644
--- a/src/main/res/drawable-mdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 00000000..72a11f5e
--- /dev/null
+++ b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_chat.png b/src/main/res/drawable-xhdpi/ic_action_chat.png
deleted file mode 100644
index 8a9a4314..00000000
--- a/src/main/res/drawable-xhdpi/ic_action_chat.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_action_copy_white.png b/src/main/res/drawable-xhdpi/ic_action_copy_white.png
new file mode 100644
index 00000000..a6e1aa29
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_action_copy_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_refresh_white.png b/src/main/res/drawable-xhdpi/ic_action_refresh_white.png
new file mode 100644
index 00000000..ab4ab9da
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_action_refresh_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_remove_white.png b/src/main/res/drawable-xhdpi/ic_action_remove_white.png
new file mode 100644
index 00000000..d1634205
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_action_remove_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_action_settings_white.png b/src/main/res/drawable-xhdpi/ic_action_settings_white.png
new file mode 100644
index 00000000..425a8bc8
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_action_settings_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 00000000..1cf76a96
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 68ccece6..00000000
--- a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 00000000..537fd4e8
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png
new file mode 100644
index 00000000..796ccd22
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index c6bb43e8..00000000
--- a/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png
new file mode 100644
index 00000000..87f8de1c
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 4c95bd57..00000000
--- a/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 00000000..9bc2a6a6
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 00000000..98cbec6e
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index d441dc7c..00000000
--- a/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 00000000..d5586382
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 00000000..ac14eba9
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_none_black_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index 1123cea4..00000000
--- a/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_none_white80.png
new file mode 100644
index 00000000..5585a2ea
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_none_white80.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 00000000..19eba208
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_none_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 00000000..92dbcf14
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 00000000..3d6643bc
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_off_black_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index aef303a0..00000000
--- a/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_off_white80.png
new file mode 100644
index 00000000..ff5246b7
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_off_white80.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 00000000..3e96f6de
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_off_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 00000000..cd0ddaa0
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 00000000..bea6a823
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_paused_black_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index c68bedd3..00000000
--- a/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_white80.png
new file mode 100644
index 00000000..644e0652
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_paused_white80.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 00000000..cf566ec2
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_paused_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_white80.png
new file mode 100644
index 00000000..c3405e98
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_white80.png
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 00000000..9718ccf0
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-xhdpi/ic_refresh_black_24dp.png
new file mode 100644
index 00000000..0b731280
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_refresh_black_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index 7891efff..00000000
--- a/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 00000000..1989184b
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_dark.png
new file mode 100644
index 00000000..f55c282d
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_dark.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 00000000..eb8df879
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_location_offline_dark.png
new file mode 100644
index 00000000..54788f08
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_location_offline_dark.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png
new file mode 100644
index 00000000..951bfdee
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_photo_offline_dark.png
new file mode 100644
index 00000000..ec86ad5e
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_photo_offline_dark.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 00000000..91a6b719
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_picture_offline_dark.png
new file mode 100644
index 00000000..3e687799
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_offline_dark.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 00000000..b5b3d84c
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_text_offline_dark.png
new file mode 100644
index 00000000..b3c91e8a
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_text_offline_dark.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png
new file mode 100644
index 00000000..bbd5d444
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_voice_offline_dark.png
new file mode 100644
index 00000000..f7a454df
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_voice_offline_dark.png
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 00000000..6df97e9b
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png
diff --git a/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
new file mode 100644
index 00000000..e84e188a
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 2251d2bb..00000000
--- a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..5caedc8e
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
index c0eb47eb..732ec2f7 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png
new file mode 100644
index 00000000..66f471ca
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
index fe0324ce..b957f614 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
index fdb6be0d..68b56dbf 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
index cb5654b7..018f642c 100644
--- a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 00000000..a5d0eba0
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_chat.png b/src/main/res/drawable-xxhdpi/ic_action_chat.png
deleted file mode 100644
index 04000fd0..00000000
--- a/src/main/res/drawable-xxhdpi/ic_action_chat.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_action_copy_white.png b/src/main/res/drawable-xxhdpi/ic_action_copy_white.png
new file mode 100644
index 00000000..a381cdc3
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_copy_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png b/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png
new file mode 100644
index 00000000..44ee117e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_remove_white.png b/src/main/res/drawable-xxhdpi/ic_action_remove_white.png
new file mode 100644
index 00000000..5dc21435
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_remove_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings_white.png b/src/main/res/drawable-xxhdpi/ic_action_settings_white.png
new file mode 100644
index 00000000..fe5fec47
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_settings_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 00000000..074ea880
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 2fdbbea1..00000000
--- a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 00000000..9dff893e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png
new file mode 100644
index 00000000..6d7cb81c
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index 4886ab1e..00000000
--- a/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png
new file mode 100644
index 00000000..4af4ae63
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 6ed4351c..00000000
--- a/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 00000000..25ca3bf2
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 00000000..74c46cf4
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index 7d58d25d..00000000
--- a/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 00000000..d11bf922
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 00000000..82954172
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_none_black_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index b8772d37..00000000
--- a/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_white80.png
new file mode 100644
index 00000000..48dd4755
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_none_white80.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 00000000..a1b5b7ef
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_none_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 00000000..bbef7554
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 00000000..b7fa5946
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_off_black_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index e627b30a..00000000
--- a/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_white80.png
new file mode 100644
index 00000000..85faa9be
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_off_white80.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 00000000..f70ea128
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_off_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 00000000..108f7b94
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 00000000..796398e4
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index e38f5217..00000000
--- a/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white80.png
new file mode 100644
index 00000000..d089457a
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white80.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 00000000..e31b0d36
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_white80.png
new file mode 100644
index 00000000..b05f3a28
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_white80.png
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 00000000..cbd0c1e9
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_black_24dp.png
new file mode 100644
index 00000000..91187eb0
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_refresh_black_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index 9c1e27d7..00000000
--- a/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 00000000..1692d8a2
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 00000000..d2203a0a
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png
new file mode 100644
index 00000000..b5fcd9ce
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 00000000..016ec079
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 00000000..dbf1f14b
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png
new file mode 100644
index 00000000..93374aaa
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 00000000..38fd2a67
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 00000000..3023ff8d
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 6a70402b..00000000
--- a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..eabb0a2b
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
index 10e78408..b2c3d0a8 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png
new file mode 100644
index 00000000..f4c009c2
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
index 53ecbecf..2183ca99 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
index 436a1bd3..178fe1a1 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
index f78425d2..906386b3 100644
--- a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 00000000..3f210ba5
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 00000000..1f6af72d
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 1eb62d42..00000000
--- a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 00000000..4ddee9ef
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png
new file mode 100644
index 00000000..f2b75c31
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index e4e21812..00000000
--- a/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png
new file mode 100644
index 00000000..d6761ba1
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 0c0fd76f..00000000
--- a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 00000000..c05fd3b5
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 00000000..b06e6bc2
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index 98dff2f3..00000000
--- a/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 00000000..c433379f
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 00000000..6ebe6649
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index ffdb15a8..00000000
--- a/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white80.png
new file mode 100644
index 00000000..35936595
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white80.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 00000000..d4627a9e
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 00000000..2d50a525
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 00000000..db8f1f3d
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index ab65f4b2..00000000
--- a/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white80.png
new file mode 100644
index 00000000..daef1e0d
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white80.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 00000000..874bc627
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 00000000..647a611a
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 00000000..5e12f7c1
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index 53162e56..00000000
--- a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white80.png
new file mode 100644
index 00000000..b0dd0d38
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white80.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 00000000..5c65e5bc
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_white80.png
new file mode 100644
index 00000000..062b4c21
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_white80.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 00000000..1e70b633
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_black_24dp.png
new file mode 100644
index 00000000..bcaba5f6
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_refresh_black_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index e44a6d28..00000000
--- a/src/main/res/drawable-xxxhdpi/ic_refresh_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 00000000..f5beca25
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 00000000..3e9c1f7c
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png
new file mode 100644
index 00000000..4fb12a0d
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 00000000..26683df1
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 00000000..215abff2
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png
new file mode 100644
index 00000000..b07abab3
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 00000000..7258b8e3
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 00000000..476d5c97
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 5eba9e8e..00000000
--- a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..507c5edd
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
index c474359e..310e3803 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png
new file mode 100644
index 00000000..dbeaef12
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
index 1421768c..336906ba 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
index ee89b670..9ad50df9 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
index d34038d0..1aa23141 100644
--- a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 00000000..473b1b0d
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png
diff --git a/src/main/res/drawable/infocard_border_dark.xml b/src/main/res/drawable/infocard_border_dark.xml
new file mode 100644
index 00000000..f5b5fed9
--- /dev/null
+++ b/src/main/res/drawable/infocard_border_dark.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="@color/grey800" />
+
+    <corners android:radius="2dp" />
+
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/grey900" >
+    </stroke>
+    
+    <padding
+        android:bottom="0dp"
+        android:left="0dp"
+        android:right="0dp"
+        android:top="0dp" />
+
+</shape>
+\ No newline at end of file
diff --git a/src/main/res/layout-w945dp/fragment_conversations_overview.xml b/src/main/res/layout-w945dp/fragment_conversations_overview.xml
index 7ae1788d..63eb0e57 100644
--- a/src/main/res/layout-w945dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w945dp/fragment_conversations_overview.xml
@@ -9,14 +9,14 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:background="@color/grey50"
+        android:background="?attr/color_background_primary"
         android:orientation="vertical" >
 
         <de.timroes.android.listview.EnhancedListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="@color/grey50"
+            android:background="?attr/color_background_primary"
             android:divider="@color/black12"
             android:dividerHeight="1dp" />
     </LinearLayout>
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index cac9a9fa..605f63ef 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:scrollHorizontally="false"
             android:singleLine="true"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
@@ -41,7 +41,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/account_status_unknown"
-            android:textColor="@color/black54"
+            android:textColor="?attr/color_text_secondary"
             android:textSize="?attr/TextSizeBody"
             android:textStyle="bold" />
     </LinearLayout>
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index 247e96e5..cae60ebb 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -1,9 +1,9 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="eu.siacs.conversations.ui.AboutActivity"
-    android:background="@color/grey50"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_height="fill_parent"
+    android:background="?attr/color_background_primary">
 
     <TextView
         android:text="@string/pref_about_message"
@@ -15,7 +15,6 @@
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:paddingBottom="@dimen/activity_vertical_margin"
-        android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody"
         android:typeface="monospace"
         android:fontFamily="monospace"/>
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 6fb1d013..886c45c6 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/grey200">
+                android:background="?attr/color_background_secondary">
 
 	<ScrollView
 		android:layout_width="fill_parent"
@@ -15,7 +15,7 @@
 				android:layout_marginRight="@dimen/activity_horizontal_margin"
 				android:layout_marginTop="@dimen/activity_vertical_margin"
 				android:layout_marginBottom="@dimen/activity_vertical_margin"
-				android:background="@drawable/infocard_border"
+				android:background="?attr/infocard_border"
 				android:padding="@dimen/infocard_padding"
 				android:orientation="vertical">
 
@@ -24,7 +24,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/current_password"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -34,15 +34,15 @@
 				android:layout_marginBottom="8dp"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/black87"
-				android:textColorHint="@color/black54"
+				android:textColor="?attr/color_text_primary"
+				android:textColorHint="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/new_password"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -52,15 +52,15 @@
 				android:layout_marginBottom="8dp"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/black87"
-				android:textColorHint="@color/black54"
+				android:textColor="?attr/color_text_primary"
+				android:textColorHint="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/account_settings_confirm_password"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"/>
 
 			<EditText
@@ -69,8 +69,8 @@
 				android:layout_height="wrap_content"
 				android:hint="@string/password"
 				android:inputType="textPassword"
-				android:textColor="@color/black87"
-				android:textColorHint="@color/black54"
+				android:textColor="?attr/color_text_primary"
+				android:textColorHint="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeBody"/>
 		</LinearLayout>
 	</ScrollView>
@@ -96,7 +96,7 @@
 			android:layout_height="fill_parent"
 			android:layout_marginBottom="7dp"
 			android:layout_marginTop="7dp"
-			android:background="@color/black12"/>
+			android:background="?attr/divider"/>
 
 		<Button
 			android:id="@+id/right_button"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 3c9d203b..e457100c 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/grey200" >
+    android:background="?attr/color_background_secondary" >
 
     <LinearLayout
         android:id="@+id/details_main_layout"
@@ -17,7 +17,7 @@
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:background="@drawable/infocard_border"
+            android:background="?attr/infocard_border"
             android:padding="@dimen/infocard_padding" >
 
             <QuickContactBadge
@@ -40,7 +40,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/account_settings_example_jabber_id"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold" />
 
@@ -66,7 +66,7 @@
                     android:id="@+id/status_message"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_secondary"
                     android:textStyle="italic"
                     android:textSize="?attr/TextSizeBody" />
 
@@ -83,7 +83,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:text="@string/send_presence_updates"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeBody" />
 
                 <CheckBox
@@ -91,7 +91,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/receive_presence_updates"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeBody" />
             </LinearLayout>
 
@@ -103,7 +103,7 @@
                 android:layout_below="@+id/details_jidbox"
                 android:layout_marginTop="32dp"
                 android:text="@string/using_account"
-                android:textColor="@color/black54"
+                android:textColor="?attr/color_text_secondary"
                 android:textSize="?attr/TextSizeInfo" />
         </RelativeLayout>
 
@@ -115,7 +115,7 @@
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:background="@drawable/infocard_border"
+            android:background="?attr/infocard_border"
             android:divider="?android:dividerHorizontal"
             android:orientation="vertical"
             android:padding="@dimen/infocard_padding"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index d308b4ce..e180f1be 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -4,7 +4,7 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/grey200">
+                android:background="?attr/color_background_secondary">
 
     <ScrollView
         android:layout_width="fill_parent"
@@ -26,7 +26,7 @@
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding">
                 <com.makeramen.roundedimageview.RoundedImageView
@@ -47,7 +47,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/account_settings_jabber_id"
-                        android:textColor="@color/black87"
+                        android:textColor="?attr/color_text_primary"
                         android:textSize="?attr/TextSizeBody"/>
 
                     <AutoCompleteTextView
@@ -56,8 +56,8 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/account_settings_example_jabber_id"
                         android:inputType="textEmailAddress"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
+                        android:textColor="?attr/color_text_primary"
+                        android:textColorHint="?attr/color_text_secondary"
                         android:textSize="?attr/TextSizeBody"/>
 
                     <TextView
@@ -65,7 +65,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:text="@string/account_settings_password"
-                        android:textColor="@color/black87"
+                        android:textColor="?attr/color_text_primary"
                         android:textSize="?attr/TextSizeBody"/>
 
                     <EditText
@@ -74,8 +74,8 @@
                         android:layout_height="wrap_content"
                         android:hint="@string/password"
                         android:inputType="textPassword"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
+                        android:textColor="?attr/color_text_primary"
+                        android:textColorHint="?attr/color_text_secondary"
                         android:textSize="?attr/TextSizeBody"/>
 
                     <LinearLayout
@@ -95,7 +95,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/account_settings_hostname"
-                                android:textColor="@color/black87"
+                                android:textColor="?attr/color_text_primary"
                                 android:textSize="?attr/TextSizeBody"/>
                             <EditText
                                 android:id="@+id/hostname"
@@ -103,8 +103,8 @@
                                 android:layout_height="wrap_content"
                                 android:hint="@string/hostname_or_onion"
                                 android:inputType="textNoSuggestions"
-                                android:textColor="@color/black87"
-                                android:textColorHint="@color/black54"
+                                android:textColor="?attr/color_text_primary"
+                                android:textColorHint="?attr/color_text_secondary"
                                 android:textSize="?attr/TextSizeBody"/>
                         </LinearLayout>
                         <LinearLayout
@@ -117,7 +117,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/account_settings_port"
-                                android:textColor="@color/black87"
+                                android:textColor="?attr/color_text_primary"
                                 android:textSize="?attr/TextSizeBody"/>
                             <EditText
                                 android:id="@+id/port"
@@ -125,8 +125,8 @@
                                 android:layout_height="match_parent"
                                 android:inputType="number"
                                 android:maxLength="5"
-                                android:textColor="@color/black87"
-                                android:textColorHint="@color/black54"
+                                android:textColor="?attr/color_text_primary"
+                                android:textColorHint="?attr/color_text_secondary"
                                 android:textSize="?attr/TextSizeBody"/>
                         </LinearLayout>
                     </LinearLayout>
@@ -136,7 +136,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
                         android:text="@string/register_account"
-                        android:textColor="@color/black87"
+                        android:textColor="?attr/color_text_primary"
                         android:textSize="?attr/TextSizeBody"/>
 
                     <TextView
@@ -144,7 +144,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/account_settings_confirm_password"
-                        android:textColor="@color/black87"
+                        android:textColor="?attr/color_text_primary"
                         android:textSize="?attr/TextSizeBody"
                         android:visibility="gone"/>
 
@@ -155,8 +155,8 @@
                         android:layout_marginTop="8dp"
                         android:hint="@string/confirm_password"
                         android:inputType="textPassword"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
+                        android:textColor="?attr/color_text_primary"
+                        android:textColorHint="?attr/color_text_secondary"
                         android:textSize="?attr/TextSizeBody"
                         android:visibility="gone"/>
                 </LinearLayout>
@@ -170,7 +170,7 @@
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
                 android:visibility="gone">
@@ -179,7 +179,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/battery_optimizations_enabled"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold"/>
                 <TextView
@@ -190,7 +190,7 @@
                     android:layout_marginBottom="8dp"
                     android:layout_marginTop="8dp"
                     android:text="@string/battery_optimizations_enabled_explained"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeBody"/>
                 <Button
                     android:id="@+id/batt_op_disable"
@@ -213,7 +213,7 @@
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
                 android:visibility="gone">
@@ -232,7 +232,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_session_established"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -240,7 +240,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -261,7 +261,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_pep"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -269,7 +269,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -282,7 +282,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_blocking"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -290,7 +290,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -303,7 +303,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_stream_management"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -311,7 +311,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -324,7 +324,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_roster_version"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -332,7 +332,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -345,7 +345,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_carbon_messages"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -353,7 +353,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -366,7 +366,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_mam"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -374,7 +374,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -387,7 +387,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_csi"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -395,7 +395,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             tools:ignore="RtlHardcoded"/>
                     </TableRow>
@@ -408,7 +408,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_push"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -416,7 +416,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
                     </TableRow>
                     <TableRow
@@ -427,7 +427,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/server_info_http_upload"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <TextView
@@ -435,7 +435,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="right"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
                     </TableRow>
                 </TableLayout>
@@ -458,7 +458,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:fontFamily="monospace"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             android:typeface="monospace"/>
 
@@ -466,7 +466,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/otr_fingerprint"
-                            android:textColor="@color/black54"
+                            android:textColor="?attr/color_text_secondary"
                             android:textSize="?attr/TextSizeInfo"/>
                     </LinearLayout>
 
@@ -480,6 +480,7 @@
                         android:contentDescription="@string/copy_otr_clipboard_description"
                         android:padding="@dimen/image_button_padding"
                         android:src="?attr/icon_copy"
+                        android:alpha="?attr/icon_alpha"
                         android:visibility="visible"/>
                 </RelativeLayout>
                 <RelativeLayout
@@ -500,7 +501,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:fontFamily="monospace"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"
                             android:typeface="monospace"/>
 
@@ -508,7 +509,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/this_device_omemo_fingerprint"
-                            android:textColor="@color/black54"
+                            android:textColor="?attr/color_text_secondary"
                             android:textSize="?attr/TextSizeInfo"/>
                     </LinearLayout>
 
@@ -528,6 +529,7 @@
                             android:contentDescription="@string/copy_omemo_clipboard_description"
                             android:padding="@dimen/image_button_padding"
                             android:src="?attr/icon_copy"
+                            android:alpha="?attr/icon_alpha"
                             android:visibility="visible"/>
                         <ImageButton
                             android:id="@+id/action_regenerate_axolotl_key"
@@ -536,6 +538,7 @@
                             android:background="?android:selectableItemBackground"
                             android:contentDescription="@string/regenerate_omemo_key"
                             android:padding="@dimen/image_button_padding"
+                            android:alpha="?attr/icon_alpha"
                             android:src="?attr/icon_refresh"
                             android:visibility="gone"/>
 
@@ -550,7 +553,7 @@
                 android:layout_marginLeft="@dimen/activity_horizontal_margin"
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
                 android:visibility="gone">
@@ -560,7 +563,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/other_devices"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold"/>
 
@@ -593,14 +596,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/black87"/>
+            android:textColor="?attr/color_text_primary"/>
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/black12"/>
+            android:background="?attr/divider"/>
 
         <Button
             android:id="@+id/save_button"
@@ -610,7 +613,7 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/save"
-            android:textColor="@color/black54"/>
+            android:textColor="?attr/color_text_secondary"/>
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index e7b11d9f..7ff91e15 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -3,7 +3,7 @@
 			xmlns:app="http://schemas.android.com/apk/res-auto"
 			android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
-			android:background="@color/grey200">
+			android:background="?attr/color_background_secondary">
 
 	<LinearLayout
 		android:id="@+id/muc_main_layout"
@@ -18,7 +18,7 @@
 			android:layout_marginRight="@dimen/activity_horizontal_margin"
 			android:layout_marginTop="@dimen/activity_vertical_margin"
 			android:layout_marginBottom="@dimen/activity_vertical_margin"
-			android:background="@drawable/infocard_border"
+			android:background="?attr/infocard_border"
 			android:orientation="vertical"
 			android:padding="@dimen/infocard_padding">
 
@@ -28,7 +28,7 @@
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="16dp"
 				android:text="@string/account_settings_example_jabber_id"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeHeadline"
 				android:textStyle="bold"/>
 
@@ -58,7 +58,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:singleLine="true"
-						android:textColor="@color/black87"
+						android:textColor="?attr/color_text_primary"
 						android:textSize="?attr/TextSizeHeadline"/>
 
 					<TextView
@@ -66,7 +66,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:singleLine="true"
-						android:textColor="@color/black87"
+						android:textColor="?attr/color_text_primary"
 						android:textSize="?attr/TextSizeBody"/>
 				</LinearLayout>
 
@@ -78,7 +78,8 @@
 					android:layout_centerVertical="true"
 					android:background="?android:selectableItemBackground"
 					android:padding="@dimen/image_button_padding"
-					android:src="?attr/icon_edit_dark"/>
+					android:alpha="?attr/icon_alpha"
+					android:src="?attr/icon_edit_body"/>
 			</RelativeLayout>
 
 			<RelativeLayout
@@ -90,7 +91,7 @@
 				android:layout_height="wrap_content"
 				android:text="@string/private_conference"
 				android:layout_centerVertical="true"
-				android:textColor="@color/black87"
+				android:textColor="?attr/color_text_primary"
 				android:textSize="?attr/TextSizeBody"
 				android:layout_alignParentLeft="true"
 				android:layout_toLeftOf="@+id/change_conference_button"
@@ -105,6 +106,7 @@
 				android:layout_centerVertical="true"
 				android:background="?android:selectableItemBackground"
 				android:padding="@dimen/image_button_padding"
+				android:alpha="?attr/icon_alpha"
 				android:src="?attr/icon_settings"/>
 				</RelativeLayout>
 
@@ -117,7 +119,7 @@
 					android:layout_height="wrap_content"
 					android:text="@string/notify_on_all_messages"
 					android:layout_centerVertical="true"
-					android:textColor="@color/black87"
+					android:textColor="?attr/color_text_primary"
 					android:textSize="?attr/TextSizeBody"
 					android:layout_alignParentLeft="true"
 					android:layout_toLeftOf="@+id/notification_status_button"
@@ -132,7 +134,7 @@
 					android:layout_centerVertical="true"
 					android:background="?android:selectableItemBackground"
 					android:padding="@dimen/image_button_padding"
-					android:src="@drawable/ic_notifications_grey600_24dp"/>
+					android:src="?attr/icon_notifications"/>
 			</RelativeLayout>
 
 			<TableLayout
@@ -150,7 +152,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:text="@string/server_info_mam"
-						android:textColor="@color/black87"
+						android:textColor="?attr/color_text_primary"
 						android:textSize="?attr/TextSizeBody" />
 
 					<TextView
@@ -158,7 +160,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_gravity="right"
-						android:textColor="@color/black87"
+						android:textColor="?attr/color_text_primary"
 						android:textSize="?attr/TextSizeBody" />
 				</TableRow>
 
@@ -171,7 +173,7 @@
 				android:layout_gravity="right"
 				android:layout_marginTop="32dp"
 				android:text="@string/using_account"
-				android:textColor="@color/black54"
+				android:textColor="?attr/color_text_secondary"
 				android:textSize="?attr/TextSizeInfo"/>
 		</LinearLayout>
 
@@ -183,7 +185,7 @@
 			android:layout_marginRight="@dimen/activity_horizontal_margin"
 			android:layout_marginTop="@dimen/activity_vertical_margin"
 			android:layout_marginBottom="@dimen/activity_vertical_margin"
-			android:background="@drawable/infocard_border"
+			android:background="?attr/infocard_border"
 			android:orientation="vertical"
 			android:padding="@dimen/infocard_padding">
 
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 8c7c359b..de0e1de3 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/grey50" >
+    android:background="?attr/color_background_primary" >
 
     <LinearLayout
         android:id="@+id/account_image_wrapper"
@@ -27,7 +27,7 @@
         android:layout_below="@id/account_image_wrapper"
         android:layout_centerHorizontal="true"
         android:text="@string/touch_to_choose_picture"
-        android:textColor="@color/black54" />
+        android:textColor="?attr/color_text_secondary" />
 
     <TextView
         android:id="@+id/secondary_hint"
@@ -36,7 +36,7 @@
         android:layout_below="@id/hint"
         android:layout_centerHorizontal="true"
         android:text="@string/or_long_press_for_default"
-        android:textColor="@color/black54" />
+        android:textColor="?attr/color_text_secondary" />
 
     <LinearLayout
         android:id="@+id/button_bar"
@@ -53,14 +53,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/black87" />
+            android:textColor="?attr/color_text_primary" />
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/black12" />
+            android:background="?attr/divider" />
 
         <Button
             android:id="@+id/publish_button"
@@ -70,7 +70,7 @@
             android:layout_weight="1"
             android:enabled="false"
             android:text="@string/publish"
-            android:textColor="@color/black54" />
+            android:textColor="?attr/color_text_secondary" />
     </LinearLayout>
 
     <LinearLayout
@@ -89,7 +89,7 @@
             android:id="@+id/account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
@@ -99,7 +99,7 @@
             android:layout_marginTop="8dp"
             android:minLines="3"
             android:text="@string/publish_avatar_explanation"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeBody" />
     </LinearLayout>
 
diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml
index 8195092f..dcdaaaf0 100644
--- a/src/main/res/layout/activity_set_presence.xml
+++ b/src/main/res/layout/activity_set_presence.xml
@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:background="@color/grey200"
+            android:background="?attr/color_background_secondary"
             android:id="@+id/scroll_view">
 
     <LinearLayout
@@ -17,7 +17,7 @@
             android:layout_marginRight="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_vertical_margin"
             android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:background="@drawable/infocard_border"
+            android:background="?attr/infocard_border"
             android:padding="@dimen/infocard_padding"
             android:orientation="vertical">
             <EditText
@@ -26,7 +26,7 @@
                 android:inputType="textMultiLine"
                 android:hint="@string/status_message"
                 android:id="@+id/presence_status_message"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:layout_marginBottom="8dp"
                 android:textSize="?attr/TextSizeBody"/>
             <Spinner
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/all_accounts_on_this_device"
                 android:id="@+id/all_accounts"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textSize="?attr/TextSizeBody"/>
             <Button
                 android:id="@+id/change_presence"
@@ -62,7 +62,7 @@
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/activity_vertical_margin"
         android:layout_marginBottom="@dimen/activity_vertical_margin"
-        android:background="@drawable/infocard_border"
+        android:background="?attr/infocard_border"
         android:padding="@dimen/infocard_padding"
         android:orientation="vertical"
         android:divider="?android:dividerHorizontal"
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index d55ec196..b1077727 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -3,6 +3,6 @@
     android:id="@+id/start_conversation_view_pager"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/grey50" >
+    android:background="?attr/color_background_primary" >
 
 </android.support.v4.view.ViewPager>
 \ No newline at end of file
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index d7bb7628..cf14e8e9 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -3,7 +3,7 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/grey200" >
+                android:background="?attr/color_background_secondary" >
     <ScrollView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
                 android:visibility="gone">
@@ -32,7 +32,7 @@
                     android:id="@+id/key_error_message_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold"
                     android:text="@string/error_trustkeys_title"/>
@@ -41,7 +41,7 @@
                     android:id="@+id/key_error_message"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeBody"
                     android:padding="8dp"/>
 
@@ -55,7 +55,7 @@
                 android:layout_marginRight="@dimen/activity_horizontal_margin"
                 android:layout_marginTop="@dimen/activity_vertical_margin"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
+                android:background="?attr/infocard_border"
                 android:orientation="vertical"
                 android:padding="@dimen/infocard_padding"
                 android:visibility="gone">
@@ -64,7 +64,7 @@
                     android:id="@+id/own_keys_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:textStyle="bold"/>
 
@@ -107,14 +107,14 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/cancel"
-            android:textColor="@color/black87" />
+            android:textColor="?attr/color_text_primary" />
 
         <View
             android:layout_width="1dp"
             android:layout_height="fill_parent"
             android:layout_marginBottom="7dp"
             android:layout_marginTop="7dp"
-            android:background="@color/black12" />
+            android:background="?attr/divider" />
 
         <Button
             android:id="@+id/save_button"
@@ -123,7 +123,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:enabled="true"
-            android:textColor="@color/black54"
+            android:textColor="?attr/color_text_secondary"
             android:text="@string/done"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index c15f19d5..de61a66f 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/grey50">
+                android:background="?attr/color_background_primary">
 
 	<ScrollView
 		android:layout_width="fill_parent"
@@ -34,7 +34,7 @@
 					android:id="@+id/your_fingerprint"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:textColor="@color/black87"
+					android:textColor="?attr/color_text_primary"
 					android:textSize="?attr/TextSizeBody"
 					android:typeface="monospace"
 					android:fontFamily="monospace"/>
@@ -43,7 +43,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:text="@string/your_fingerprint"
-					android:textColor="@color/black54"
+					android:textColor="?attr/color_text_secondary"
 					android:textSize="?attr/TextSizeInfo"/>
 
 				<TextView
@@ -51,7 +51,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="20dp"
-					android:textColor="@color/black87"
+					android:textColor="?attr/color_text_primary"
 					android:textSize="?attr/TextSizeBody"
 					android:typeface="monospace"
 					android:fontFamily="monospace"/>
@@ -61,7 +61,7 @@
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="20dp"
 					android:text="@string/remote_fingerprint"
-					android:textColor="@color/black54"
+					android:textColor="?attr/color_text_secondary"
 					android:textSize="?attr/TextSizeInfo"/>
 
 			</LinearLayout>
@@ -79,7 +79,7 @@
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_horizontal"
 					android:text="@string/verified"
-					android:textColor="@color/black87"
+					android:textColor="?attr/color_text_primary"
 					android:textSize="?attr/TextSizeHeadline"
 					android:textStyle="bold"
 					android:visibility="gone"/>
@@ -89,7 +89,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="8dp"
-					android:textColor="@color/black87"
+					android:textColor="?attr/color_text_primary"
 					android:textSize="?attr/TextSizeBody"
 					android:textStyle="bold"
 					android:visibility="gone"/>
@@ -101,8 +101,8 @@
 					android:layout_marginBottom="8dp"
 					android:hint="@string/shared_secret_hint"
 					android:inputType="textAutoComplete"
-					android:textColor="@color/black87"
-					android:textColorHint="@color/black54"
+					android:textColor="?attr/color_text_primary"
+					android:textColorHint="?attr/color_text_secondary"
 					android:textSize="?attr/TextSizeBody"/>
 
 				<EditText
@@ -112,8 +112,8 @@
 					android:layout_marginTop="8dp"
 					android:hint="@string/shared_secret_secret"
 					android:inputType="textPassword"
-					android:textColor="@color/black87"
-					android:textColorHint="@color/black54"
+					android:textColor="?attr/color_text_primary"
+					android:textColorHint="?attr/color_text_secondary"
 					android:textSize="?attr/TextSizeBody"/>
 			</LinearLayout>
 		</LinearLayout>
@@ -139,7 +139,7 @@
 			android:layout_height="fill_parent"
 			android:layout_marginBottom="7dp"
 			android:layout_marginTop="7dp"
-			android:background="@color/black12"/>
+			android:background="?attr/divider"/>
 
 		<Button
 			android:id="@+id/right_button"
diff --git a/src/main/res/layout/captcha.xml b/src/main/res/layout/captcha.xml
index ea77b835..f0850dec 100644
--- a/src/main/res/layout/captcha.xml
+++ b/src/main/res/layout/captcha.xml
@@ -16,8 +16,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="textNoSuggestions"
-        android:textColor="@color/black87"
-        android:textColorHint="@color/black54"
+        android:textColor="?attr/color_text_primary"
+        android:textColorHint="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"
         android:hint="@string/captcha_hint">
 
diff --git a/src/main/res/layout/certificate_information.xml b/src/main/res/layout/certificate_information.xml
index 4c085459..3c387585 100644
--- a/src/main/res/layout/certificate_information.xml
+++ b/src/main/res/layout/certificate_information.xml
@@ -9,79 +9,79 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_subject"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeHeadline"/>
     <TextView
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_cn"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/subject_cn"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_o"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/subject_o"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_marginTop="16dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_issuer"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeHeadline"/>
     <TextView
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_cn"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/issuer_cn"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_marginTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_o"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/issuer_o"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_marginTop="16dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/certificate_sha1"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/sha1"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"
         android:typeface="monospace"
         android:fontFamily="monospace"/>
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 56443c34..a67bf3ae 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -28,7 +28,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeHeadline" />
 
         <TextView
@@ -36,7 +36,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeBody" />
         <LinearLayout
             android:id="@+id/tags"
@@ -49,7 +49,7 @@
             android:id="@+id/key"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:textSize="?attr/TextSizeHeadline"
             android:typeface="monospace"
             android:fontFamily="monospace"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index a4fd29e9..7076dad2 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -16,7 +16,7 @@
             android:id="@+id/key"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black87"
+            android:textColor="?attr/color_text_primary"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/tgl_trust"
             android:textSize="?attr/TextSizeBody"
@@ -27,7 +27,7 @@
             android:id="@+id/key_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black54"
+            android:textColor="?attr/color_text_secondary"
             android:layout_alignParentLeft="true"
             android:layout_below="@+id/key"
             android:maxLines="1"
@@ -40,7 +40,7 @@
             android:layout_alignParentRight="true"
             android:layout_below="@+id/key"
             android:visibility="gone"
-            android:textColor="@color/black54"
+            android:textColor="?attr/color_text_secondary"
             android:textSize="?attr/TextSizeInfo"/>
 
     <ImageButton
@@ -52,6 +52,7 @@
         android:layout_centerVertical="true"
         android:background="?android:selectableItemBackground"
         android:padding="@dimen/image_button_padding"
+        android:alpha="?attr/icon_alpha"
         android:src="?attr/icon_remove"
         android:visibility="gone" />
 
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index cd3f9266..94e922f7 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -13,7 +13,7 @@
         android:id="@+id/swipeable_item"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:background="@color/grey50">
+        android:background="?attr/color_background_primary">
 
         <RelativeLayout
             android:layout_width="fill_parent"
@@ -46,7 +46,7 @@
                     android:paddingRight="4dp"
                     android:singleLine="true"
                     android:text="Awesome groupchat"
-                    android:textColor="@color/black87"
+                    android:textColor="?attr/color_text_primary"
                     android:textSize="?attr/TextSizeHeadline"
                     android:typeface="sans"/>
 
@@ -70,7 +70,7 @@
                             android:scrollHorizontally="false"
                             android:singleLine="true"
                             android:text="This is a placeholder text to show the last messages"
-                            android:textColor="@color/black87"
+                            android:textColor="?attr/color_text_primary"
                             android:textSize="?attr/TextSizeBody"/>
 
                         <com.makeramen.roundedimageview.RoundedImageView
@@ -89,7 +89,7 @@
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="4dp"
-                        android:src="@drawable/ic_notifications_grey600_24dp"
+                        android:src="?attr/icon_notifications"
                         />
                 </RelativeLayout>
 
@@ -101,7 +101,7 @@
                     android:layout_alignParentRight="true"
                     android:gravity="right"
                     android:text="23:42"
-                    android:textColor="@color/black54"
+                    android:textColor="?attr/color_text_secondary"
                     android:textSize="?attr/TextSizeInfo"/>
             </RelativeLayout>
         </RelativeLayout>
diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index d4af0dfc..f8a861a9 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/your_account"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
 
     <Spinner
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/account_settings_jabber_id"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
 
     <AutoCompleteTextView
@@ -36,8 +36,8 @@
         android:layout_height="wrap_content"
         android:hint="@string/account_settings_example_jabber_id"
         android:inputType="textEmailAddress"
-        android:textColor="@color/black87"
-        android:textColorHint="@color/black54"
+        android:textColor="?attr/color_text_primary"
+        android:textColorHint="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody" />
 
 </LinearLayout>
 \ No newline at end of file
diff --git a/src/main/res/layout/form_boolean.xml b/src/main/res/layout/form_boolean.xml
index fd553acb..df39741d 100644
--- a/src/main/res/layout/form_boolean.xml
+++ b/src/main/res/layout/form_boolean.xml
@@ -8,6 +8,6 @@
         android:id="@+id/field"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
 </LinearLayout>
 \ No newline at end of file
diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml
index 31b521e8..4c4c7ce9 100644
--- a/src/main/res/layout/form_text.xml
+++ b/src/main/res/layout/form_text.xml
@@ -8,14 +8,14 @@
         android:id="@+id/label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
 
     <EditText
         android:id="@+id/field"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
-        android:textColorHint="@color/black54"
+        android:textColor="?attr/color_text_primary"
+        android:textColorHint="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
 </LinearLayout>
 \ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index db92c05f..6a621287 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/grey200" >
+    android:layout_height="match_parent">
 
     <ListView
         android:id="@+id/messages_view"
@@ -12,7 +11,7 @@
         android:layout_above="@+id/snackbar"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:background="@color/grey200"
+        android:background="?attr/color_background_secondary"
         android:divider="@null"
         android:dividerHeight="0dp"
         android:listSelector="@android:color/transparent"
@@ -27,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="@color/grey50" >
+        android:background="?attr/color_background_primary" >
 
         <eu.siacs.conversations.ui.EditMessage
             android:id="@+id/textinput"
@@ -35,7 +34,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/textSendButton"
-            android:background="@color/grey50"
+            android:background="?attr/color_background_primary"
             android:ems="10"
             android:imeOptions="flagNoExtractUi|actionSend"
             android:inputType="textShortMessage|textMultiLine|textCapSentences"
@@ -45,7 +44,7 @@
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
             android:paddingTop="12dp"
-            android:textColor="@color/black87" >
+            android:textColor="?attr/color_text_primary" >
 
             <requestFocus />
         </eu.siacs.conversations.ui.EditMessage>
@@ -56,8 +55,8 @@
             android:layout_height="48dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="?android:selectableItemBackground"
-            android:src="@drawable/ic_send_text_offline" />
+            android:background="?attr/color_background_primary"
+            android:src="?attr/ic_send_text_offline" />
     </RelativeLayout>
 
     <RelativeLayout
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index 2223219a..dcf9feb9 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -7,14 +7,14 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="@dimen/conversations_overview_width"
         android:layout_height="match_parent"
-        android:background="@color/grey50"
+        android:background="?attr/color_background_primary"
         android:orientation="vertical" >
 
         <de.timroes.android.listview.EnhancedListView
             android:id="@+id/list"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="@color/grey50"
+            android:background="?attr/color_background_primary"
             android:divider="@color/black12"
             android:dividerHeight="1dp" />
     </LinearLayout>
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index f7aa3c46..6339a8a6 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/your_account"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody" />
 
     <Spinner
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/conference_address"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody" />
 
     <AutoCompleteTextView
@@ -36,8 +36,8 @@
         android:layout_height="wrap_content"
         android:hint="@string/conference_address_example"
         android:inputType="textEmailAddress"
-        android:textColor="@color/black87"
-        android:textColorHint="@color/black54"
+        android:textColor="?attr/color_text_primary"
+        android:textColorHint="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeBody"/>
 
     <CheckBox
@@ -47,7 +47,7 @@
         android:layout_marginTop="8dp"
         android:checked="true"
         android:text="@string/save_as_bookmark"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
 
 </LinearLayout>
 \ No newline at end of file
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index d3271d1b..e0fb5433 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -7,7 +7,7 @@
               android:layout_marginLeft="@dimen/activity_horizontal_margin"
               android:layout_marginRight="@dimen/activity_horizontal_margin"
               android:layout_marginTop="@dimen/activity_vertical_margin"
-              android:background="@drawable/infocard_border"
+              android:background="?attr/infocard_border"
               android:orientation="vertical"
               android:padding="@dimen/infocard_padding">
 
@@ -15,7 +15,7 @@
         android:id="@+id/foreign_keys_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeHeadline"
         android:textStyle="bold"/>
 
@@ -33,7 +33,7 @@
         android:id="@+id/no_keys_to_accept"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:text="@string/no_keys_just_confirm"
         android:textSize="?attr/TextSizeBody"/>
 </LinearLayout>
 \ No newline at end of file
diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml
index c4adc029..e21ce5c0 100644
--- a/src/main/res/layout/magic_create.xml
+++ b/src/main/res/layout/magic_create.xml
@@ -6,7 +6,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/grey50">
+        android:background="?attr/color_background_primary">
 
         <LinearLayout
             android:id="@+id/linearLayout"
@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/pick_your_username"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textSize="?attr/TextSizeHeadline"
                 android:textStyle="bold"/>
             <TextView
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/magic_create_text"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textSize="?attr/TextSizeBody"/>
             <EditText
                 android:id="@+id/username"
@@ -52,7 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/your_full_jid_will_be"
-                android:textColor="@color/black54"
+                android:textColor="?attr/color_text_secondary"
                 android:textSize="?attr/TextSizeInfo"
                 android:visibility="invisible"/>
             <Button
diff --git a/src/main/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml
index 90ca7de0..debd86f1 100644
--- a/src/main/res/layout/manage_accounts.xml
+++ b/src/main/res/layout/manage_accounts.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@color/grey50" >
+    android:background="?attr/color_background_secondary" >
 
     <ListView
         android:id="@+id/account_list"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index fc68c389..37ab9da1 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_toLeftOf="@+id/message_photo"
-        android:background="@drawable/message_bubble_sent"
+        android:background="?attr/message_bubble_sent"
         android:minHeight="53dp"
         android:layout_marginLeft="-4dp"
         android:longClickable="true">
@@ -55,7 +55,7 @@
                 android:layout_height="wrap_content"
                 android:autoLink="web"
                 android:textColorLink="@color/black87"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textColorHighlight="@color/grey500"
                 android:textSize="?attr/TextSizeBody" />
 
@@ -80,7 +80,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
-                    android:textColor="@color/black54"
+                    android:textColor="?attr/color_text_secondary"
                     android:textSize="?attr/TextSizeInfo" />
 
                 <ImageView
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index 93a80d84..71f278ec 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -39,7 +39,7 @@
         android:layout_toEndOf="@+id/message_photo"
         android:layout_toRightOf="@+id/message_photo"
         android:text="@string/contact_has_read_up_to_this_point"
-        android:textColor="@color/black54"
+        android:textColor="?attr/color_text_secondary"
         android:textSize="?attr/TextSizeInfo"
         android:textStyle="italic"/>
 
diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml
index aa4ded5a..63b38f94 100644
--- a/src/main/res/layout/presence_template.xml
+++ b/src/main/res/layout/presence_template.xml
@@ -21,7 +21,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/presence_status_message"
-        android:textColor="@color/black87"
+        android:textColor="?attr/color_text_primary"
         android:textSize="?attr/TextSizeBody"/>
     <TextView
         android:id="@+id/status"
@@ -45,5 +45,6 @@
         android:layout_alignParentEnd="true"
         android:background="?android:selectableItemBackground"
         android:padding="@dimen/image_button_padding"
+        android:alpha="?attr/icon_alpha"
         android:src="?attr/icon_remove"/>
 </RelativeLayout>
 \ No newline at end of file
diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml
index ff6b0413..cba8b639 100644
--- a/src/main/res/layout/quickedit.xml
+++ b/src/main/res/layout/quickedit.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:ems="10"
         android:inputType="textPersonName"
-        android:textColor="@color/black87" >
+        android:textColor="?attr/color_text_primary" >
 
         <requestFocus />
     </EditText>
diff --git a/src/main/res/layout/simple_list_item.xml b/src/main/res/layout/simple_list_item.xml
index 8cbc1f92..70211960 100644
--- a/src/main/res/layout/simple_list_item.xml
+++ b/src/main/res/layout/simple_list_item.xml
@@ -18,7 +18,7 @@
           android:id="@android:id/text1"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:textColor="@color/black87"
+          android:textColor="?attr/color_text_primary"
           android:textSize="?attr/TextSizeBody"
           android:gravity="center_vertical"
           android:paddingLeft="8dp"
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index 25f7c46f..3d618675 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -6,7 +6,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/grey50">
+        android:background="?attr/color_background_primary">
 
         <LinearLayout
             android:id="@+id/linearLayout"
@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/welcome_header"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textSize="?attr/TextSizeHeadline"
                 android:textStyle="bold"/>
             <TextView
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/welcome_text"
-                android:textColor="@color/black87"
+                android:textColor="?attr/color_text_primary"
                 android:textSize="?attr/TextSizeBody"/>
             <Button
                 android:id="@+id/create_account"
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:text="@string/use_own_provider"
-                android:textColor="@color/black54"/>
+                android:textColor="?attr/color_text_secondary"/>
         </LinearLayout>
         <RelativeLayout
             android:layout_width="match_parent"
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 8556c99a..7c521569 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -6,6 +6,12 @@
         <item name="android:colorPrimaryDark">@color/primary_dark</item>
         <item name="android:colorAccent">@color/accent</item>
 
+        <item name="attr/color_text_primary">@color/black87</item>
+        <item name="attr/color_text_secondary">@color/black54</item>
+
+        <item name="attr/color_background_primary">@color/grey50</item>
+        <item name="attr/color_background_secondary">@color/grey200</item>
+
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:actionModeBackground">@color/accent</item>
 
@@ -13,27 +19,106 @@
         <item name="TextSizeBody">14sp</item>
         <item name="TextSizeHeadline">20sp</item>
 
+        <item name="attr/infocard_border">@drawable/infocard_border</item>
+        <item name="attr/divider">@color/black12</item>
+
+        <item name="attr/ic_send_cancel_offline">@drawable/ic_send_cancel_offline</item>
+        <item name="attr/ic_send_location_offline">@drawable/ic_send_location_offline</item>
+        <item name="attr/ic_send_photo_offline">@drawable/ic_send_photo_offline</item>
+        <item name="attr/ic_send_picture_offline">@drawable/ic_send_picture_offline</item>
+        <item name="attr/ic_send_text_offline">@drawable/ic_send_text_offline</item>
+        <item name="attr/ic_send_voice_offline">@drawable/ic_send_voice_offline</item>
+
+        <item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_white</item>
+        <item name="attr/message_bubble_sent">@drawable/message_bubble_sent</item>
+
+        <item name="attr/icon_alpha">0.54</item>
+
+        <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
+        <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item>
+        <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item>
+        <item name="attr/icon_copy">@drawable/ic_content_copy_black_24dp</item>
+        <item name="attr/icon_discard">@drawable/ic_delete_white_24dp</item>
+        <item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item>
+        <item name="attr/icon_edit">@drawable/ic_edit_white_24dp</item>
+        <item name="attr/icon_edit_body">@drawable/ic_edit_black_24dp</item>
+        <item name="attr/icon_done">@drawable/ic_done_black_24dp</item>
+        <item name="attr/icon_group">@drawable/ic_group_white_24dp</item>
+        <item name="attr/icon_new">@drawable/ic_add_white_24dp</item>
+        <item name="attr/icon_refresh">@drawable/ic_refresh_black_24dp</item>
+        <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
+        <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item name="attr/icon_remove">@drawable/ic_delete_black_24dp</item>
+        <item name="attr/icon_search">@drawable/ic_search_white_24dp</item>
+        <item name="attr/icon_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item name="attr/icon_settings">@drawable/ic_settings_black_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_notifications">@drawable/ic_notifications_black54_24dp</item>
+        <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_black54_24dp</item>
+        <item name="attr/icon_notifications_paused">@drawable/ic_notifications_paused_black54_24dp</item>
+        <item name="attr/icon_notifications_none">@drawable/ic_notifications_none_black54_24dp</item>
+    </style>
+
+    <style name="ConversationsTheme.Dark" parent="android:Theme.Material">
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
+        <item name="android:colorAccent">@color/accent</item>
+
+        <item name="attr/color_text_primary">@color/white</item>
+        <item name="attr/color_text_secondary">@color/white70</item>
+
+        <item name="attr/color_background_primary">@color/grey800</item>
+        <item name="attr/color_background_secondary">@color/grey900</item>
+
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:actionModeBackground">@color/accent</item>
+
+        <item name="TextSizeInfo">12sp</item>
+        <item name="TextSizeBody">14sp</item>
+        <item name="TextSizeHeadline">20sp</item>
+
+        <item name="attr/infocard_border">@drawable/infocard_border_dark</item>
+        <item name="attr/divider">@color/white12</item>
+
+        <item name="attr/ic_send_cancel_offline">@drawable/ic_send_cancel_offline_white</item>
+        <item name="attr/ic_send_location_offline">@drawable/ic_send_location_offline_white</item>
+        <item name="attr/ic_send_photo_offline">@drawable/ic_send_photo_offline_white</item>
+        <item name="attr/ic_send_picture_offline">@drawable/ic_send_picture_offline_white</item>
+        <item name="attr/ic_send_text_offline">@drawable/ic_send_text_offline_white</item>
+        <item name="attr/ic_send_voice_offline">@drawable/ic_send_voice_offline_white</item>
+
+        <item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_grey</item>
+        <item name="attr/message_bubble_sent">@drawable/message_bubble_sent_grey</item>
+
+        <item name="attr/icon_alpha">1.0</item>
+
         <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
         <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item>
         <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
+        <item name="attr/icon_copy">@drawable/ic_content_copy_white_24dp</item>
         <item name="attr/icon_discard">@drawable/ic_delete_white_24dp</item>
         <item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item>
         <item name="attr/icon_edit">@drawable/ic_edit_white_24dp</item>
-        <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
+        <item name="attr/icon_edit_body">@drawable/ic_edit_white_24dp</item>
         <item name="attr/icon_done">@drawable/ic_done_black_24dp</item>
         <item name="attr/icon_group">@drawable/ic_group_white_24dp</item>
         <item name="attr/icon_new">@drawable/ic_add_white_24dp</item>
-        <item name="attr/icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
+        <item name="attr/icon_refresh">@drawable/ic_refresh_white_24dp</item>
         <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
         <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item name="attr/icon_remove">@drawable/ic_delete_grey600_24dp</item>
+        <item name="attr/icon_remove">@drawable/ic_delete_white_24dp</item>
         <item name="attr/icon_search">@drawable/ic_search_white_24dp</item>
         <item name="attr/icon_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item name="attr/icon_settings">@drawable/ic_settings_grey600_24dp</item>
+        <item name="attr/icon_settings">@drawable/ic_settings_white_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_notifications">@drawable/ic_notifications_white_24dp</item>
+        <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_white_24dp</item>
+        <item name="attr/icon_notifications_paused">@drawable/ic_notifications_paused_white_24dp</item>
+        <item name="attr/icon_notifications_none">@drawable/ic_notifications_none_white_24dp</item>
     </style>
 
 </resources>
 \ No newline at end of file
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 48dbaabf..0695d1cd 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -8,6 +8,14 @@
 		<item>@string/app_name</item>
 		<item>Android</item>
 	</string-array>
+	<string-array name="themes">
+		<item>@string/pref_theme_light</item>
+		<item>@string/pref_theme_dark</item>
+	</string-array>
+	<string-array name="themes_values">
+		<item>light</item>
+		<item>dark</item>
+	</string-array>
 	<string-array name="filesizes">
 		<item>@string/never</item>
 		<item>256 KiB</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 901ea754..a0d962d4 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -5,15 +5,33 @@
     <attr name="TextSizeBody" format="dimension" />
     <attr name="TextSizeHeadline" format="dimension" />
 
+    <attr name="color_text_primary" format="reference|color" />
+    <attr name="color_text_secondary" format="reference|color" />
+
+    <attr name="color_background_secondary" format="reference|color" />
+    <attr name="color_background_primary" format="reference|color" />
+
+    <attr name="infocard_border" format="reference"/>
+    <attr name="ic_send_cancel_offline" format="reference"/>
+    <attr name="ic_send_location_offline" format="reference"/>
+    <attr name="ic_send_photo_offline" format="reference"/>
+    <attr name="ic_send_picture_offline" format="reference"/>
+    <attr name="ic_send_text_offline" format="reference"/>
+    <attr name="ic_send_voice_offline" format="reference"/>
+
+    <attr name="message_bubble_received_monochrome" format="reference"/>
+    <attr name="message_bubble_sent" format="reference"/>
+
+    <attr name="icon_alpha" format="float"/>
+
     <attr name="icon_add_group" format="reference"/>
     <attr name="icon_add_person" format="reference"/>
     <attr name="icon_cancel" format="reference"/>
-    <attr name="icon_chat" format="reference"/>
     <attr name="icon_copy" format="reference"/>
     <attr name="icon_discard" format="reference"/>
     <attr name="icon_download" format="reference"/>
     <attr name="icon_edit" format="reference"/>
-    <attr name="icon_edit_dark" format="reference"/>
+    <attr name="icon_edit_body" format="reference"/>
     <attr name="icon_done" format="reference"/>
     <attr name="icon_group" format="reference"/>
     <attr name="icon_new" format="reference"/>
@@ -27,4 +45,9 @@
     <attr name="icon_share" format="reference"/>
     <attr name="icon_import_export" format="reference"/>
 
+    <attr name="icon_notifications" format="reference"/>
+    <attr name="icon_notifications_off" format="reference"/>
+    <attr name="icon_notifications_paused" format="reference"/>
+    <attr name="icon_notifications_none" format="reference"/>
+
 </resources>
 \ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index b3567b44..25b1d3b7 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -9,10 +9,12 @@
 	<color name="black12">#1f000000</color>
 	<color name="white">#ffffffff</color>
 	<color name="white70">#b2ffffff</color>
+	<color name="white12">#1fffffff</color>
 	<color name="grey50">#fffafafa</color>
 	<color name="grey200">#ffeeeeee</color>
 	<color name="grey500">#ff9e9e9e</color>
 	<color name="grey800">#ff424242</color>
+	<color name="grey900">#ff282828</color>
 	<color name="red500">#fff44336</color>
 	<color name="red800">#ffc62828</color>
 	<color name="orange500">#ffff9800</color>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index dee7502f..6d03b20f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -412,7 +412,7 @@
 	<string name="enable_notifications">Enable notifications</string>
 	<string name="conference_with">Create conference with…</string>
 	<string name="no_conference_server_found">No conference server found</string>
-	<string name="conference_creation_failed">Conference creation failed!</string>s
+	<string name="conference_creation_failed">Conference creation failed!</string>
 	<string name="secret_accepted">Secret accepted!</string>
 	<string name="reset">Reset</string>
 	<string name="account_image_description">Account avatar</string>
@@ -656,4 +656,10 @@
 	<string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string>
 	<string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Conversations</string>
 	<string name="pref_privacy">Privacy</string>
+	<string name="pref_theme_options">Theme</string>
+	<string name="pref_theme_options_summary">Select the color palette</string>
+	<string name="pref_theme_light">Light theme</string>
+	<string name="pref_theme_dark">Dark theme</string>
+	<string name="pref_use_green_background">Green Background</string>
+	<string name="pref_use_green_background_summary">Use green background for received messages</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 424db4c9..8256f28a 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -9,17 +9,37 @@
         <item name="TextSizeBody">14sp</item>
         <item name="TextSizeHeadline">20sp</item>
 
+        <item name="attr/color_text_primary">@color/black87</item>
+        <item name="attr/color_text_secondary">@color/black54</item>
+
+        <item name="attr/color_background_primary">@color/grey50</item>
+        <item name="attr/color_background_secondary">@color/grey200</item>
+
+        <item name="attr/infocard_border">@drawable/infocard_border</item>
+        <item name="attr/divider">@color/black12</item>
+
+        <item name="attr/ic_send_cancel_offline">@drawable/ic_send_cancel_offline</item>
+        <item name="attr/ic_send_location_offline">@drawable/ic_send_location_offline</item>
+        <item name="attr/ic_send_photo_offline">@drawable/ic_send_photo_offline</item>
+        <item name="attr/ic_send_picture_offline">@drawable/ic_send_picture_offline</item>
+        <item name="attr/ic_send_text_offline">@drawable/ic_send_text_offline</item>
+        <item name="attr/ic_send_voice_offline">@drawable/ic_send_voice_offline</item>
+
         <item name="attr/icon_add_group">@drawable/ic_action_add_group</item>
         <item name="attr/icon_add_person">@drawable/ic_action_add_person</item>
         <item name="attr/icon_cancel">@drawable/ic_action_cancel</item>
-        <item name="attr/icon_chat">@drawable/ic_action_chat</item>
         <item name="attr/icon_copy">@drawable/ic_action_copy</item>
         <item name="attr/icon_discard">@drawable/ic_action_discard</item>
         <item name="attr/icon_download">@drawable/ic_action_download</item>
         <item name="attr/icon_edit">@drawable/ic_action_edit</item>
-        <item name="attr/icon_edit_dark">@drawable/ic_action_edit_dark</item>
+        <item name="attr/icon_edit_body">@drawable/ic_action_edit_dark</item>
         <item name="attr/icon_done">@drawable/ic_action_done</item>
 
+        <item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_white</item>
+        <item name="attr/message_bubble_sent">@drawable/message_bubble_sent</item>
+
+        <item name="attr/icon_alpha">1.0</item>
+
         <item name="attr/icon_group">@drawable/ic_action_group</item>
         <item name="attr/icon_new">@drawable/ic_action_new</item>
         <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
@@ -31,6 +51,68 @@
         <item name="attr/icon_settings">@drawable/ic_action_settings</item>
         <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
         <item name="attr/icon_share">@drawable/ic_action_share</item>
+
+        <item name="attr/icon_notifications">@drawable/ic_notifications_black54_24dp</item>
+        <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_black54_24dp</item>
+        <item name="attr/icon_notifications_paused">@drawable/ic_notifications_paused_black54_24dp</item>
+        <item name="attr/icon_notifications_none">@drawable/ic_notifications_none_black54_24dp</item>
+    </style>
+
+    <style name="ConversationsTheme.Dark" parent="@android:style/Theme.Holo">
+        <item name="android:actionBarStyle">@style/ConversationsActionBar.Dark</item>
+        <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget.Dark</item>
+        <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
+        <item name="TextSizeInfo">12sp</item>
+        <item name="TextSizeBody">14sp</item>
+        <item name="TextSizeHeadline">20sp</item>
+
+        <item name="attr/color_text_primary">@color/white</item>
+        <item name="attr/color_text_secondary">@color/white70</item>
+
+        <item name="attr/color_background_primary">@color/grey800</item>
+        <item name="attr/color_background_secondary">@color/grey900</item>
+
+        <item name="attr/infocard_border">@drawable/infocard_border_dark</item>
+        <item name="attr/divider">@color/white12</item>
+
+        <item name="attr/ic_send_cancel_offline">@drawable/ic_send_cancel_offline_white</item>
+        <item name="attr/ic_send_location_offline">@drawable/ic_send_location_offline_white</item>
+        <item name="attr/ic_send_photo_offline">@drawable/ic_send_photo_offline_white</item>
+        <item name="attr/ic_send_picture_offline">@drawable/ic_send_picture_offline_white</item>
+        <item name="attr/ic_send_text_offline">@drawable/ic_send_text_offline_white</item>
+        <item name="attr/ic_send_voice_offline">@drawable/ic_send_voice_offline_white</item>
+
+        <item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_grey</item>
+        <item name="attr/message_bubble_sent">@drawable/message_bubble_sent_grey</item>
+
+        <item name="attr/icon_alpha">1.0</item>
+
+        <item name="attr/icon_add_group">@drawable/ic_action_add_group</item>
+        <item name="attr/icon_add_person">@drawable/ic_action_add_person</item>
+        <item name="attr/icon_cancel">@drawable/ic_action_cancel</item>
+        <item name="attr/icon_copy">@drawable/ic_action_copy_white</item>
+        <item name="attr/icon_discard">@drawable/ic_action_discard</item>
+        <item name="attr/icon_download">@drawable/ic_action_download</item>
+        <item name="attr/icon_edit">@drawable/ic_action_edit</item>
+        <item name="attr/icon_edit_body">@drawable/ic_action_edit</item>
+        <item name="attr/icon_done">@drawable/ic_action_done</item>
+
+        <item name="attr/icon_group">@drawable/ic_action_group</item>
+        <item name="attr/icon_new">@drawable/ic_action_new</item>
+        <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
+        <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item>
+        <item name="attr/icon_refresh">@drawable/ic_action_refresh_white</item>
+        <item name="attr/icon_remove">@drawable/ic_action_remove_white</item>
+        <item name="attr/icon_search">@drawable/ic_action_search</item>
+        <item name="attr/icon_secure">@drawable/ic_action_secure</item>
+        <item name="attr/icon_settings">@drawable/ic_action_settings_white</item>
+        <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
+        <item name="attr/icon_share">@drawable/ic_action_share</item>
+
+        <item name="attr/icon_notifications">@drawable/ic_notifications_white80</item>
+        <item name="attr/icon_notifications_off">@drawable/ic_notifications_off_white80</item>
+        <item name="attr/icon_notifications_paused">@drawable/ic_notifications_paused_white80</item>
+        <item name="attr/icon_notifications_none">@drawable/ic_notifications_none_white80</item>
     </style>
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
@@ -39,6 +121,12 @@
         <item name="TextSizeHeadline">22sp</item>
     </style>
 
+    <style name="ConversationsTheme.Dark.LargerText" parent="ConversationsTheme.Dark">
+        <item name="TextSizeInfo">14sp</item>
+        <item name="TextSizeBody">16sp</item>
+        <item name="TextSizeHeadline">22sp</item>
+    </style>
+
     <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
         <item name="android:background">@color/primary</item>
         <item name="android:backgroundStacked">@color/primary_dark</item>
@@ -46,11 +134,23 @@
         <item name="android:icon">@android:color/transparent</item>
     </style>
 
+    <style name="ConversationsActionBar.Dark" parent="@android:style/Widget.Holo.ActionBar.Solid">
+        <item name="android:background">@color/primary</item>
+        <item name="android:backgroundStacked">@color/primary_dark</item>
+        <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
+        <item name="android:icon">@android:color/transparent</item>
+    </style>
+
     <style name="ConversationsActionBarWidget" parent="android:Theme.Holo.Light">
         <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
         <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
     </style>
 
+    <style name="ConversationsActionBarWidget.Dark" parent="android:Theme.Holo">
+        <item name="android:popupMenuStyle">@android:style/Widget.Holo.PopupMenu</item>
+        <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.ListView.DropDown</item>
+    </style>
+
     <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
         <item name="android:background">@drawable/actionbar_tab_indicator</item>
     </style>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index eb1ff571..b81c78d4 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?attr/color_background_secondary">
 
     <PreferenceCategory android:title="@string/pref_general">
         <CheckBoxPreference
@@ -114,16 +115,23 @@
             android:summary="@string/pref_return_to_previous_summary"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/pref_ui_options">
+        <ListPreference
+            android:defaultValue="light"
+            android:entries="@array/themes"
+            android:entryValues="@array/themes_values"
+            android:key="theme"
+            android:summary="@string/pref_theme_options_summary"
+            android:title="@string/pref_theme_options"/>
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="use_subject"
             android:summary="@string/pref_conference_name_summary"
             android:title="@string/pref_conference_name"/>
         <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="use_white_background"
-            android:summary="@string/pref_use_white_background_summary"
-            android:title="@string/pref_use_white_background"/>
+            android:defaultValue="true"
+            android:key="use_green_background"
+            android:summary="@string/pref_use_green_background_summary"
+            android:title="@string/pref_use_green_background"/>
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="use_larger_font"
author	Steffen Keiper <github@crystal-mett.de>	2016-05-12 20:00:18 +0200
committer	Daniel Gultsch <daniel@gultsch.de>	2016-06-08 20:07:40 +0200
commit	7932244c51e7c5e6e5775d282e91ec223fe2a9bf (patch)
tree	d268d139d9de4dd24a29c19eabf3b7b9b6aea553
parent	b88128241eb7deb6599e946dc009fdc5dfd32974 (diff)