From 626d0d3260d792843bebf2a8b8a62c1a026dd314 Mon Sep 17 00:00:00 2001
From: Matthias Rieber <matthias@zu-con.org>
Date: Sat, 29 Aug 2015 12:22:52 +0200
Subject: blue theme

---
 art/conversations_baloon.svg                       |  42 +++---
 art/message_bubble_received.svg                    |   2 +-
 art/message_bubble_sent.svg                        |   2 +-
 art/message_bubble_sent_white.svg                  | 165 +++++++++++++++++++++
 art/render.rb                                      |   1 +
 .../eu/siacs/conversations/ui/XmppActivity.java    |   2 +-
 .../conversations/ui/adapter/MessageAdapter.java   |  20 ++-
 src/main/res/drawable-hdpi/ic_launcher.png         | Bin 4581 -> 4636 bytes
 src/main/res/drawable-hdpi/ic_notification.png     | Bin 798 -> 806 bytes
 .../res/drawable-hdpi/ic_received_indicator.png    | Bin 560 -> 571 bytes
 src/main/res/drawable-hdpi/ic_send_cancel_away.png | Bin 1396 -> 1080 bytes
 src/main/res/drawable-hdpi/ic_send_cancel_dnd.png  | Bin 1587 -> 1234 bytes
 .../res/drawable-hdpi/ic_send_cancel_offline.png   | Bin 1206 -> 1000 bytes
 .../res/drawable-hdpi/ic_send_cancel_online.png    | Bin 1531 -> 1242 bytes
 .../res/drawable-hdpi/ic_send_location_away.png    | Bin 1159 -> 1130 bytes
 .../res/drawable-hdpi/ic_send_location_dnd.png     | Bin 1333 -> 1288 bytes
 .../res/drawable-hdpi/ic_send_location_offline.png | Bin 971 -> 968 bytes
 .../res/drawable-hdpi/ic_send_location_online.png  | Bin 1341 -> 1307 bytes
 src/main/res/drawable-hdpi/ic_send_photo_away.png  | Bin 1203 -> 1084 bytes
 src/main/res/drawable-hdpi/ic_send_photo_dnd.png   | Bin 1383 -> 1258 bytes
 .../res/drawable-hdpi/ic_send_photo_offline.png    | Bin 987 -> 948 bytes
 .../res/drawable-hdpi/ic_send_photo_online.png     | Bin 1400 -> 1279 bytes
 .../res/drawable-hdpi/ic_send_picture_away.png     | Bin 790 -> 741 bytes
 src/main/res/drawable-hdpi/ic_send_picture_dnd.png | Bin 884 -> 831 bytes
 .../res/drawable-hdpi/ic_send_picture_offline.png  | Bin 657 -> 663 bytes
 .../res/drawable-hdpi/ic_send_picture_online.png   | Bin 867 -> 823 bytes
 src/main/res/drawable-hdpi/ic_send_text_away.png   | Bin 982 -> 1050 bytes
 src/main/res/drawable-hdpi/ic_send_text_dnd.png    | Bin 1128 -> 1259 bytes
 .../res/drawable-hdpi/ic_send_text_offline.png     | Bin 800 -> 892 bytes
 src/main/res/drawable-hdpi/ic_send_text_online.png | Bin 1143 -> 1249 bytes
 src/main/res/drawable-hdpi/ic_send_voice_away.png  | Bin 1017 -> 996 bytes
 src/main/res/drawable-hdpi/ic_send_voice_dnd.png   | Bin 1161 -> 1159 bytes
 .../res/drawable-hdpi/ic_send_voice_offline.png    | Bin 844 -> 886 bytes
 .../res/drawable-hdpi/ic_send_voice_online.png     | Bin 1162 -> 1184 bytes
 .../drawable-hdpi/message_bubble_received.9.png    | Bin 765 -> 766 bytes
 .../message_bubble_received_warning.9.png          | Bin 757 -> 759 bytes
 .../message_bubble_received_white.9.png            | Bin 779 -> 766 bytes
 .../res/drawable-hdpi/message_bubble_sent.9.png    | Bin 687 -> 714 bytes
 .../drawable-hdpi/message_bubble_sent_white.9.png  | Bin 0 -> 676 bytes
 .../res/drawable-hdpi/switch_thumb_disable.png     | Bin 1926 -> 2240 bytes
 .../res/drawable-hdpi/switch_thumb_off_normal.png  | Bin 1949 -> 2273 bytes
 .../res/drawable-hdpi/switch_thumb_off_pressed.png | Bin 3478 -> 3057 bytes
 .../res/drawable-hdpi/switch_thumb_on_normal.png   | Bin 1920 -> 2249 bytes
 .../res/drawable-hdpi/switch_thumb_on_pressed.png  | Bin 3571 -> 3277 bytes
 src/main/res/drawable-mdpi/ic_launcher.png         | Bin 2841 -> 2870 bytes
 src/main/res/drawable-mdpi/ic_notification.png     | Bin 554 -> 553 bytes
 .../res/drawable-mdpi/ic_received_indicator.png    | Bin 402 -> 405 bytes
 src/main/res/drawable-mdpi/ic_send_cancel_away.png | Bin 901 -> 745 bytes
 src/main/res/drawable-mdpi/ic_send_cancel_dnd.png  | Bin 1025 -> 844 bytes
 .../res/drawable-mdpi/ic_send_cancel_offline.png   | Bin 837 -> 690 bytes
 .../res/drawable-mdpi/ic_send_cancel_online.png    | Bin 1052 -> 839 bytes
 .../res/drawable-mdpi/ic_send_location_away.png    | Bin 784 -> 759 bytes
 .../res/drawable-mdpi/ic_send_location_dnd.png     | Bin 917 -> 873 bytes
 .../res/drawable-mdpi/ic_send_location_offline.png | Bin 673 -> 681 bytes
 .../res/drawable-mdpi/ic_send_location_online.png  | Bin 919 -> 887 bytes
 src/main/res/drawable-mdpi/ic_send_photo_away.png  | Bin 776 -> 757 bytes
 src/main/res/drawable-mdpi/ic_send_photo_dnd.png   | Bin 915 -> 865 bytes
 .../res/drawable-mdpi/ic_send_photo_offline.png    | Bin 666 -> 643 bytes
 .../res/drawable-mdpi/ic_send_photo_online.png     | Bin 938 -> 860 bytes
 .../res/drawable-mdpi/ic_send_picture_away.png     | Bin 512 -> 533 bytes
 src/main/res/drawable-mdpi/ic_send_picture_dnd.png | Bin 585 -> 600 bytes
 .../res/drawable-mdpi/ic_send_picture_offline.png  | Bin 456 -> 488 bytes
 .../res/drawable-mdpi/ic_send_picture_online.png   | Bin 580 -> 607 bytes
 src/main/res/drawable-mdpi/ic_send_text_away.png   | Bin 677 -> 702 bytes
 src/main/res/drawable-mdpi/ic_send_text_dnd.png    | Bin 781 -> 811 bytes
 .../res/drawable-mdpi/ic_send_text_offline.png     | Bin 542 -> 597 bytes
 src/main/res/drawable-mdpi/ic_send_text_online.png | Bin 793 -> 822 bytes
 src/main/res/drawable-mdpi/ic_send_voice_away.png  | Bin 679 -> 667 bytes
 src/main/res/drawable-mdpi/ic_send_voice_dnd.png   | Bin 795 -> 770 bytes
 .../res/drawable-mdpi/ic_send_voice_offline.png    | Bin 575 -> 602 bytes
 .../res/drawable-mdpi/ic_send_voice_online.png     | Bin 788 -> 778 bytes
 .../drawable-mdpi/message_bubble_received.9.png    | Bin 594 -> 612 bytes
 .../message_bubble_received_warning.9.png          | Bin 598 -> 595 bytes
 .../message_bubble_received_white.9.png            | Bin 610 -> 612 bytes
 .../res/drawable-mdpi/message_bubble_sent.9.png    | Bin 558 -> 577 bytes
 .../drawable-mdpi/message_bubble_sent_white.9.png  | Bin 0 -> 541 bytes
 .../res/drawable-mdpi/switch_thumb_disable.png     | Bin 1239 -> 1432 bytes
 .../res/drawable-mdpi/switch_thumb_off_normal.png  | Bin 1267 -> 1437 bytes
 .../res/drawable-mdpi/switch_thumb_off_pressed.png | Bin 2233 -> 2233 bytes
 .../res/drawable-mdpi/switch_thumb_on_normal.png   | Bin 1256 -> 1447 bytes
 .../res/drawable-mdpi/switch_thumb_on_pressed.png  | Bin 2286 -> 2293 bytes
 src/main/res/drawable-xhdpi/ic_launcher.png        | Bin 6549 -> 6558 bytes
 src/main/res/drawable-xhdpi/ic_notification.png    | Bin 1075 -> 1079 bytes
 .../res/drawable-xhdpi/ic_received_indicator.png   | Bin 717 -> 705 bytes
 .../res/drawable-xhdpi/ic_send_cancel_away.png     | Bin 1724 -> 1376 bytes
 src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png | Bin 1958 -> 1526 bytes
 .../res/drawable-xhdpi/ic_send_cancel_offline.png  | Bin 1519 -> 1227 bytes
 .../res/drawable-xhdpi/ic_send_cancel_online.png   | Bin 1978 -> 1560 bytes
 .../res/drawable-xhdpi/ic_send_location_away.png   | Bin 1507 -> 1445 bytes
 .../res/drawable-xhdpi/ic_send_location_dnd.png    | Bin 1753 -> 1639 bytes
 .../drawable-xhdpi/ic_send_location_offline.png    | Bin 1278 -> 1249 bytes
 .../res/drawable-xhdpi/ic_send_location_online.png | Bin 1751 -> 1639 bytes
 src/main/res/drawable-xhdpi/ic_send_photo_away.png | Bin 1516 -> 1340 bytes
 src/main/res/drawable-xhdpi/ic_send_photo_dnd.png  | Bin 1756 -> 1552 bytes
 .../res/drawable-xhdpi/ic_send_photo_offline.png   | Bin 1247 -> 1180 bytes
 .../res/drawable-xhdpi/ic_send_photo_online.png    | Bin 1755 -> 1598 bytes
 .../res/drawable-xhdpi/ic_send_picture_away.png    | Bin 899 -> 860 bytes
 .../res/drawable-xhdpi/ic_send_picture_dnd.png     | Bin 1016 -> 952 bytes
 .../res/drawable-xhdpi/ic_send_picture_offline.png | Bin 799 -> 798 bytes
 .../res/drawable-xhdpi/ic_send_picture_online.png  | Bin 997 -> 956 bytes
 src/main/res/drawable-xhdpi/ic_send_text_away.png  | Bin 1270 -> 1150 bytes
 src/main/res/drawable-xhdpi/ic_send_text_dnd.png   | Bin 1430 -> 1180 bytes
 .../res/drawable-xhdpi/ic_send_text_offline.png    | Bin 1007 -> 1152 bytes
 .../res/drawable-xhdpi/ic_send_text_online.png     | Bin 1468 -> 1176 bytes
 src/main/res/drawable-xhdpi/ic_send_voice_away.png | Bin 1257 -> 1224 bytes
 src/main/res/drawable-xhdpi/ic_send_voice_dnd.png  | Bin 1419 -> 1388 bytes
 .../res/drawable-xhdpi/ic_send_voice_offline.png   | Bin 1075 -> 1083 bytes
 .../res/drawable-xhdpi/ic_send_voice_online.png    | Bin 1433 -> 1408 bytes
 .../drawable-xhdpi/message_bubble_received.9.png   | Bin 929 -> 930 bytes
 .../message_bubble_received_warning.9.png          | Bin 921 -> 914 bytes
 .../message_bubble_received_white.9.png            | Bin 935 -> 930 bytes
 .../res/drawable-xhdpi/message_bubble_sent.9.png   | Bin 857 -> 860 bytes
 .../drawable-xhdpi/message_bubble_sent_white.9.png | Bin 0 -> 816 bytes
 .../res/drawable-xhdpi/switch_thumb_disable.png    | Bin 2762 -> 3061 bytes
 .../res/drawable-xhdpi/switch_thumb_off_normal.png | Bin 2817 -> 3086 bytes
 .../drawable-xhdpi/switch_thumb_off_pressed.png    | Bin 5050 -> 4431 bytes
 .../res/drawable-xhdpi/switch_thumb_on_normal.png  | Bin 2789 -> 3075 bytes
 .../res/drawable-xhdpi/switch_thumb_on_pressed.png | Bin 5328 -> 4825 bytes
 src/main/res/drawable-xxhdpi/ic_launcher.png       | Bin 10495 -> 11098 bytes
 src/main/res/drawable-xxhdpi/ic_notification.png   | Bin 1618 -> 1573 bytes
 .../res/drawable-xxhdpi/ic_received_indicator.png  | Bin 1016 -> 1001 bytes
 .../res/drawable-xxhdpi/ic_send_cancel_away.png    | Bin 2583 -> 1884 bytes
 .../res/drawable-xxhdpi/ic_send_cancel_dnd.png     | Bin 2983 -> 1917 bytes
 .../res/drawable-xxhdpi/ic_send_cancel_offline.png | Bin 2290 -> 1894 bytes
 .../res/drawable-xxhdpi/ic_send_cancel_online.png  | Bin 2998 -> 1918 bytes
 .../res/drawable-xxhdpi/ic_send_location_away.png  | Bin 2229 -> 1863 bytes
 .../res/drawable-xxhdpi/ic_send_location_dnd.png   | Bin 2589 -> 1910 bytes
 .../drawable-xxhdpi/ic_send_location_offline.png   | Bin 1881 -> 1868 bytes
 .../drawable-xxhdpi/ic_send_location_online.png    | Bin 2605 -> 1914 bytes
 .../res/drawable-xxhdpi/ic_send_photo_away.png     | Bin 2256 -> 1779 bytes
 src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png | Bin 2618 -> 1891 bytes
 .../res/drawable-xxhdpi/ic_send_photo_offline.png  | Bin 1802 -> 1696 bytes
 .../res/drawable-xxhdpi/ic_send_photo_online.png   | Bin 2571 -> 1893 bytes
 .../res/drawable-xxhdpi/ic_send_picture_away.png   | Bin 1327 -> 1224 bytes
 .../res/drawable-xxhdpi/ic_send_picture_dnd.png    | Bin 1516 -> 1259 bytes
 .../drawable-xxhdpi/ic_send_picture_offline.png    | Bin 1159 -> 1237 bytes
 .../res/drawable-xxhdpi/ic_send_picture_online.png | Bin 1493 -> 1253 bytes
 src/main/res/drawable-xxhdpi/ic_send_text_away.png | Bin 1776 -> 1613 bytes
 src/main/res/drawable-xxhdpi/ic_send_text_dnd.png  | Bin 2005 -> 1643 bytes
 .../res/drawable-xxhdpi/ic_send_text_offline.png   | Bin 1410 -> 1628 bytes
 .../res/drawable-xxhdpi/ic_send_text_online.png    | Bin 2001 -> 1641 bytes
 .../res/drawable-xxhdpi/ic_send_voice_away.png     | Bin 1895 -> 1584 bytes
 src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png | Bin 2200 -> 1625 bytes
 .../res/drawable-xxhdpi/ic_send_voice_offline.png  | Bin 1621 -> 1599 bytes
 .../res/drawable-xxhdpi/ic_send_voice_online.png   | Bin 2183 -> 1628 bytes
 .../drawable-xxhdpi/message_bubble_received.9.png  | Bin 1334 -> 1371 bytes
 .../message_bubble_received_warning.9.png          | Bin 1308 -> 1308 bytes
 .../message_bubble_received_white.9.png            | Bin 1344 -> 1371 bytes
 .../res/drawable-xxhdpi/message_bubble_sent.9.png  | Bin 1190 -> 1210 bytes
 .../message_bubble_sent_white.9.png                | Bin 0 -> 1138 bytes
 .../res/drawable-xxhdpi/switch_thumb_disable.png   | Bin 4539 -> 5153 bytes
 .../drawable-xxhdpi/switch_thumb_off_normal.png    | Bin 4602 -> 5238 bytes
 .../drawable-xxhdpi/switch_thumb_off_pressed.png   | Bin 8315 -> 7494 bytes
 .../res/drawable-xxhdpi/switch_thumb_on_normal.png | Bin 4557 -> 5194 bytes
 .../drawable-xxhdpi/switch_thumb_on_pressed.png    | Bin 8899 -> 8104 bytes
 src/main/res/drawable-xxxhdpi/ic_launcher.png      | Bin 14630 -> 15230 bytes
 src/main/res/drawable-xxxhdpi/ic_notification.png  | Bin 2117 -> 2063 bytes
 .../res/drawable-xxxhdpi/ic_received_indicator.png | Bin 1303 -> 1302 bytes
 .../res/drawable-xxxhdpi/ic_send_cancel_away.png   | Bin 3377 -> 2628 bytes
 .../res/drawable-xxxhdpi/ic_send_cancel_dnd.png    | Bin 3862 -> 2676 bytes
 .../drawable-xxxhdpi/ic_send_cancel_offline.png    | Bin 2956 -> 2643 bytes
 .../res/drawable-xxxhdpi/ic_send_cancel_online.png | Bin 3835 -> 2670 bytes
 .../res/drawable-xxxhdpi/ic_send_location_away.png | Bin 3015 -> 2406 bytes
 .../res/drawable-xxxhdpi/ic_send_location_dnd.png  | Bin 3514 -> 2453 bytes
 .../drawable-xxxhdpi/ic_send_location_offline.png  | Bin 2523 -> 2394 bytes
 .../drawable-xxxhdpi/ic_send_location_online.png   | Bin 3514 -> 2459 bytes
 .../res/drawable-xxxhdpi/ic_send_photo_away.png    | Bin 3040 -> 2619 bytes
 .../res/drawable-xxxhdpi/ic_send_photo_dnd.png     | Bin 3569 -> 2804 bytes
 .../res/drawable-xxxhdpi/ic_send_photo_offline.png | Bin 2491 -> 2494 bytes
 .../res/drawable-xxxhdpi/ic_send_photo_online.png  | Bin 3566 -> 2802 bytes
 .../res/drawable-xxxhdpi/ic_send_picture_away.png  | Bin 1632 -> 1537 bytes
 .../res/drawable-xxxhdpi/ic_send_picture_dnd.png   | Bin 1784 -> 1576 bytes
 .../drawable-xxxhdpi/ic_send_picture_offline.png   | Bin 1428 -> 1543 bytes
 .../drawable-xxxhdpi/ic_send_picture_online.png    | Bin 1800 -> 1572 bytes
 .../res/drawable-xxxhdpi/ic_send_text_away.png     | Bin 2311 -> 2108 bytes
 src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png | Bin 2592 -> 2150 bytes
 .../res/drawable-xxxhdpi/ic_send_text_offline.png  | Bin 1862 -> 2132 bytes
 .../res/drawable-xxxhdpi/ic_send_text_online.png   | Bin 2708 -> 2155 bytes
 .../res/drawable-xxxhdpi/ic_send_voice_away.png    | Bin 2491 -> 2161 bytes
 .../res/drawable-xxxhdpi/ic_send_voice_dnd.png     | Bin 2849 -> 2216 bytes
 .../res/drawable-xxxhdpi/ic_send_voice_offline.png | Bin 2092 -> 2167 bytes
 .../res/drawable-xxxhdpi/ic_send_voice_online.png  | Bin 2868 -> 2221 bytes
 .../drawable-xxxhdpi/message_bubble_received.9.png | Bin 1714 -> 1735 bytes
 .../message_bubble_received_warning.9.png          | Bin 1674 -> 1671 bytes
 .../message_bubble_received_white.9.png            | Bin 1705 -> 1735 bytes
 .../res/drawable-xxxhdpi/message_bubble_sent.9.png | Bin 1499 -> 1540 bytes
 .../message_bubble_sent_white.9.png                | Bin 0 -> 1480 bytes
 .../res/drawable-xxxhdpi/switch_thumb_disable.png  | Bin 6854 -> 7355 bytes
 .../drawable-xxxhdpi/switch_thumb_off_normal.png   | Bin 7000 -> 7507 bytes
 .../drawable-xxxhdpi/switch_thumb_off_pressed.png  | Bin 11984 -> 10669 bytes
 .../drawable-xxxhdpi/switch_thumb_on_normal.png    | Bin 7037 -> 7589 bytes
 .../drawable-xxxhdpi/switch_thumb_on_pressed.png   | Bin 12753 -> 11630 bytes
 src/main/res/layout/ab_title.xml                   |   2 +-
 src/main/res/layout/fragment_conversation.xml      |   2 +-
 src/main/res/layout/message_received.xml           |   8 +-
 src/main/res/layout/message_sent.xml               |   8 +-
 src/main/res/values/colors.xml                     |  23 +--
 src/main/res/values/dimens.xml                     |   1 +
 198 files changed, 225 insertions(+), 53 deletions(-)
 create mode 100644 art/message_bubble_sent_white.svg
 create mode 100644 src/main/res/drawable-hdpi/message_bubble_sent_white.9.png
 create mode 100644 src/main/res/drawable-mdpi/message_bubble_sent_white.9.png
 create mode 100644 src/main/res/drawable-xhdpi/message_bubble_sent_white.9.png
 create mode 100644 src/main/res/drawable-xxhdpi/message_bubble_sent_white.9.png
 create mode 100644 src/main/res/drawable-xxxhdpi/message_bubble_sent_white.9.png

