aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/res/drawable-hdpi/ic_edit_black_24dp.pngbin0 -> 326 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_cancel_away.pngbin529 -> 980 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_cancel_dnd.pngbin558 -> 1169 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_cancel_offline.pngbin485 -> 801 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_cancel_offline_white.pngbin0 -> 807 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_cancel_online.pngbin555 -> 1118 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_location_away.pngbin747 -> 928 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_location_dnd.pngbin811 -> 1088 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_location_offline.pngbin600 -> 744 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_location_offline_white.pngbin0 -> 768 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_location_online.pngbin812 -> 1027 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_photo_away.pngbin510 -> 777 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_photo_dnd.pngbin550 -> 898 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_photo_offline.pngbin430 -> 591 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_photo_offline_white.pngbin0 -> 597 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_photo_online.pngbin545 -> 837 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_picture_away.pngbin462 -> 591 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_picture_dnd.pngbin516 -> 691 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_picture_offline.pngbin405 -> 488 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_picture_offline_white.pngbin0 -> 497 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_picture_online.pngbin499 -> 670 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_text_away.pngbin678 -> 939 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_text_dnd.pngbin774 -> 1112 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_text_offline.pngbin522 -> 723 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_text_offline_white.pngbin0 -> 767 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_text_online.pngbin744 -> 1043 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_videocam_away.pngbin0 -> 342 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_videocam_dnd.pngbin0 -> 397 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_videocam_offline.pngbin0 -> 292 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_videocam_offline_white.pngbin0 -> 298 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_videocam_online.pngbin0 -> 384 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_voice_away.pngbin659 -> 774 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_voice_dnd.pngbin748 -> 908 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_voice_offline.pngbin537 -> 620 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_voice_offline_white.pngbin0 -> 628 bytes
-rw-r--r--src/main/res/drawable-hdpi/ic_send_voice_online.pngbin735 -> 862 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_edit_black_24dp.pngbin0 -> 165 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_cancel_away.pngbin381 -> 491 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_cancel_dnd.pngbin411 -> 549 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_cancel_offline.pngbin333 -> 389 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_cancel_offline_white.pngbin0 -> 394 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_cancel_online.pngbin411 -> 554 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_location_away.pngbin472 -> 497 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_location_dnd.pngbin535 -> 591 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_location_offline.pngbin388 -> 402 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_location_offline_white.pngbin0 -> 414 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_location_online.pngbin516 -> 564 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_photo_away.pngbin358 -> 423 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_photo_dnd.pngbin384 -> 491 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_photo_offline.pngbin300 -> 345 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_photo_offline_white.pngbin0 -> 351 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_photo_online.pngbin377 -> 455 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_picture_away.pngbin328 -> 354 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_picture_dnd.pngbin357 -> 391 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_picture_offline.pngbin275 -> 285 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_picture_offline_white.pngbin0 -> 291 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_picture_online.pngbin354 -> 383 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_text_away.pngbin490 -> 490 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_text_dnd.pngbin550 -> 554 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_text_offline.pngbin385 -> 376 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_text_offline_white.pngbin0 -> 405 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_text_online.pngbin534 -> 534 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_videocam_away.pngbin0 -> 217 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_videocam_dnd.pngbin0 -> 242 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_videocam_offline.pngbin0 -> 198 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_videocam_offline_white.pngbin0 -> 203 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_videocam_online.pngbin0 -> 247 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_voice_away.pngbin408 -> 424 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_voice_dnd.pngbin458 -> 495 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_voice_offline.pngbin334 -> 341 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_voice_offline_white.pngbin0 -> 354 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_send_voice_online.pngbin445 -> 484 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_edit_black_24dp.pngbin0 -> 238 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_cancel_away.pngbin724 -> 985 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_cancel_dnd.pngbin765 -> 1137 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_cancel_offline.pngbin633 -> 799 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.pngbin0 -> 802 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_cancel_online.pngbin769 -> 1039 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_location_away.pngbin853 -> 943 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_location_dnd.pngbin943 -> 1086 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_location_offline.pngbin701 -> 747 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_location_offline_white.pngbin0 -> 789 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_location_online.pngbin917 -> 1041 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_photo_away.pngbin636 -> 871 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_photo_dnd.pngbin689 -> 964 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_photo_offline.pngbin539 -> 695 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_photo_offline_white.pngbin0 -> 696 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_photo_online.pngbin672 -> 945 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_picture_away.pngbin573 -> 619 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_picture_dnd.pngbin633 -> 714 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_picture_offline.pngbin486 -> 516 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_picture_offline_white.pngbin0 -> 523 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_picture_online.pngbin613 -> 694 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_text_away.pngbin755 -> 848 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_text_dnd.pngbin758 -> 972 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_text_offline.pngbin694 -> 649 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_text_offline_white.pngbin0 -> 719 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_text_online.pngbin755 -> 917 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_videocam_away.pngbin0 -> 307 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_videocam_dnd.pngbin0 -> 325 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_videocam_offline.pngbin0 -> 282 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_videocam_offline_white.pngbin0 -> 284 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_videocam_online.pngbin0 -> 336 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_voice_away.pngbin771 -> 825 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_voice_dnd.pngbin869 -> 944 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_voice_offline.pngbin654 -> 677 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_voice_offline_white.pngbin0 -> 699 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_send_voice_online.pngbin845 -> 934 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_edit_black_24dp.pngbin0 -> 453 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_cancel_away.pngbin1116 -> 1953 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.pngbin1119 -> 2361 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_cancel_offline.pngbin1101 -> 1626 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.pngbin0 -> 1630 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_cancel_online.pngbin1117 -> 2138 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_location_away.pngbin1161 -> 1753 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_location_dnd.pngbin1163 -> 2046 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_location_offline.pngbin1106 -> 1405 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_location_offline_white.pngbin0 -> 1415 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_location_online.pngbin1161 -> 1954 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_photo_away.pngbin931 -> 1631 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_photo_dnd.pngbin945 -> 1866 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_photo_offline.pngbin873 -> 1286 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.pngbin0 -> 1288 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_photo_online.pngbin938 -> 1827 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_picture_away.pngbin788 -> 1199 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_picture_dnd.pngbin792 -> 1378 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_picture_offline.pngbin768 -> 1020 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.pngbin0 -> 1026 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_picture_online.pngbin790 -> 1324 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_text_away.pngbin1050 -> 1688 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_text_dnd.pngbin1051 -> 1953 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_text_offline.pngbin987 -> 1322 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_text_offline_white.pngbin0 -> 1361 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_text_online.pngbin1050 -> 1878 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_videocam_away.pngbin0 -> 609 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.pngbin0 -> 667 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_videocam_offline.pngbin0 -> 542 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_videocam_offline_white.pngbin0 -> 546 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_videocam_online.pngbin0 -> 645 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_voice_away.pngbin1043 -> 1565 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_voice_dnd.pngbin1045 -> 1816 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_voice_offline.pngbin1009 -> 1276 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.pngbin0 -> 1303 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_send_voice_online.pngbin1044 -> 1731 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.pngbin0 -> 410 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_cancel_away.pngbin1620 -> 2189 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.pngbin1622 -> 2363 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.pngbin1569 -> 1762 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.pngbin0 -> 1799 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_cancel_online.pngbin1620 -> 2283 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_location_away.pngbin1530 -> 2019 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_location_dnd.pngbin1533 -> 2189 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_location_offline.pngbin1474 -> 1615 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.pngbin0 -> 1661 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_location_online.pngbin1529 -> 2131 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_photo_away.pngbin1417 -> 1981 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.pngbin1429 -> 2123 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_photo_offline.pngbin1302 -> 1614 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.pngbin0 -> 1596 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_photo_online.pngbin1445 -> 2067 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_picture_away.pngbin1051 -> 1230 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.pngbin1051 -> 1307 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_picture_offline.pngbin1020 -> 1034 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.pngbin0 -> 1067 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_picture_online.pngbin1050 -> 1296 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_text_away.pngbin1421 -> 1475 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_text_dnd.pngbin1425 -> 1629 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_text_offline.pngbin1351 -> 1137 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.pngbin0 -> 1228 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_text_online.pngbin1422 -> 1567 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_videocam_away.pngbin0 -> 630 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.pngbin0 -> 663 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_videocam_offline.pngbin0 -> 558 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_videocam_offline_white.pngbin0 -> 565 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_videocam_online.pngbin0 -> 652 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_voice_away.pngbin1447 -> 1792 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.pngbin1449 -> 1939 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_voice_offline.pngbin1407 -> 1463 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.pngbin0 -> 1500 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_send_voice_online.pngbin1446 -> 1878 bytes
-rw-r--r--src/main/res/layout/activity_muc_details.xml3
-rw-r--r--src/main/res/values/attrs.xml14
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/values/themes.xml80
-rw-r--r--src/main/res/xml/preferences.xml2
185 files changed, 56 insertions, 45 deletions
diff --git a/src/main/res/drawable-hdpi/ic_edit_black_24dp.png b/src/main/res/drawable-hdpi/ic_edit_black_24dp.png
new file mode 100644
index 000000000..637c1a25e
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_edit_black_24dp.png
Binary files 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 15dd15dda..3d3e21093 100644
--- a/src/main/res/drawable-hdpi/ic_send_cancel_away.png
+++ b/src/main/res/drawable-hdpi/ic_send_cancel_away.png
Binary files 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 a032e2fa7..b3d7dff55 100644
--- a/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png
Binary files 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 be5fe586c..9f1629363 100644
--- a/src/main/res/drawable-hdpi/ic_send_cancel_offline.png
+++ b/src/main/res/drawable-hdpi/ic_send_cancel_offline.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 000000000..7c8ff0018
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png
Binary files 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 4ffbfe66d..e9a2fff6a 100644
--- a/src/main/res/drawable-hdpi/ic_send_cancel_online.png
+++ b/src/main/res/drawable-hdpi/ic_send_cancel_online.png
Binary files 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 f8305bd87..62a833e1a 100644
--- a/src/main/res/drawable-hdpi/ic_send_location_away.png
+++ b/src/main/res/drawable-hdpi/ic_send_location_away.png
Binary files 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 eb492b7e1..5e4b0aefb 100644
--- a/src/main/res/drawable-hdpi/ic_send_location_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_location_dnd.png
Binary files 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 dfe26a74c..4df6df07c 100644
--- a/src/main/res/drawable-hdpi/ic_send_location_offline.png
+++ b/src/main/res/drawable-hdpi/ic_send_location_offline.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_location_offline_white.png b/src/main/res/drawable-hdpi/ic_send_location_offline_white.png
new file mode 100644
index 000000000..87b8d771e
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_location_offline_white.png
Binary files 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 c3785c190..39741dc0f 100644
--- a/src/main/res/drawable-hdpi/ic_send_location_online.png
+++ b/src/main/res/drawable-hdpi/ic_send_location_online.png
Binary files 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 5111d1914..9a401295a 100644
--- a/src/main/res/drawable-hdpi/ic_send_photo_away.png
+++ b/src/main/res/drawable-hdpi/ic_send_photo_away.png
Binary files 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 6ae1c969e..d651d7c8f 100644
--- a/src/main/res/drawable-hdpi/ic_send_photo_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png
Binary files 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 7946402e7..53d682621 100644
--- a/src/main/res/drawable-hdpi/ic_send_photo_offline.png
+++ b/src/main/res/drawable-hdpi/ic_send_photo_offline.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png
new file mode 100644
index 000000000..a01c7150b
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png
Binary files 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 7ac1551a3..6d7cd6949 100644
--- a/src/main/res/drawable-hdpi/ic_send_photo_online.png
+++ b/src/main/res/drawable-hdpi/ic_send_photo_online.png
Binary files 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 d58d5582b..64332fdd4 100644
--- a/src/main/res/drawable-hdpi/ic_send_picture_away.png
+++ b/src/main/res/drawable-hdpi/ic_send_picture_away.png
Binary files 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 407a535ed..b3811fdc3 100644
--- a/src/main/res/drawable-hdpi/ic_send_picture_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_picture_dnd.png
Binary files 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 e14135fa7..7139c2d7d 100644
--- a/src/main/res/drawable-hdpi/ic_send_picture_offline.png
+++ b/src/main/res/drawable-hdpi/ic_send_picture_offline.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png
new file mode 100644
index 000000000..326c3550d
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png
Binary files 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 acbf78632..90de0274e 100644
--- a/src/main/res/drawable-hdpi/ic_send_picture_online.png
+++ b/src/main/res/drawable-hdpi/ic_send_picture_online.png
Binary files 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 d7b6077be..21d7a46bc 100644
--- a/src/main/res/drawable-hdpi/ic_send_text_away.png
+++ b/src/main/res/drawable-hdpi/ic_send_text_away.png
Binary files 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 11a3025a1..164f9ab4c 100644
--- a/src/main/res/drawable-hdpi/ic_send_text_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_text_dnd.png
Binary files 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 38108180a..9f607eb53 100644
--- a/src/main/res/drawable-hdpi/ic_send_text_offline.png
+++ b/src/main/res/drawable-hdpi/ic_send_text_offline.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_text_offline_white.png b/src/main/res/drawable-hdpi/ic_send_text_offline_white.png
new file mode 100644
index 000000000..b81a91045
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_text_offline_white.png
Binary files 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 9c18937fa..2370783fd 100644
--- a/src/main/res/drawable-hdpi/ic_send_text_online.png
+++ b/src/main/res/drawable-hdpi/ic_send_text_online.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_away.png b/src/main/res/drawable-hdpi/ic_send_videocam_away.png
new file mode 100644
index 000000000..950db9d9e
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_videocam_away.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-hdpi/ic_send_videocam_dnd.png
new file mode 100644
index 000000000..8a3588678
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_videocam_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_offline.png b/src/main/res/drawable-hdpi/ic_send_videocam_offline.png
new file mode 100644
index 000000000..84b0ef574
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_videocam_offline.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_offline_white.png b/src/main/res/drawable-hdpi/ic_send_videocam_offline_white.png
new file mode 100644
index 000000000..ccdbe8c9a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_videocam_offline_white.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_videocam_online.png b/src/main/res/drawable-hdpi/ic_send_videocam_online.png
new file mode 100644
index 000000000..d0907d211
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_videocam_online.png
Binary files 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 958fdc313..f9babe72b 100644
--- a/src/main/res/drawable-hdpi/ic_send_voice_away.png
+++ b/src/main/res/drawable-hdpi/ic_send_voice_away.png
Binary files 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 097ee5874..2f0ba69b3 100644
--- a/src/main/res/drawable-hdpi/ic_send_voice_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png
Binary files 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 0486b5c43..9fc551450 100644
--- a/src/main/res/drawable-hdpi/ic_send_voice_offline.png
+++ b/src/main/res/drawable-hdpi/ic_send_voice_offline.png
Binary files differ
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png
new file mode 100644
index 000000000..ae57f52cb
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png
Binary files 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 eea41450e..89db7dd45 100644
--- a/src/main/res/drawable-hdpi/ic_send_voice_online.png
+++ b/src/main/res/drawable-hdpi/ic_send_voice_online.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_black_24dp.png b/src/main/res/drawable-mdpi/ic_edit_black_24dp.png
new file mode 100644
index 000000000..365d70d2f
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_edit_black_24dp.png
Binary files 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 625bf3d6d..81e6a62b8 100644
--- a/src/main/res/drawable-mdpi/ic_send_cancel_away.png
+++ b/src/main/res/drawable-mdpi/ic_send_cancel_away.png
Binary files 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 b3a935258..1f03b7c89 100644
--- a/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_cancel_dnd.png
Binary files 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 dba66f79b..f97addc9b 100644
--- a/src/main/res/drawable-mdpi/ic_send_cancel_offline.png
+++ b/src/main/res/drawable-mdpi/ic_send_cancel_offline.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 000000000..17f74ee28
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png
Binary files 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 9e94d53a2..68de9dfc8 100644
--- a/src/main/res/drawable-mdpi/ic_send_cancel_online.png
+++ b/src/main/res/drawable-mdpi/ic_send_cancel_online.png
Binary files 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 30c0372a7..38f1db8e8 100644
--- a/src/main/res/drawable-mdpi/ic_send_location_away.png
+++ b/src/main/res/drawable-mdpi/ic_send_location_away.png
Binary files 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 8fb9a5307..d84f3d3fe 100644
--- a/src/main/res/drawable-mdpi/ic_send_location_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_location_dnd.png
Binary files 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 e4c0d7ec2..2fdbb50df 100644
--- a/src/main/res/drawable-mdpi/ic_send_location_offline.png
+++ b/src/main/res/drawable-mdpi/ic_send_location_offline.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_location_offline_white.png b/src/main/res/drawable-mdpi/ic_send_location_offline_white.png
new file mode 100644
index 000000000..57bdfb8a9
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_location_offline_white.png
Binary files 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 d818cabdb..8aa56ae3f 100644
--- a/src/main/res/drawable-mdpi/ic_send_location_online.png
+++ b/src/main/res/drawable-mdpi/ic_send_location_online.png
Binary files 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 2ad0a9f94..31b3cb767 100644
--- a/src/main/res/drawable-mdpi/ic_send_photo_away.png
+++ b/src/main/res/drawable-mdpi/ic_send_photo_away.png
Binary files 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 51dba5cbc..9e895ce82 100644
--- a/src/main/res/drawable-mdpi/ic_send_photo_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_photo_dnd.png
Binary files 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 31ece3880..87127f50c 100644
--- a/src/main/res/drawable-mdpi/ic_send_photo_offline.png
+++ b/src/main/res/drawable-mdpi/ic_send_photo_offline.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png
new file mode 100644
index 000000000..766234b0f
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png
Binary files 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 01689023a..6056f27bc 100644
--- a/src/main/res/drawable-mdpi/ic_send_photo_online.png
+++ b/src/main/res/drawable-mdpi/ic_send_photo_online.png
Binary files 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 52604b06b..cb46fb856 100644
--- a/src/main/res/drawable-mdpi/ic_send_picture_away.png
+++ b/src/main/res/drawable-mdpi/ic_send_picture_away.png
Binary files 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 a84350247..d366debcf 100644
--- a/src/main/res/drawable-mdpi/ic_send_picture_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_picture_dnd.png
Binary files 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 24863c526..6d8d6675f 100644
--- a/src/main/res/drawable-mdpi/ic_send_picture_offline.png
+++ b/src/main/res/drawable-mdpi/ic_send_picture_offline.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png
new file mode 100644
index 000000000..ae4228bc8
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png
Binary files 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 eaf038a3e..379c60a80 100644
--- a/src/main/res/drawable-mdpi/ic_send_picture_online.png
+++ b/src/main/res/drawable-mdpi/ic_send_picture_online.png
Binary files 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 3be019f0c..354389ddb 100644
--- a/src/main/res/drawable-mdpi/ic_send_text_away.png
+++ b/src/main/res/drawable-mdpi/ic_send_text_away.png
Binary files 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 8033ecc1d..82eec56a9 100644
--- a/src/main/res/drawable-mdpi/ic_send_text_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_text_dnd.png
Binary files 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 4e3a1ea3c..b43919283 100644
--- a/src/main/res/drawable-mdpi/ic_send_text_offline.png
+++ b/src/main/res/drawable-mdpi/ic_send_text_offline.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_text_offline_white.png b/src/main/res/drawable-mdpi/ic_send_text_offline_white.png
new file mode 100644
index 000000000..5868ea553
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_text_offline_white.png
Binary files 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 2cf97fb37..17d753539 100644
--- a/src/main/res/drawable-mdpi/ic_send_text_online.png
+++ b/src/main/res/drawable-mdpi/ic_send_text_online.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_away.png b/src/main/res/drawable-mdpi/ic_send_videocam_away.png
new file mode 100644
index 000000000..55399ac8d
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_videocam_away.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-mdpi/ic_send_videocam_dnd.png
new file mode 100644
index 000000000..608947d59
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_videocam_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_offline.png b/src/main/res/drawable-mdpi/ic_send_videocam_offline.png
new file mode 100644
index 000000000..74a53ec66
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_videocam_offline.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_offline_white.png b/src/main/res/drawable-mdpi/ic_send_videocam_offline_white.png
new file mode 100644
index 000000000..28528ded8
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_videocam_offline_white.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_videocam_online.png b/src/main/res/drawable-mdpi/ic_send_videocam_online.png
new file mode 100644
index 000000000..45dd34b29
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_videocam_online.png
Binary files 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 ab5be2b54..19d0b770a 100644
--- a/src/main/res/drawable-mdpi/ic_send_voice_away.png
+++ b/src/main/res/drawable-mdpi/ic_send_voice_away.png
Binary files 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 2c7e3b6b0..6b8fa5de3 100644
--- a/src/main/res/drawable-mdpi/ic_send_voice_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_send_voice_dnd.png
Binary files 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 2dc0b0ce0..e95a9a712 100644
--- a/src/main/res/drawable-mdpi/ic_send_voice_offline.png
+++ b/src/main/res/drawable-mdpi/ic_send_voice_offline.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png
new file mode 100644
index 000000000..07f8fe347
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png
Binary files 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 e362e863d..88fc590e1 100644
--- a/src/main/res/drawable-mdpi/ic_send_voice_online.png
+++ b/src/main/res/drawable-mdpi/ic_send_voice_online.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png
new file mode 100644
index 000000000..e7e79bbbf
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png
Binary files 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 275accf4a..7c42c5c5a 100644
--- a/src/main/res/drawable-xhdpi/ic_send_cancel_away.png
+++ b/src/main/res/drawable-xhdpi/ic_send_cancel_away.png
Binary files 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 b8140c483..380b280e1 100644
--- a/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png
Binary files 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 1618023e7..5f3737d07 100644
--- a/src/main/res/drawable-xhdpi/ic_send_cancel_offline.png
+++ b/src/main/res/drawable-xhdpi/ic_send_cancel_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 000000000..61d52de30
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png
Binary files 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 6b792e7ea..9ee51a542 100644
--- a/src/main/res/drawable-xhdpi/ic_send_cancel_online.png
+++ b/src/main/res/drawable-xhdpi/ic_send_cancel_online.png
Binary files 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 c67205403..c6f6a54f8 100644
--- a/src/main/res/drawable-xhdpi/ic_send_location_away.png
+++ b/src/main/res/drawable-xhdpi/ic_send_location_away.png
Binary files 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 f51e17746..7ceac39be 100644
--- a/src/main/res/drawable-xhdpi/ic_send_location_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_location_dnd.png
Binary files 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 e5c8af0ab..c45bd81dc 100644
--- a/src/main/res/drawable-xhdpi/ic_send_location_offline.png
+++ b/src/main/res/drawable-xhdpi/ic_send_location_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png
new file mode 100644
index 000000000..0575619f6
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png
Binary files 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 cd3bff1dd..013c36c73 100644
--- a/src/main/res/drawable-xhdpi/ic_send_location_online.png
+++ b/src/main/res/drawable-xhdpi/ic_send_location_online.png
Binary files 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 919136cfb..411252bb3 100644
--- a/src/main/res/drawable-xhdpi/ic_send_photo_away.png
+++ b/src/main/res/drawable-xhdpi/ic_send_photo_away.png
Binary files 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 086297d6e..43d869a84 100644
--- a/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_photo_dnd.png
Binary files 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 75718eb01..312a798da 100644
--- a/src/main/res/drawable-xhdpi/ic_send_photo_offline.png
+++ b/src/main/res/drawable-xhdpi/ic_send_photo_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 000000000..20ca96348
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png
Binary files 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 3468156e6..700063967 100644
--- a/src/main/res/drawable-xhdpi/ic_send_photo_online.png
+++ b/src/main/res/drawable-xhdpi/ic_send_photo_online.png
Binary files 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 ed67aefa4..48894bbfe 100644
--- a/src/main/res/drawable-xhdpi/ic_send_picture_away.png
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_away.png
Binary files 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 d2374afb1..aff627b49 100644
--- a/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_dnd.png
Binary files 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 f627d4230..d1d2d6dfd 100644
--- a/src/main/res/drawable-xhdpi/ic_send_picture_offline.png
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 000000000..7bab5f5af
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png
Binary files 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 f819c052a..e027bca7d 100644
--- a/src/main/res/drawable-xhdpi/ic_send_picture_online.png
+++ b/src/main/res/drawable-xhdpi/ic_send_picture_online.png
Binary files 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 757384f4d..62509523d 100644
--- a/src/main/res/drawable-xhdpi/ic_send_text_away.png
+++ b/src/main/res/drawable-xhdpi/ic_send_text_away.png
Binary files 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 ab9fe359f..77b222b5f 100644
--- a/src/main/res/drawable-xhdpi/ic_send_text_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_text_dnd.png
Binary files 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 8545a8bf6..08f6ccd2b 100644
--- a/src/main/res/drawable-xhdpi/ic_send_text_offline.png
+++ b/src/main/res/drawable-xhdpi/ic_send_text_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png
new file mode 100644
index 000000000..257fe36e0
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png
Binary files 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 b4258b218..222ad878d 100644
--- a/src/main/res/drawable-xhdpi/ic_send_text_online.png
+++ b/src/main/res/drawable-xhdpi/ic_send_text_online.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_away.png b/src/main/res/drawable-xhdpi/ic_send_videocam_away.png
new file mode 100644
index 000000000..69e340800
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_videocam_away.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-xhdpi/ic_send_videocam_dnd.png
new file mode 100644
index 000000000..e7f784d8b
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_videocam_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_offline.png b/src/main/res/drawable-xhdpi/ic_send_videocam_offline.png
new file mode 100644
index 000000000..ee8e722d3
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_videocam_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_videocam_offline_white.png
new file mode 100644
index 000000000..c8056050b
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_videocam_offline_white.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_videocam_online.png b/src/main/res/drawable-xhdpi/ic_send_videocam_online.png
new file mode 100644
index 000000000..32b297d16
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_videocam_online.png
Binary files 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 b027b0dcb..7cdc193a9 100644
--- a/src/main/res/drawable-xhdpi/ic_send_voice_away.png
+++ b/src/main/res/drawable-xhdpi/ic_send_voice_away.png
Binary files 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 a6851115d..36e28ca98 100644
--- a/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_send_voice_dnd.png
Binary files 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 19ed06647..8ccd8f742 100644
--- a/src/main/res/drawable-xhdpi/ic_send_voice_offline.png
+++ b/src/main/res/drawable-xhdpi/ic_send_voice_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 000000000..16bb99a4e
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png
Binary files 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 a2d6bb249..a854e4afd 100644
--- a/src/main/res/drawable-xhdpi/ic_send_voice_online.png
+++ b/src/main/res/drawable-xhdpi/ic_send_voice_online.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png
new file mode 100644
index 000000000..183154f54
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png
Binary files 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 9d2c38fc3..ede8f184c 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_cancel_away.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_cancel_away.png
Binary files 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 3f603e514..86a216c08 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png
Binary files 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 38c8236f2..311ae0d88 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 000000000..bccba14de
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png
Binary files 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 0565c0893..df1f67d37 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_cancel_online.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_cancel_online.png
Binary files 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 70dd4f4cc..d055f27c1 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_location_away.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_location_away.png
Binary files 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 228ca60f9..0360c3f46 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_location_dnd.png
Binary files 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 6ebcd28ef..687818606 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_location_offline.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_location_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png
new file mode 100644
index 000000000..48ab6e7a1
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png
Binary files 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 a96d967a1..62ab977e5 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_location_online.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_location_online.png
Binary files 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 dab34acc7..6e0ff4d27 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_photo_away.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_photo_away.png
Binary files 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 61aa03928..3d76353a0 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png
Binary files 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 2a0acc4d0..9cd43cb4d 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_photo_offline.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_photo_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 000000000..aa9241582
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png
Binary files 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 29a5395ee..6a884d3e2 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_photo_online.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_photo_online.png
Binary files 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 9c5ba9825..c094bd812 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_picture_away.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_picture_away.png
Binary files 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 bf745595d..d2ea6f128 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png
Binary files 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 54848c3c7..9edf1c7e4 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_picture_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 000000000..4482c58ce
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png
Binary files 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 77ae45a1d..9d8a12e32 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_picture_online.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_picture_online.png
Binary files 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 6e2f1b22d..5bb93b6b4 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_text_away.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_text_away.png
Binary files 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 aaa1d5c64..2a17facba 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_text_dnd.png
Binary files 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 f143955ea..e7a9c2106 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_text_offline.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_text_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png
new file mode 100644
index 000000000..f20851b70
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png
Binary files 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 3664347a8..9b0be3f21 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_text_online.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_text_online.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_away.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_away.png
new file mode 100644
index 000000000..ce04c7790
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_away.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.png
new file mode 100644
index 000000000..24890da09
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_offline.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_offline.png
new file mode 100644
index 000000000..211cf8709
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_offline_white.png
new file mode 100644
index 000000000..f08ac01c3
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_offline_white.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_videocam_online.png b/src/main/res/drawable-xxhdpi/ic_send_videocam_online.png
new file mode 100644
index 000000000..a0a98524a
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_videocam_online.png
Binary files 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 a3c9e0c31..78e35a087 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_voice_away.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_voice_away.png
Binary files 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 388c80623..aab14eb57 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png
Binary files 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 6a4137966..d8c294627 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_voice_offline.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_voice_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 000000000..e93b63b2c
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png
Binary files 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 909c305a3..a8a6d54ca 100644
--- a/src/main/res/drawable-xxhdpi/ic_send_voice_online.png
+++ b/src/main/res/drawable-xxhdpi/ic_send_voice_online.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png
new file mode 100644
index 000000000..cf35464e6
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png
Binary files 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 2009d00ca..82491f695 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png
Binary files 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 990f20a8f..8e2c86ca6 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png
Binary files 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 44a3d6a23..bc63fc64f 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 000000000..b81fe6246
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png
Binary files 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 89ae39c0e..b5e798ce1 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png
Binary files 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 a14ddde9c..7fe5b3170 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_location_away.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_location_away.png
Binary files 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 03d43243a..6df2d332f 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png
Binary files 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 94174713d..fb8c3c80e 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_location_offline.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_location_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png
new file mode 100644
index 000000000..4b0f0e95a
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png
Binary files 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 b27475ac0..4be56d435 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_location_online.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_location_online.png
Binary files 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 b5228ed79..522b49a5c 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_photo_away.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_photo_away.png
Binary files 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 5d12c5431..f479ea188 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png
Binary files 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 97e36054c..441d2d47b 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 000000000..12a0bc087
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png
Binary files 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 a140b13aa..9541574fc 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_photo_online.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_photo_online.png
Binary files 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 ae0519a93..148b30e7d 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_picture_away.png
Binary files 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 d95ef9c90..c5c09e492 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png
Binary files 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 11c3a6b71..5c45a3548 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 000000000..c1f43c247
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png
Binary files 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 e4f0f2944..3e1ac13f4 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_picture_online.png
Binary files 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 88276d56f..f8a25e60e 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_text_away.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_text_away.png
Binary files 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 3c667769f..1ede18677 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png
Binary files 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 8eb41cfc5..2e608e531 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_text_offline.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_text_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png
new file mode 100644
index 000000000..a0ddd4726
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png
Binary files 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 3a6216275..8c92772a8 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_text_online.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_text_online.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_away.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_away.png
new file mode 100644
index 000000000..7e517e6be
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_away.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.png
new file mode 100644
index 000000000..3077ee233
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_offline.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_offline.png
new file mode 100644
index 000000000..a8f22abfd
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_offline_white.png
new file mode 100644
index 000000000..842212a1e
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_offline_white.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_videocam_online.png b/src/main/res/drawable-xxxhdpi/ic_send_videocam_online.png
new file mode 100644
index 000000000..471d1ccbd
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_videocam_online.png
Binary files 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 32a36f64d..ae3841e09 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_voice_away.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_voice_away.png
Binary files 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 514d8d92a..ff2151902 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png
Binary files 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 7986a047c..303646d01 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 000000000..f50122754
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png
Binary files 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 d1135ba4b..41da82d6e 100644
--- a/src/main/res/drawable-xxxhdpi/ic_send_voice_online.png
+++ b/src/main/res/drawable-xxxhdpi/ic_send_voice_online.png
Binary files differ
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index de0549e58..04b6d73c0 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -180,9 +180,10 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
+ android:alpha="?attr/icon_alpha"
android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/image_button_padding"
- android:src="?attr/icon_edit_dark" />
+ android:src="?attr/icon_edit_body" />
</RelativeLayout>
<LinearLayout
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 4707136cb..0843cb888 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -11,6 +11,18 @@
<attr name="color_background_primary" format="reference|color" />
<attr name="color_warning" format="reference|color"/>
+ <attr name="ic_send_cancel_offline" format="reference"/>
+ <attr name="ic_send_location_offline" format="reference"/>
+ <attr name="ic_send_photo_offline" format="reference"/>
+ <attr name="ic_send_picture_offline" format="reference"/>
+ <attr name="ic_send_text_offline" format="reference"/>
+ <attr name="ic_send_videocam_offline" format="reference"/>
+ <attr name="ic_send_voice_offline" format="reference"/>
+
+ <attr name="unread_count" format="reference|color" />
+
+ <attr name="conversations_overview_background" format="reference|color"/>
+
<attr name="icon_add_group" format="reference" />
<attr name="icon_add_person" format="reference" />
<attr name="icon_cancel" format="reference" />
@@ -19,7 +31,7 @@
<attr name="icon_discard" format="reference" />
<attr name="icon_download" format="reference" />
<attr name="icon_edit" format="reference" />
- <attr name="icon_edit_dark" format="reference" />
+ <attr name="icon_edit_body" format="reference" />
<attr name="icon_done" format="reference" />
<attr name="icon_group" format="reference" />
<attr name="icon_new" format="reference" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 80911ac4f..f5a6d80be 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -762,4 +762,6 @@
<string name="edit_status_message">Edit status message</string>
<string name="all_accounts_on_this_device">Set for all accounts on this device</string>
<string name="change_presence">Manage availability manually</string>
+ <string name="pref_automatically_delete_messages_description">Automatically delete messages from this device that are older than the configured time frame.</string>
+ <string name="pref_automatically_delete_messages">Automatic message deletion</string>
</resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index d27dc71db..5f8d5ab67 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -13,7 +13,7 @@
<item name="android:windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">@color/accent</item>
- <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
+ <item type="reference" name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
<item name="TextSizeInfo">12sp</item>
<item name="TextSizeBody">14sp</item>
@@ -24,44 +24,46 @@
<!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>-->
<item name="divider">@color/black12</item>
- <item name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
- <item name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
- <item name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
- <item name="icon_chat">@drawable/ic_action_chat</item>
- <item name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
- <item name="icon_discard">@drawable/ic_delete_white_24dp</item>
- <item name="icon_download">@drawable/ic_file_download_white_24dp</item>
- <item name="icon_edit">@drawable/ic_edit_white_24dp</item>
- <item name="icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
- <item name="icon_done">@drawable/ic_done_black_24dp</item>
- <item name="icon_group">@drawable/ic_group_white_24dp</item>
- <item name="icon_new">@drawable/ic_contacts_white_24dp</item>
- <item name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
- <item name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
- <item name="icon_quote">@drawable/ic_reply_white_24dp</item>
- <item name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
- <item name="icon_remove">@drawable/ic_delete_grey600_24dp</item>
- <item name="icon_search">@drawable/ic_search_white_24dp</item>
- <item name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
- <item name="icon_settings">@drawable/ic_settings_grey600_24dp</item>
- <item name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
- <item name="icon_share">@drawable/ic_share_white_24dp</item>
- <item name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
+ <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
+ <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
+ <item type="reference" name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
+ <item type="reference" name="icon_chat">@drawable/ic_action_chat</item>
+ <item type="reference" name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
+ <item type="reference" name="icon_discard">@drawable/ic_delete_white_24dp</item>
+ <item type="reference" name="icon_download">@drawable/ic_file_download_white_24dp</item>
+ <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
+ <item type="reference" name="icon_edit_body">@drawable/ic_edit_black_24dp</item>
+ <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
+ <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
+ <item type="reference" name="icon_new">@drawable/ic_contacts_white_24dp</item>
+ <item type="reference" name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
+ <item type="reference" name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
+ <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>
+ <item type="reference" name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
+ <item type="reference" name="icon_remove">@drawable/ic_delete_grey600_24dp</item>
+ <item type="reference" name="icon_search">@drawable/ic_search_white_24dp</item>
+ <item type="reference" name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
+ <item type="reference" name="icon_settings">@drawable/ic_settings_grey600_24dp</item>
+ <item type="reference" name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
+ <item type="reference" name="icon_share">@drawable/ic_share_white_24dp</item>
+ <item type="reference" name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
<item name="dialog_horizontal_padding">16dp</item>
<item name="dialog_vertical_padding">16dp</item>
<item type="float" name="icon_alpha">0.54</item>
- <item name="ic_attach_camera">@drawable/ic_attach_camera</item>
- <item name="ic_attach_document">@drawable/ic_attach_document</item>
- <item name="ic_attach_location">@drawable/ic_attach_location</item>
- <item name="ic_attach_photo">@drawable/ic_attach_photo</item>
- <item name="ic_attach_video">@drawable/ic_attach_video</item>
- <item name="ic_attach_record">@drawable/ic_attach_record</item>
+ <item type="reference" name="ic_attach_camera">@drawable/ic_attach_camera</item>
+ <item type="reference" name="ic_attach_document">@drawable/ic_attach_document</item>
+ <item type="reference" name="ic_attach_location">@drawable/ic_attach_location</item>
+ <item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo</item>
+ <item type="reference" name="ic_attach_video">@drawable/ic_attach_video</item>
+ <item type="reference" name="ic_attach_record">@drawable/ic_attach_record</item>
+
+ <item name="conversations_overview_background">@color/primary</item>
- <item name="ic_file_apk">@drawable/ic_file_grey600_48dp</item>
- <item name="ic_file_pdf">@drawable/ic_file_pdf_grey600_48dp</item>
- <item name="ic_file_vcard">@drawable/ic_account_card_details_grey600_48dp</item>
- <item name="ic_file_calendar">@drawable/ic_calendar_grey600_48dp</item>
+ <item type="reference" name="ic_file_apk">@drawable/ic_file_grey600_48dp</item>
+ <item type="reference" name="ic_file_pdf">@drawable/ic_file_pdf_grey600_48dp</item>
+ <item type="reference" name="ic_file_vcard">@drawable/ic_account_card_details_grey600_48dp</item>
+ <item type="reference" name="ic_file_calendar">@drawable/ic_calendar_grey600_48dp</item>
<item type="reference" name="icon_notifications">@drawable/ic_notifications_black_24dp</item>
<item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_black_24dp</item>
@@ -98,19 +100,13 @@
<item type="reference" name="ic_send_voice_offline">@drawable/ic_send_voice_offline_white</item>
<item type="reference" name="ic_attach_camera">@drawable/ic_attach_camera_white</item>
- <item type="reference" name="ic_attach_videocam">@drawable/ic_attach_videocam_white</item>
+ <item type="reference" name="ic_attach_video">@drawable/ic_attach_videocam_white</item>
<item type="reference" name="ic_attach_document">@drawable/ic_attach_document_white</item>
<item type="reference" name="ic_attach_location">@drawable/ic_attach_location_white</item>
<item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo_white</item>
<item type="reference" name="ic_attach_record">@drawable/ic_attach_record_white</item>
- <item type="reference" name="message_bubble_received_monochrome">@drawable/message_bubble_received_grey</item>
- <item type="reference" name="message_bubble_sent">@drawable/message_bubble_sent_grey</item>
- <item type="reference" name="message_bubble_received_green">@drawable/message_bubble_received_dark</item>
-
- <item name="unread_count">@color/unreadcountdark</item>
-
- <item name="conversations_overview_background">@color/primary900</item>
+ <item name="conversations_overview_background">@color/primary_dark</item>
<item type="float" name="icon_alpha">0.7</item>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 86fb7f057..220a66cb4 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -305,7 +305,7 @@
android:title="@string/pref_blind_trust_before_verification"
android:summary="@string/pref_blind_trust_before_verification_summary" />
<ListPreference
- android:defaultValue="@integer/automatic_message_deletion"/>
+ android:defaultValue="@integer/automatic_message_deletion"
android:key="automatic_message_deletion"
android:summary="@string/pref_automatically_delete_messages_description"
android:title="@string/pref_automatically_delete_messages" />