diff --git a/art/conversations_baloon.svg b/art/conversations_baloon.svg
index 96b17d2b4..ed69bc2fa 100644
--- a/art/conversations_baloon.svg
+++ b/art/conversations_baloon.svg
@@ -147,15 +147,15 @@
          inkscape:export-xdpi="100"
          transform="matrix(0.3835576,0,0,0.3835576,-246.60108,-156.11013)"
          id="g5317"
-         style="display:inline;fill:#00a000;fill-opacity:1">
+         style="display:inline;fill:#08183e;fill-opacity:1">
         <path
-           style="display:inline;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           style="display:inline;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
            d="m 1120.8042,772.36056 -118.0025,103.66316 118.5792,46.01918 c 8.4859,3.29325 19.6524,7.94481 27.2622,0.71376 7.3868,-7.01907 5.6502,-14.13839 3.0935,-24.54095 z"
            id="path5319"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ccsssc" />
         <circle
-           style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="circle5321"
            cx="883.16943"
            cy="677.19611"
@@ -171,7 +171,7 @@
          inkscape:connector-curvature="0"
          id="path6884"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -180,7 +180,7 @@
          inkscape:connector-curvature="0"
          id="path6888"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -189,7 +189,7 @@
          inkscape:connector-curvature="0"
          id="path6892"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -198,7 +198,7 @@
          inkscape:connector-curvature="0"
          id="path6896"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -207,7 +207,7 @@
          inkscape:connector-curvature="0"
          id="path6900"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -216,7 +216,7 @@
          inkscape:connector-curvature="0"
          id="path6904"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -225,7 +225,7 @@
          inkscape:connector-curvature="0"
          id="path6908"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <clipPath
        clipPathUnits="userSpaceOnUse"
@@ -234,7 +234,7 @@
          inkscape:connector-curvature="0"
          id="path6912"
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
     <filter
        inkscape:collect="always"
@@ -256,7 +256,7 @@
          inkscape:connector-curvature="0"
          id="path5747"
          d="M 99.908581,-2.3831968e-4 A 95.889392,95.889392 0 0 0 4.0199102,95.888436 95.889392,95.889392 0 0 0 99.908581,191.77906 95.889392,95.889392 0 0 0 142.61366,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 L 183.8285,142.24002 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.79921,95.888466 95.889392,95.889392 0 0 0 99.908581,-2.0831968e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
   </defs>
   <metadata
@@ -290,7 +290,7 @@
      inkscape:groupmode="layer"
      transform="translate(-4,2.6816348)">
     <path
-       style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;fill:#08183e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="M 104.88867,-1.9377566 A 95.889392,95.889392 0 0 0 8.9999996,93.950918 95.889392,95.889392 0 0 0 104.88867,189.84154 95.889392,95.889392 0 0 0 147.59375,179.76341 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 L 188.80859,140.3025 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 200.7793,93.950948 95.889392,95.889392 0 0 0 104.88867,-1.9377266 Z"
        id="circle6661"
        inkscape:connector-curvature="0" />
@@ -313,7 +313,7 @@
      style="display:inline"
      transform="translate(-4,2.6816164)">
     <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#2e417e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6910)"
        d="m 145.16406,11.183594 -5.13232,9.649402 c -0.77924,1.465076 -0.65974,2.41396 0.66876,3.18097 9.66686,5.488467 18.12303,12.874168 24.86104,21.711122 1.05534,1.616079 2.08054,1.713076 3.67763,0.571565 L 178.04883,40 C 169.45271,27.990203 158.19857,18.128379 145.16406,11.183594 Z"
        id="path7364"
@@ -321,7 +321,7 @@
        sodipodi:nodetypes="csccscc"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#2e417e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6906)"
        d="m 193.80469,75.615234 -9.62713,2.062751 c -2.66266,0.570512 -3.40763,1.172953 -2.90593,3.917433 0.85823,4.714633 1.30424,9.497137 1.33189,14.293254 -0.028,5.578758 -0.62194,11.137108 -1.77093,16.589918 -0.86591,3.23162 0.13682,3.77092 3.16149,4.58138 l 8.98639,2.30136 c 1.98177,-7.66828 3.00584,-15.55255 3.04883,-23.472658 -0.0187,-6.817681 -0.76446,-13.613926 -2.22461,-20.273438 z"
        id="path7366"
@@ -329,7 +329,7 @@
        sodipodi:nodetypes="csccccccc"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#2e417e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6902)"
        d="m 14.264281,102.76512 -10.2076406,0.87943 c 1.2093798,14.83154 5.8540346,29.17808 13.5664056,41.90429 l 8.544301,-5.23239 c 2.394983,-1.46665 1.895406,-3.37834 0.986202,-5.04513 -5.118253,-9.40257 -8.359018,-19.71635 -9.536202,-30.36553 0,-2.09418 -1.881577,-2.26744 -3.353066,-2.14067 z"
        id="path7372"
@@ -337,7 +337,7 @@
        sodipodi:nodetypes="sccsccs"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#2e417e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6898)"
        d="m 51.504371,166.60235 -5.82273,8.50898 c 12.710503,8.71282 27.333669,14.23394 42.630859,16.0957 l 1.220329,-9.90843 c 0.355066,-2.88295 -1.085712,-3.52946 -3.332252,-3.90256 -10.402329,-1.73697 -20.373956,-5.45322 -29.373754,-10.94516 -1.647505,-1.06744 -3.639993,-2.30718 -5.322452,0.15147 z"
        id="path7370"
@@ -345,7 +345,7 @@
        sodipodi:nodetypes="sccsccs"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#2e417e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6894)"
        d="M 32.208984,27.683594 C 21.779177,38.079001 13.883707,50.736882 9.1347656,64.675781 L 19.33617,68.090365 c 1.658147,0.55501 2.832564,-0.120955 3.374272,-1.591979 3.777598,-10.021698 9.470788,-19.210103 16.759132,-27.052307 1.561136,-1.561136 1.567283,-2.960058 0.447507,-4.076606 z"
        id="path7374"
@@ -353,7 +353,7 @@
        sodipodi:nodetypes="ccsccsc"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="opacity:1;fill:#2e417e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6890)"
        d="M 99.888672,-0.25 C 87.701045,-0.2239408 75.630114,2.1252837 64.322266,6.671875 l 3.530435,8.74898 c 1.063314,2.635062 1.616754,3.526314 4.973913,2.352259 8.692057,-3.031338 17.839027,-4.588849 27.062058,-4.599286 5.555828,0 6.486278,0.350026 6.780788,-3.4460223 l 0.74851,-9.64772758 C 104.9135,-0.12857239 102.40179,-0.23868346 99.888672,-0.25 Z"
        id="path7376"
@@ -361,7 +361,7 @@
        sodipodi:nodetypes="ccsccscc"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="display:inline;fill:#2e417e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6886)"
        d="m 138.72416,168.48439 c -4.17634,2.25458 -8.55959,4.09055 -13.0504,5.63418 -1.00363,0.34498 -1.20742,1.18222 -0.8682,2.27372 l 3.44056,11.0706 c 4.92985,-1.53124 9.72799,-3.45808 14.34766,-5.76172 l 0.12695,0.0137 14.0293,5.44532 4.12174,-10.20577 c 0.7548,-1.86894 -0.0184,-2.7016 -1.59462,-3.31324 l -14.72114,-5.71251 c -1.86679,-0.7244 -3.68834,-0.60144 -5.83185,0.55572 z"
        id="path5005"
@@ -369,7 +369,7 @@
        sodipodi:nodetypes="cssccccsssc"
        transform="translate(4.9999996,-1.9374999)" />
     <path
-       style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="display:inline;fill:#2e417e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        clip-path="url(#clipPath6882)"
        d="m 186.53125,152.80469 -10.6386,2.70888 c -0.78879,0.20085 -1.67397,1.02386 -1.35494,2.33801 l 9.75918,40.15428 c 8.56713,5.97538 15.30408,3.06731 11.01563,-9.47266 z"
        id="path5071"
diff --git a/art/message_bubble_received.svg b/art/message_bubble_received.svg
index 815892ed3..52e599f05 100644
--- a/art/message_bubble_received.svg
+++ b/art/message_bubble_received.svg
@@ -140,7 +140,7 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#4b9b4a;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#fafafa;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
       <path
          style="display:none"
          d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"
diff --git a/art/message_bubble_sent.svg b/art/message_bubble_sent.svg
index 90ad5091a..8a2212b81 100644
--- a/art/message_bubble_sent.svg
+++ b/art/message_bubble_sent.svg
@@ -140,7 +140,7 @@
      transform="translate(0,-2)">
     <g
        id="g3759"
-       style="fill:#fafafa;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+       style="fill:#e2e7f1;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
       <path
          style="display:none"
          d="M 28,18 C 26,16 24,12 24,8 l -4,10 z"
diff --git a/art/message_bubble_sent_white.svg b/art/message_bubble_sent_white.svg
new file mode 100644
index 000000000..05f97003f
--- /dev/null
+++ b/art/message_bubble_sent_white.svg
@@ -0,0 +1,165 @@
+<?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.48.5 r10040"
+   sodipodi:docname="message_bubble_sent.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="14.269338"
+     inkscape:cy="16.118802"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="989"
+     inkscape:window-height="755"
+     inkscape:window-x="434"
+     inkscape:window-y="16"
+     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:#ffffff;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+      <path
+         style="display:none"
+         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" />
+      <rect
+         ry="2"
+         y="4"
+         x="4"
+         height="20"
+         width="20"
+         id="rect2987" />
+    </g>
+  </g>
+</svg>
diff --git a/art/render.rb b/art/render.rb
index b3232819a..0acadfd82 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -49,6 +49,7 @@ images = {
 	'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_white.svg' => ['message_bubble_sent_white.9', 0],
 	}
 
 # Executable paths for Mac OSX
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index e54596b0d..b236c872d 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -371,7 +371,7 @@ public abstract class XmppActivity extends Activity {
 		mTertiaryTextColor = getResources().getColor(R.color.black12);
 		mColorRed = getResources().getColor(R.color.red800);
 		mColorOrange = getResources().getColor(R.color.orange500);
-		mColorGreen = getResources().getColor(R.color.green500);
+		mColorGreen = getResources().getColor(R.color.realgreen);
 		mPrimaryColor = getResources().getColor(R.color.primary);
 		mPrimaryBackgroundColor = getResources().getColor(R.color.grey50);
 		mSecondaryBackgroundColor = getResources().getColor(R.color.grey200);
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 36c6d3acf..d19a5cfec 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -124,9 +124,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
 	private int getMessageTextColor(boolean onDark, boolean primary) {
 		if (onDark) {
-			return activity.getResources().getColor(primary ? R.color.white : R.color.white70);
+			return activity.getResources().getColor(primary ? R.color.green900 : R.color.primary);
 		} else {
-			return activity.getResources().getColor(primary ? R.color.black87 : R.color.black54);
+			return activity.getResources().getColor(primary ? R.color.green900 : R.color.primary);
 		}
 	}
 
@@ -577,7 +577,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			}
 		}
 
-		boolean darkBackground = (type == RECEIVED && (!isInValidSession || !mUseWhiteBackground));
+		boolean darkBackground = (type == SENT && (!isInValidSession || !mUseWhiteBackground));
 
 		if (type == STATUS) {
 			if ("LOAD_MORE".equals(message.getBody())) {
@@ -705,11 +705,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
 		if (type == RECEIVED) {
 			if(isInValidSession) {
-				if (mUseWhiteBackground) {
-					viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_white);
-				} else {
-					viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received);
-				}
+				viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received);
 				viewHolder.encryption.setVisibility(View.GONE);
 			} else {
 				viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning);
@@ -718,6 +714,14 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			}
 		}
 
+		if (type == SENT) {
+			if (mUseWhiteBackground) {
+				viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_sent_white);
+			} else {
+				viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_sent);
+			}
+		}
+
 		displayStatus(viewHolder, message, type, darkBackground);
 
 		return view;
diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png
index 690400eb1..f6888b9c3 100644
Binary files a/src/main/res/drawable-hdpi/ic_launcher.png and b/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notification.png b/src/main/res/drawable-hdpi/ic_notification.png
index 31c0ee1ae..c466a7b1c 100644
Binary files a/src/main/res/drawable-hdpi/ic_notification.png and b/src/main/res/drawable-hdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-hdpi/ic_received_indicator.png b/src/main/res/drawable-hdpi/ic_received_indicator.png
index 4d2eab562..28760df82 100644
Binary files a/src/main/res/drawable-hdpi/ic_received_indicator.png and b/src/main/res/drawable-hdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_away.png b/src/main/res/drawable-hdpi/ic_send_cancel_away.png
index 9525c040f..e0275ed25 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_cancel_away.png and b/src/main/res/drawable-hdpi/ic_send_cancel_away.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png
index 83a7b94b2..576b2e173 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_offline.png b/src/main/res/drawable-hdpi/ic_send_cancel_offline.png
index 2cb4f4f38..d55220078 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_cancel_offline.png and b/src/main/res/drawable-hdpi/ic_send_cancel_offline.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_online.png b/src/main/res/drawable-hdpi/ic_send_cancel_online.png
index cb3bc3b56..0897d6457 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_cancel_online.png and b/src/main/res/drawable-hdpi/ic_send_cancel_online.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_location_away.png b/src/main/res/drawable-hdpi/ic_send_location_away.png
index d139818b4..c2d701758 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_location_away.png and b/src/main/res/drawable-hdpi/ic_send_location_away.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_location_dnd.png b/src/main/res/drawable-hdpi/ic_send_location_dnd.png
index a9c51317e..5563fc796 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_location_dnd.png and b/src/main/res/drawable-hdpi/ic_send_location_dnd.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_location_offline.png b/src/main/res/drawable-hdpi/ic_send_location_offline.png
index 4aec18af7..52044b0c1 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_location_offline.png and b/src/main/res/drawable-hdpi/ic_send_location_offline.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_location_online.png b/src/main/res/drawable-hdpi/ic_send_location_online.png
index 19ddc51e3..4bf038033 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_location_online.png and b/src/main/res/drawable-hdpi/ic_send_location_online.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_away.png b/src/main/res/drawable-hdpi/ic_send_photo_away.png
index f6beb23cb..48d75b17e 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_photo_away.png and b/src/main/res/drawable-hdpi/ic_send_photo_away.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_dnd.png b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png
index 15b1eb7a0..0b82c9f93 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_offline.png b/src/main/res/drawable-hdpi/ic_send_photo_offline.png
index 046f989b8..f0bfb0a5c 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_photo_offline.png and b/src/main/res/drawable-hdpi/ic_send_photo_offline.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_online.png b/src/main/res/drawable-hdpi/ic_send_photo_online.png
index 3fd20d10b..0bba8e8ed 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_photo_online.png and b/src/main/res/drawable-hdpi/ic_send_photo_online.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_away.png b/src/main/res/drawable-hdpi/ic_send_picture_away.png
index 09d1c7b7a..ad6ba7457 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_picture_away.png and b/src/main/res/drawable-hdpi/ic_send_picture_away.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_dnd.png b/src/main/res/drawable-hdpi/ic_send_picture_dnd.png
index 77964b5b5..0c72b5038 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_picture_dnd.png and b/src/main/res/drawable-hdpi/ic_send_picture_dnd.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline.png b/src/main/res/drawable-hdpi/ic_send_picture_offline.png
index 28135e25b..4ba239a13 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_picture_offline.png and b/src/main/res/drawable-hdpi/ic_send_picture_offline.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_online.png b/src/main/res/drawable-hdpi/ic_send_picture_online.png
index feb926c6f..ded22642b 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_picture_online.png and b/src/main/res/drawable-hdpi/ic_send_picture_online.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_text_away.png b/src/main/res/drawable-hdpi/ic_send_text_away.png
index d9ef99c56..324f05b64 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_text_away.png and b/src/main/res/drawable-hdpi/ic_send_text_away.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_text_dnd.png b/src/main/res/drawable-hdpi/ic_send_text_dnd.png
index b43428dec..0070c789d 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_text_dnd.png and b/src/main/res/drawable-hdpi/ic_send_text_dnd.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_text_offline.png b/src/main/res/drawable-hdpi/ic_send_text_offline.png
index 0f23fdbb0..62b375bd2 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_text_offline.png and b/src/main/res/drawable-hdpi/ic_send_text_offline.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_text_online.png b/src/main/res/drawable-hdpi/ic_send_text_online.png
index 305f1ec2f..06d12cf85 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_text_online.png and b/src/main/res/drawable-hdpi/ic_send_text_online.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_away.png b/src/main/res/drawable-hdpi/ic_send_voice_away.png
index e87d97510..1918e84b3 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_voice_away.png and b/src/main/res/drawable-hdpi/ic_send_voice_away.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_dnd.png b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png
index 26a89e8e3..9d985be2a 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_offline.png b/src/main/res/drawable-hdpi/ic_send_voice_offline.png
index 68ce48b8a..d46ec39f7 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_voice_offline.png and b/src/main/res/drawable-hdpi/ic_send_voice_offline.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_online.png b/src/main/res/drawable-hdpi/ic_send_voice_online.png
index bfd7dfa7b..eb79d41bd 100644
Binary files a/src/main/res/drawable-hdpi/ic_send_voice_online.png and b/src/main/res/drawable-hdpi/ic_send_voice_online.png differ
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 dfd857cb2..23a8dc926 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received.9.png and b/src/main/res/drawable-hdpi/message_bubble_received.9.png differ
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 fd07bc20c..32948d06d 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png differ
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 bec207983..23a8dc926 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png differ
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 10dc2e299..d00588cf5 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_sent.9.png and b/src/main/res/drawable-hdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_white.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_white.9.png
new file mode 100644
index 000000000..cd5d7e18b
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_sent_white.9.png differ
diff --git a/src/main/res/drawable-hdpi/switch_thumb_disable.png b/src/main/res/drawable-hdpi/switch_thumb_disable.png
index 1e9b151b6..0d7859352 100644
Binary files a/src/main/res/drawable-hdpi/switch_thumb_disable.png and b/src/main/res/drawable-hdpi/switch_thumb_disable.png differ
diff --git a/src/main/res/drawable-hdpi/switch_thumb_off_normal.png b/src/main/res/drawable-hdpi/switch_thumb_off_normal.png
index b7c1fc11a..7f01700d5 100644
Binary files a/src/main/res/drawable-hdpi/switch_thumb_off_normal.png and b/src/main/res/drawable-hdpi/switch_thumb_off_normal.png differ
diff --git a/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png
index ca6e49096..8dd7bfc91 100644
Binary files a/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png and b/src/main/res/drawable-hdpi/switch_thumb_off_pressed.png differ
diff --git a/src/main/res/drawable-hdpi/switch_thumb_on_normal.png b/src/main/res/drawable-hdpi/switch_thumb_on_normal.png
index cbcda5d47..af70b22f9 100644
Binary files a/src/main/res/drawable-hdpi/switch_thumb_on_normal.png and b/src/main/res/drawable-hdpi/switch_thumb_on_normal.png differ
diff --git a/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png
index 234b12dc4..9d80b02d1 100644
Binary files a/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png and b/src/main/res/drawable-hdpi/switch_thumb_on_pressed.png differ
diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png
index 9e076434e..0cdfdeddb 100644
Binary files a/src/main/res/drawable-mdpi/ic_launcher.png and b/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notification.png b/src/main/res/drawable-mdpi/ic_notification.png
index aafc54f54..fa35b7c10 100644
Binary files a/src/main/res/drawable-mdpi/ic_notification.png and b/src/main/res/drawable-mdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-mdpi/ic_received_indicator.png b/src/main/res/drawable-mdpi/ic_received_indicator.png
index 2ba92b698..9984cb0c3 100644
Binary files a/src/main/res/drawable-mdpi/ic_received_indicator.png and b/src/main/res/drawable-mdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_away.png b/src/main/res/drawable-mdpi/ic_send_cancel_away.png
index bbc86b45a..407d8886e 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_cancel_away.png and b/src/main/res/drawable-mdpi/ic_send_cancel_away.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png
index 750064469..2932e5220 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_offline.png b/src/main/res/drawable-mdpi/ic_send_cancel_offline.png
index 604dfefaf..1c4541abe 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_cancel_offline.png and b/src/main/res/drawable-mdpi/ic_send_cancel_offline.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_online.png b/src/main/res/drawable-mdpi/ic_send_cancel_online.png
index 1b0d1811f..9b67655c0 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_cancel_online.png and b/src/main/res/drawable-mdpi/ic_send_cancel_online.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_location_away.png b/src/main/res/drawable-mdpi/ic_send_location_away.png
index 821e80d25..4a88961ff 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_location_away.png and b/src/main/res/drawable-mdpi/ic_send_location_away.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_location_dnd.png b/src/main/res/drawable-mdpi/ic_send_location_dnd.png
index 3f4d6aa45..599e285b4 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_location_dnd.png and b/src/main/res/drawable-mdpi/ic_send_location_dnd.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_location_offline.png b/src/main/res/drawable-mdpi/ic_send_location_offline.png
index ff11a080f..683215eef 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_location_offline.png and b/src/main/res/drawable-mdpi/ic_send_location_offline.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_location_online.png b/src/main/res/drawable-mdpi/ic_send_location_online.png
index a0eb40189..942e1d259 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_location_online.png and b/src/main/res/drawable-mdpi/ic_send_location_online.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_away.png b/src/main/res/drawable-mdpi/ic_send_photo_away.png
index d9c1f2661..83e5f95b7 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_photo_away.png and b/src/main/res/drawable-mdpi/ic_send_photo_away.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_dnd.png b/src/main/res/drawable-mdpi/ic_send_photo_dnd.png
index 08033f633..b62c28e0b 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-mdpi/ic_send_photo_dnd.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_offline.png b/src/main/res/drawable-mdpi/ic_send_photo_offline.png
index f3e6e1fa4..5d1476961 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_photo_offline.png and b/src/main/res/drawable-mdpi/ic_send_photo_offline.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_online.png b/src/main/res/drawable-mdpi/ic_send_photo_online.png
index 0aaab38d8..6dc9cc1ad 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_photo_online.png and b/src/main/res/drawable-mdpi/ic_send_photo_online.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_away.png b/src/main/res/drawable-mdpi/ic_send_picture_away.png
index d3ebca535..3245ad438 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_picture_away.png and b/src/main/res/drawable-mdpi/ic_send_picture_away.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_dnd.png b/src/main/res/drawable-mdpi/ic_send_picture_dnd.png
index 1d293f20d..00bb7ce2b 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_picture_dnd.png and b/src/main/res/drawable-mdpi/ic_send_picture_dnd.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_offline.png b/src/main/res/drawable-mdpi/ic_send_picture_offline.png
index 95d5621e6..038581b51 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_picture_offline.png and b/src/main/res/drawable-mdpi/ic_send_picture_offline.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_online.png b/src/main/res/drawable-mdpi/ic_send_picture_online.png
index be4194d34..fc8bb8a3e 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_picture_online.png and b/src/main/res/drawable-mdpi/ic_send_picture_online.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_text_away.png b/src/main/res/drawable-mdpi/ic_send_text_away.png
index ddd983b56..ce069e2f2 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_text_away.png and b/src/main/res/drawable-mdpi/ic_send_text_away.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_text_dnd.png b/src/main/res/drawable-mdpi/ic_send_text_dnd.png
index c3d9e79a8..607b53384 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_text_dnd.png and b/src/main/res/drawable-mdpi/ic_send_text_dnd.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_text_offline.png b/src/main/res/drawable-mdpi/ic_send_text_offline.png
index 72b9da270..2e1d5b284 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_text_offline.png and b/src/main/res/drawable-mdpi/ic_send_text_offline.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_text_online.png b/src/main/res/drawable-mdpi/ic_send_text_online.png
index 86d1e3306..6f62555e0 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_text_online.png and b/src/main/res/drawable-mdpi/ic_send_text_online.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_away.png b/src/main/res/drawable-mdpi/ic_send_voice_away.png
index 943f690fe..3bffa7bab 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_voice_away.png and b/src/main/res/drawable-mdpi/ic_send_voice_away.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_dnd.png b/src/main/res/drawable-mdpi/ic_send_voice_dnd.png
index aaf8ff32c..fa3911e72 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-mdpi/ic_send_voice_dnd.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_offline.png b/src/main/res/drawable-mdpi/ic_send_voice_offline.png
index e6b2355fb..fa338bf07 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_voice_offline.png and b/src/main/res/drawable-mdpi/ic_send_voice_offline.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_online.png b/src/main/res/drawable-mdpi/ic_send_voice_online.png
index bd0e1f870..9ae91eeae 100644
Binary files a/src/main/res/drawable-mdpi/ic_send_voice_online.png and b/src/main/res/drawable-mdpi/ic_send_voice_online.png differ
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 9835a7361..e1362f5a1 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received.9.png and b/src/main/res/drawable-mdpi/message_bubble_received.9.png differ
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 ff8f80b69..3c4d8d0ca 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png differ
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 d7a3bb5dd..e1362f5a1 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png differ
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 596699bbe..77e523210 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_sent.9.png and b/src/main/res/drawable-mdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_white.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_white.9.png
new file mode 100644
index 000000000..e5f570bf5
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_sent_white.9.png differ
diff --git a/src/main/res/drawable-mdpi/switch_thumb_disable.png b/src/main/res/drawable-mdpi/switch_thumb_disable.png
index 968de345d..100bcace5 100644
Binary files a/src/main/res/drawable-mdpi/switch_thumb_disable.png and b/src/main/res/drawable-mdpi/switch_thumb_disable.png differ
diff --git a/src/main/res/drawable-mdpi/switch_thumb_off_normal.png b/src/main/res/drawable-mdpi/switch_thumb_off_normal.png
index 51fb4d7a2..264adafbf 100644
Binary files a/src/main/res/drawable-mdpi/switch_thumb_off_normal.png and b/src/main/res/drawable-mdpi/switch_thumb_off_normal.png differ
diff --git a/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png
index ca7884453..e04da146b 100644
Binary files a/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png and b/src/main/res/drawable-mdpi/switch_thumb_off_pressed.png differ
diff --git a/src/main/res/drawable-mdpi/switch_thumb_on_normal.png b/src/main/res/drawable-mdpi/switch_thumb_on_normal.png
index 6a93d5f75..f719b6b75 100644
Binary files a/src/main/res/drawable-mdpi/switch_thumb_on_normal.png and b/src/main/res/drawable-mdpi/switch_thumb_on_normal.png differ
diff --git a/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png
index e8d7bd0f0..499853306 100644
Binary files a/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png and b/src/main/res/drawable-mdpi/switch_thumb_on_pressed.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png
index c49b2cb11..2aae72e4d 100644
Binary files a/src/main/res/drawable-xhdpi/ic_launcher.png and b/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notification.png b/src/main/res/drawable-xhdpi/ic_notification.png
index 042d2cdaa..43daff659 100644
Binary files a/src/main/res/drawable-xhdpi/ic_notification.png and b/src/main/res/drawable-xhdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_received_indicator.png b/src/main/res/drawable-xhdpi/ic_received_indicator.png
index cf7c2bb85..fdef5f1f0 100644
Binary files a/src/main/res/drawable-xhdpi/ic_received_indicator.png and b/src/main/res/drawable-xhdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_away.png b/src/main/res/drawable-xhdpi/ic_send_cancel_away.png
index 44b5f0963..ed778caa3 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_cancel_away.png and b/src/main/res/drawable-xhdpi/ic_send_cancel_away.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png
index dde1b7076..e42503c7c 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_offline.png b/src/main/res/drawable-xhdpi/ic_send_cancel_offline.png
index 53a9ac909..563bfbeb0 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_cancel_offline.png and b/src/main/res/drawable-xhdpi/ic_send_cancel_offline.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_online.png b/src/main/res/drawable-xhdpi/ic_send_cancel_online.png
index 23a5f2632..d9cf6fd57 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_cancel_online.png and b/src/main/res/drawable-xhdpi/ic_send_cancel_online.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_away.png b/src/main/res/drawable-xhdpi/ic_send_location_away.png
index 0a5f3d54e..12ac326a8 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_location_away.png and b/src/main/res/drawable-xhdpi/ic_send_location_away.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xhdpi/ic_send_location_dnd.png
index 99c8ce36f..f195b5277 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_location_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_location_dnd.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_offline.png b/src/main/res/drawable-xhdpi/ic_send_location_offline.png
index 114ce01be..bbadff935 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_location_offline.png and b/src/main/res/drawable-xhdpi/ic_send_location_offline.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_online.png b/src/main/res/drawable-xhdpi/ic_send_location_online.png
index 17204eeab..32eb0e7dc 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_location_online.png and b/src/main/res/drawable-xhdpi/ic_send_location_online.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_away.png b/src/main/res/drawable-xhdpi/ic_send_photo_away.png
index 7ac674eac..bd84b65fe 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_photo_away.png and b/src/main/res/drawable-xhdpi/ic_send_photo_away.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png
index fc69cb416..b2900a2db 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_offline.png b/src/main/res/drawable-xhdpi/ic_send_photo_offline.png
index 6ef1e16a9..7d4205aa8 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_photo_offline.png and b/src/main/res/drawable-xhdpi/ic_send_photo_offline.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_online.png b/src/main/res/drawable-xhdpi/ic_send_photo_online.png
index f585ef98c..3df554b8f 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_photo_online.png and b/src/main/res/drawable-xhdpi/ic_send_photo_online.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_away.png b/src/main/res/drawable-xhdpi/ic_send_picture_away.png
index f9aa21dc8..6fa861ffa 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_picture_away.png and b/src/main/res/drawable-xhdpi/ic_send_picture_away.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png b/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png
index 95e4acce7..62e59308d 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_offline.png b/src/main/res/drawable-xhdpi/ic_send_picture_offline.png
index 75ff2fc4e..43c76f100 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_picture_offline.png and b/src/main/res/drawable-xhdpi/ic_send_picture_offline.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_online.png b/src/main/res/drawable-xhdpi/ic_send_picture_online.png
index 0f68d5f52..8bdf171f4 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_picture_online.png and b/src/main/res/drawable-xhdpi/ic_send_picture_online.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_away.png b/src/main/res/drawable-xhdpi/ic_send_text_away.png
index 41f223f6c..28533e2d8 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_text_away.png and b/src/main/res/drawable-xhdpi/ic_send_text_away.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xhdpi/ic_send_text_dnd.png
index 8b93ec109..e48d9f85e 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_text_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_text_dnd.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_offline.png b/src/main/res/drawable-xhdpi/ic_send_text_offline.png
index d0a98e5d0..0b6d42122 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_text_offline.png and b/src/main/res/drawable-xhdpi/ic_send_text_offline.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_online.png b/src/main/res/drawable-xhdpi/ic_send_text_online.png
index 91d240d24..b1cfd220a 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_text_online.png and b/src/main/res/drawable-xhdpi/ic_send_text_online.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_away.png b/src/main/res/drawable-xhdpi/ic_send_voice_away.png
index 34f8ea86f..08726984d 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_voice_away.png and b/src/main/res/drawable-xhdpi/ic_send_voice_away.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png
index 66b0c6771..cd5fd91e6 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_offline.png b/src/main/res/drawable-xhdpi/ic_send_voice_offline.png
index fc4cff1f1..057762a0a 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_voice_offline.png and b/src/main/res/drawable-xhdpi/ic_send_voice_offline.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_online.png b/src/main/res/drawable-xhdpi/ic_send_voice_online.png
index d2f03dd51..9678b9476 100644
Binary files a/src/main/res/drawable-xhdpi/ic_send_voice_online.png and b/src/main/res/drawable-xhdpi/ic_send_voice_online.png differ
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 c0eb47ebb..d8d49d768 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received.9.png differ
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 fe0324cee..0e4e8164b 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png differ
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 fdb6be0d1..d8d49d768 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png differ
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 cb5654b71..d99428f22 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_white.9.png
new file mode 100644
index 000000000..bd36e7e99
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_sent_white.9.png differ
diff --git a/src/main/res/drawable-xhdpi/switch_thumb_disable.png b/src/main/res/drawable-xhdpi/switch_thumb_disable.png
index 7f6773248..5b3605a0d 100644
Binary files a/src/main/res/drawable-xhdpi/switch_thumb_disable.png and b/src/main/res/drawable-xhdpi/switch_thumb_disable.png differ
diff --git a/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png
index 4199d322b..946010bcb 100644
Binary files a/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png and b/src/main/res/drawable-xhdpi/switch_thumb_off_normal.png differ
diff --git a/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png
index 2b86888f3..e2ba08533 100644
Binary files a/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png and b/src/main/res/drawable-xhdpi/switch_thumb_off_pressed.png differ
diff --git a/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png
index daa309900..42a303905 100644
Binary files a/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png and b/src/main/res/drawable-xhdpi/switch_thumb_on_normal.png differ
diff --git a/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png
index 6aab47c99..93dc9640f 100644
Binary files a/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png and b/src/main/res/drawable-xhdpi/switch_thumb_on_pressed.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png
index 873d4b140..9fe158e6f 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_launcher.png and b/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notification.png b/src/main/res/drawable-xxhdpi/ic_notification.png
index 42c62d327..c2ee5dec8 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_notification.png and b/src/main/res/drawable-xxhdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxhdpi/ic_received_indicator.png
index 5d1c9b876..b005778dc 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_received_indicator.png and b/src/main/res/drawable-xxhdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_away.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_away.png
index 07113f020..7637648f8 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_cancel_away.png and b/src/main/res/drawable-xxhdpi/ic_send_cancel_away.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png
index e68a912d7..e4dc33ff5 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png
index 10412faba..36ff197d0 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png and b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_online.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_online.png
index 6fa18239a..26f41db4b 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_cancel_online.png and b/src/main/res/drawable-xxhdpi/ic_send_cancel_online.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_away.png b/src/main/res/drawable-xxhdpi/ic_send_location_away.png
index 4fb370ff9..ffed411c1 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_location_away.png and b/src/main/res/drawable-xxhdpi/ic_send_location_away.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png
index 1773e62d2..634d8485a 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_offline.png b/src/main/res/drawable-xxhdpi/ic_send_location_offline.png
index b4317aae4..703ccf563 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_location_offline.png and b/src/main/res/drawable-xxhdpi/ic_send_location_offline.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_online.png b/src/main/res/drawable-xxhdpi/ic_send_location_online.png
index 10dfed811..b933eae94 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_location_online.png and b/src/main/res/drawable-xxhdpi/ic_send_location_online.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_away.png b/src/main/res/drawable-xxhdpi/ic_send_photo_away.png
index 78eea39e3..0b05d63de 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_photo_away.png and b/src/main/res/drawable-xxhdpi/ic_send_photo_away.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png
index fe33a1d0d..c9fab5523 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_offline.png b/src/main/res/drawable-xxhdpi/ic_send_photo_offline.png
index 6b41c3bd9..fccb5e896 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_photo_offline.png and b/src/main/res/drawable-xxhdpi/ic_send_photo_offline.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_online.png b/src/main/res/drawable-xxhdpi/ic_send_photo_online.png
index 1c8992c52..cc379bdc2 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_photo_online.png and b/src/main/res/drawable-xxhdpi/ic_send_photo_online.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_away.png b/src/main/res/drawable-xxhdpi/ic_send_picture_away.png
index 7898ed4fb..a1185f2cb 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_picture_away.png and b/src/main/res/drawable-xxhdpi/ic_send_picture_away.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png
index ccffabbef..c185e3bcf 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png b/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png
index 7b5687e42..bec7417cf 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png and b/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_online.png b/src/main/res/drawable-xxhdpi/ic_send_picture_online.png
index 82eab70c0..5d9a06fab 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_picture_online.png and b/src/main/res/drawable-xxhdpi/ic_send_picture_online.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_away.png b/src/main/res/drawable-xxhdpi/ic_send_text_away.png
index 2b2b07935..6ace0494d 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_text_away.png and b/src/main/res/drawable-xxhdpi/ic_send_text_away.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png
index 32f5e29c7..adb178fa2 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_offline.png b/src/main/res/drawable-xxhdpi/ic_send_text_offline.png
index 6bd9c414f..c8c769d20 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_text_offline.png and b/src/main/res/drawable-xxhdpi/ic_send_text_offline.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_online.png b/src/main/res/drawable-xxhdpi/ic_send_text_online.png
index cb6a2dba8..3d16ff43d 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_text_online.png and b/src/main/res/drawable-xxhdpi/ic_send_text_online.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_away.png b/src/main/res/drawable-xxhdpi/ic_send_voice_away.png
index b8b9e8079..fdaff7e23 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_voice_away.png and b/src/main/res/drawable-xxhdpi/ic_send_voice_away.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png
index 4a5b41040..afc516098 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_offline.png b/src/main/res/drawable-xxhdpi/ic_send_voice_offline.png
index 3d58f6994..249ef61d9 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_voice_offline.png and b/src/main/res/drawable-xxhdpi/ic_send_voice_offline.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_online.png b/src/main/res/drawable-xxhdpi/ic_send_voice_online.png
index 600371eb2..3436cd214 100644
Binary files a/src/main/res/drawable-xxhdpi/ic_send_voice_online.png and b/src/main/res/drawable-xxhdpi/ic_send_voice_online.png differ
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 10e784089..cb3c25724 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png differ
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 53ecbecf7..fa57f066d 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png differ
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 436a1bd32..cb3c25724 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png differ
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 f78425d21..b059b73c1 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_white.9.png
new file mode 100644
index 000000000..f56ab1b55
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/message_bubble_sent_white.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_disable.png b/src/main/res/drawable-xxhdpi/switch_thumb_disable.png
index db7c1df41..31a732c87 100644
Binary files a/src/main/res/drawable-xxhdpi/switch_thumb_disable.png and b/src/main/res/drawable-xxhdpi/switch_thumb_disable.png differ
diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png
index f747b5596..b37ba2d37 100644
Binary files a/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png and b/src/main/res/drawable-xxhdpi/switch_thumb_off_normal.png differ
diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png
index b9fe6d469..fc8ce48a8 100644
Binary files a/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png and b/src/main/res/drawable-xxhdpi/switch_thumb_off_pressed.png differ
diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png
index 881990248..360ce2bc8 100644
Binary files a/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png and b/src/main/res/drawable-xxhdpi/switch_thumb_on_normal.png differ
diff --git a/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png
index 7a4fed540..1bf47d1b5 100644
Binary files a/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png and b/src/main/res/drawable-xxhdpi/switch_thumb_on_pressed.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png
index baadfa780..148dac0cb 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_launcher.png and b/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png
index c3439f1a3..ee2f3a432 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_notification.png and b/src/main/res/drawable-xxxhdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png
index f35c8b442..858905953 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png and b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png
index a9340a886..3e290cbe7 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png
index 307ca8a0f..6570352a0 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png
index abd3af2c2..146a52d97 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png
index 80be8edfc..e2f586e43 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_away.png b/src/main/res/drawable-xxxhdpi/ic_send_location_away.png
index 0fab2554a..4a620e533 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_location_away.png and b/src/main/res/drawable-xxxhdpi/ic_send_location_away.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png
index e7f6fde74..6ffd778da 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_location_offline.png
index 2af75cde3..59b76b111 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_location_offline.png and b/src/main/res/drawable-xxxhdpi/ic_send_location_offline.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_online.png b/src/main/res/drawable-xxxhdpi/ic_send_location_online.png
index 2e54ef892..f17463b23 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_location_online.png and b/src/main/res/drawable-xxxhdpi/ic_send_location_online.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_away.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_away.png
index ba171ce13..1c52656a1 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_photo_away.png and b/src/main/res/drawable-xxxhdpi/ic_send_photo_away.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png
index 8a9b07005..7b2ced78d 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png
index e94e930dd..c9be9f167 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png and b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_online.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_online.png
index 1bf680ebb..cd5b63e7e 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_photo_online.png and b/src/main/res/drawable-xxxhdpi/ic_send_photo_online.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png
index 1daa8ecce..89d385023 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png and b/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png
index d8257aad0..49ab50ddc 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png
index d487709be..1c076db45 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png and b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png
index c095d7959..2f0f6504c 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png and b/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_away.png b/src/main/res/drawable-xxxhdpi/ic_send_text_away.png
index afcfa89d9..8d8a90be3 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_text_away.png and b/src/main/res/drawable-xxxhdpi/ic_send_text_away.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png
index b11cd6b62..28f83b032 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_text_offline.png
index b9122e454..da2046817 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_text_offline.png and b/src/main/res/drawable-xxxhdpi/ic_send_text_offline.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_online.png b/src/main/res/drawable-xxxhdpi/ic_send_text_online.png
index abec2e0b7..75c39af13 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_text_online.png and b/src/main/res/drawable-xxxhdpi/ic_send_text_online.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_away.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_away.png
index de1375e2f..0dde21a45 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_voice_away.png and b/src/main/res/drawable-xxxhdpi/ic_send_voice_away.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png
index 4ad9d389e..2fea78ead 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png and b/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png
index eec3d8f2b..19bd5bc20 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png and b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_online.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_online.png
index fcdfcb437..76d01ec17 100644
Binary files a/src/main/res/drawable-xxxhdpi/ic_send_voice_online.png and b/src/main/res/drawable-xxxhdpi/ic_send_voice_online.png differ
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 c474359ea..131efea2e 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png differ
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 1421768cc..0b2c686ed 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png differ
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 ee89b6706..131efea2e 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png differ
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 d34038d07..62cf4dfa9 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_white.9.png
new file mode 100644
index 000000000..3b840402a
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_sent_white.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png b/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png
index 3970168ca..da82453d4 100644
Binary files a/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png and b/src/main/res/drawable-xxxhdpi/switch_thumb_disable.png differ
diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png b/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png
index ea8d4f894..293867d62 100644
Binary files a/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png and b/src/main/res/drawable-xxxhdpi/switch_thumb_off_normal.png differ
diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png b/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png
index 84d667b13..4dcea8cfe 100644
Binary files a/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png and b/src/main/res/drawable-xxxhdpi/switch_thumb_off_pressed.png differ
diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png b/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png
index 06b190eb9..31ea33081 100644
Binary files a/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png and b/src/main/res/drawable-xxxhdpi/switch_thumb_on_normal.png differ
diff --git a/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png b/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png
index 79c30d1e5..2172d8e34 100644
Binary files a/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png and b/src/main/res/drawable-xxxhdpi/switch_thumb_on_pressed.png differ
diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml
index b6b7e5497..19a9be1e6 100644
--- a/src/main/res/layout/ab_title.xml
+++ b/src/main/res/layout/ab_title.xml
@@ -24,7 +24,7 @@
         android:layout_below="@android:id/text1"
         android:singleLine="true"
         android:textSize="12dp"
-        android:textColor="@color/black54"
+        android:textColor="@color/grey50"
         android:gravity="center_vertical"
         android:onClick="onClick"
         android:clickable="true"
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index a00dadf47..88f2cbb28 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -13,7 +13,7 @@
         android:layout_above="@+id/snackbar"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:background="@color/lightyellow"
+        android:background="@color/background_floating_material_light"
         android:divider="@null"
         android:dividerHeight="0dp"
         android:listSelector="@android:color/transparent"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 909cf78f8..2be8ada8c 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -56,8 +56,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web"
-                android:textColorLink="@color/white"
-                android:textColor="@color/white"
+                android:textColorLink="@color/green900"
+                android:textColor="@color/green900"
                 android:textColorHighlight="@color/grey800"
                 android:textSize="?attr/TextSizeBody" />
 
@@ -119,9 +119,9 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
-                    android:textColor="@color/white70"
+                    android:textColor="@color/primary_dark"
                     android:textSize="?attr/TextSizeInfo" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 9118b1846..dae361ef3 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -57,8 +57,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web"
-                android:textColorLink="@color/black87"
-                android:textColor="@color/black87"
+                android:textColorLink="@color/black54"
+                android:textColor="@color/black54"
                 android:textColorHighlight="@color/grey500"
                 android:textSize="?attr/TextSizeBody" />
 
@@ -89,7 +89,7 @@
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
                     android:text="@string/sending"
-                    android:textColor="@color/black54"
+                    android:textColor="@color/primary_dark"
                     android:textSize="?attr/TextSizeInfo" />
 
                 <ImageView
@@ -132,4 +132,4 @@
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 35f72d9aa..a4b43d589 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="primary">#ff259b24</color>
-	<color name="primary_dark">#ff0a7e07</color>
-	<color name="accent">#ff0091ea</color>
-	<color name="black87">#de000000</color>
-	<color name="black54">#8a000000</color>
-	<color name="black26">#42000000</color>
+	<color name="realgreen">#ff259b24</color>
+	<color name="primary">#ff2e4272</color>
+	<color name="primary_dark">#ff08183e</color>
+	<color name="green900">#ff000309</color>
+	<color name="accent">#ff2e4272</color>
+	<color name="black87">#de000309</color>
+	<color name="black54">#8a000309</color>
+	<color name="black26">#42000309</color>
 	<color name="black12">#1f000000</color>
-	<color name="white">#ffffffff</color>
-	<color name="white70">#b2ffffff</color>
-	<color name="grey50">#fffafafa</color>
+	<color name="white">#ffe2e7f1</color>
+	<color name="white70">#b2e2e7f1</color>
+	<color name="grey50">#fafafa</color>
 	<color name="lightyellow">#ffF7F2E0</color>
 	<color name="grey200">#ffeeeeee</color>
 	<color name="grey500">#ff9e9e9e</color>
@@ -17,5 +19,4 @@
 	<color name="red500">#fff44336</color>
 	<color name="red800">#ffc62828</color>
 	<color name="orange500">#ffff9800</color>
-	<color name="green500">#ff259b24</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 95e800557..006d43c2c 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -5,4 +5,5 @@
 	<dimen name="infocard_padding">16dp</dimen>
 	<dimen name="conversations_overview_width">288dp</dimen>
 	<dimen name="image_button_padding">8dp</dimen>
+	<dimen name="elv_touch_slop">64dp</dimen>
 </resources>
-- 
cgit v1.2.3