diff --git a/art/render.rb b/art/render.rb
index 386366a42422ab0020b7f170e86b595d7d6b26d6..2ab3e94fc6181755e004a62fd3490ad4048ed038 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -4,6 +4,7 @@ resolutions={
'hdpi' => 1.5,
'xhdpi' => 2,
'xxhdpi' => 3,
+ 'xxxhdpi' => 4,
}
images = {
'conversations_baloon.svg' => ['ic_launcher', 48],
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 894af421a76ab927a373e8618bdd7fe32b001997..2ea0904f38458c435167184673b40228d1fd7af3 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -270,7 +270,8 @@ public class NotificationService {
}
if ((message = getFirstDownloadableMessage(messages)) != null) {
mBuilder.addAction(
- R.drawable.ic_action_download,
+ Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ?
+ R.drawable.ic_file_download_white_24dp : R.drawable.ic_action_download,
mXmppConnectionService.getResources().getString(R.string.download_x_file,
UIHelper.getFileDescriptionString(mXmppConnectionService, message)),
createDownloadIntent(message)
@@ -446,18 +447,24 @@ public class NotificationService {
public Notification createForegroundNotification() {
final NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(mXmppConnectionService);
- mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export);
+
mBuilder.setContentTitle(mXmppConnectionService.getString(R.string.conversations_foreground_service));
mBuilder.setContentText(mXmppConnectionService.getString(R.string.touch_to_open_conversations));
- mBuilder.addAction(R.drawable.ic_action_cancel,
- mXmppConnectionService.getString(R.string.disable_foreground_service),
- createDisableForeground());
mBuilder.setContentIntent(createOpenConversationsIntent());
mBuilder.setWhen(0);
mBuilder.setPriority(NotificationCompat.PRIORITY_MIN);
+ final int cancelIcon;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
mBuilder.setCategory(Notification.CATEGORY_SERVICE);
+ mBuilder.setSmallIcon(R.drawable.ic_import_export_white_48dp);
+ cancelIcon = R.drawable.ic_cancel_white_24dp;
+ } else {
+ mBuilder.setSmallIcon(R.drawable.ic_stat_communication_import_export);
+ cancelIcon = R.drawable.ic_action_cancel;
}
+ mBuilder.addAction(cancelIcon,
+ mXmppConnectionService.getString(R.string.disable_foreground_service),
+ createDisableForeground());
setNotificationColor(mBuilder);
return mBuilder.build();
}
@@ -487,7 +494,11 @@ public class NotificationService {
}
mBuilder.setOngoing(true);
//mBuilder.setLights(0xffffffff, 2000, 4000);
- mBuilder.setSmallIcon(R.drawable.ic_stat_alert_warning);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ mBuilder.setSmallIcon(R.drawable.ic_warning_white_36dp);
+ } else {
+ mBuilder.setSmallIcon(R.drawable.ic_stat_alert_warning);
+ }
final TaskStackBuilder stackBuilder = TaskStackBuilder.create(mXmppConnectionService);
stackBuilder.addParentStack(ConversationActivity.class);
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 7aa48c0c2731d02cf23bd5704ce85ba2f8078d5a..299fb848a372ee293da08bf51dedd7ebf8dc4b46 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -10,6 +10,7 @@ import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.IntentSender.SendIntentException;
import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
import android.provider.MediaStore;
@@ -296,8 +297,12 @@ public class ConversationActivity extends XmppActivity
if (this.getSelectedConversation() != null) {
if (this.getSelectedConversation().getLatestMessage()
.getEncryption() != Message.ENCRYPTION_NONE) {
- menuSecure.setIcon(R.drawable.ic_action_secure);
- }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ menuSecure.setIcon(R.drawable.ic_lock_outline_white_48dp);
+ } else {
+ menuSecure.setIcon(R.drawable.ic_action_secure);
+ }
+ }
if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
menuContactDetails.setVisible(false);
menuAttach.setVisible(false);
diff --git a/src/main/res/drawable-hdpi/ic_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..72cedcad4f1bcedad5e0b69728dd893c52edf322
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_add_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7256ca3d431ea97d5b75cfb2151877be32164674
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..794b7b7801c3e3a3a24ad0d3a8b553a949e9cc8c
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..64c8a6ab02103a17d8e849db766de1c8c5063d90
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cancel_white_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..faa409f8023efb648d5feccecab9b63047906b44
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cancel_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_chat_white_48dp.png b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..71cac75afd780bc34b1f470ff95bd6bd584da361
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd2c60b861d27c07c6e1bb1111fbdba9c24f4ae2
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_delete_white_48dp.png b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e95e9b1d0a70a13c1c4a28f5180f697b7828e01
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_edit_black_48dp.png b/src/main/res/drawable-hdpi/ic_edit_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..827b684809f57226cd29e6564a2b779c11695edd
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_black_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8970cb25b634f5637691344355d95c2ddd43e21
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_edit_white_48dp.png b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..34ec7092f142ac50ca97d3f18f1486582a12d2f6
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..46aeab45808a96e4e97b6f3526a7f1fa3da00450
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0a112dc5fb93b92b21e873c9b57b710e09cca4b
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_file_download_white_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5ad0a29da7f8a2f201358f5ee5a4ba2f120371a
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_group_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6ed594f7ebac23f6601273237f0f923fdebdb18
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_group_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c349703726f54b02cff35fde81bc00dcbcac2c3f
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b90a598051d028130bf796bd34436f0877b64b1f
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0c25290b8952f966ec645bb56fd68e2254203cd
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..074db2d30e9bd308a26378a4217415fb9b560b3b
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..72128fe69086bd90233bd2f16ca25cd52f423326
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..aeb1cea9a79c9f988cf9e69a41083ca33c89edf9
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_search_white_18dp.png b/src/main/res/drawable-hdpi/ic_search_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ad0bfe3583c273433a07e06b807b7cc30d89255
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_search_white_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_search_white_48dp.png b/src/main/res/drawable-hdpi/ic_search_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bbeab15018d2d779acfa48a6d31812bd822c0c2
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_search_white_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cff84744f182ebe55b25416b706137f25cdf5a33
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_warning_white_36dp.png b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8b7140a9a9bdeee174ea87008c1b3303b8ef891
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..67042105d29bc5676206dbdb1cdc9359e58bd63d
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_add_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..db23fd6512d2163d2f29717155aac07691f1d6da
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attach_file_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..df332ef3cd8b699ed62edac83a2d3b5eb5899aa3
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..794b7b7801c3e3a3a24ad0d3a8b553a949e9cc8c
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_cancel_white_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9e9c7a53d3168485609ffbefd82072052e1e7ac
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_cancel_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_chat_white_48dp.png b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..526ebec6df0d09e93b6c84d139973707a9ac4805
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_chat_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5592d5c80153adffbf0aa6918fdf98e18f0596b0
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_content_copy_grey600_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_delete_white_48dp.png b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdb230c2f2bc051867c164c35f58cd410efbe139
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_delete_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_black_48dp.png b/src/main/res/drawable-mdpi/ic_edit_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa7748addaa2c5788a15da8320924453aafa697d
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_black_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5f88c80aca8694f31a1c9273ad9057090090d5c
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_grey600_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_white_48dp.png b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f0ea51bf608501cafe4a27f7387a8458505faa5
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e089466de5b9dfe65f0dc4c52ddc1ecbb5dd5e9e
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..46aeab45808a96e4e97b6f3526a7f1fa3da00450
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_file_download_white_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6055325e85d1802e1cd7dad0d93cfac43f6b3cb3
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_group_add_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_group_white_48dp.png b/src/main/res/drawable-mdpi/ic_group_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c5fd333ecac69795e9c5936ea6734d7b6a97739
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_group_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb82f4208c293442c46097d80b1cfc8d2a485d53
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_import_export_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e1321e4312bff9ee59ec2d47bff23fd4771ffee
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_open_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d2c9417dca348991f817d79758044cde06b1ab8
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_outline_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c402e8f0aa92cf5b5ac14d1b0865b77f29cb3af9
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_person_add_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f89fc257b71bee3b3e6ca55d89e57a3f3b2d4d4
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_refresh_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..efc9560edd1a1aecd7f5fd78ea18ade70786b6c4
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_remove_grey600_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_search_white_18dp.png b/src/main/res/drawable-mdpi/ic_search_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d113cdcb549fa1349bfca3db5a081f7cef1fa55b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_search_white_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_search_white_48dp.png b/src/main/res/drawable-mdpi/ic_search_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..043759acd44bd8a77d1032b2cd28674552b16563
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_search_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..20d2b66e05272ae1caa3575316ed6d8d5360610e
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_settings_grey600_36dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_warning_white_36dp.png b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..30eee6c4ec85a94e3478afe877b64e1bac1c803d
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_warning_white_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bef0595839a40b3d454a20cd48288a45da81a8b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..caaee37af38a87d765f6ae70884de2b9b3b509a6
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_file_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9e9c7a53d3168485609ffbefd82072052e1e7ac
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..faa409f8023efb648d5feccecab9b63047906b44
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cancel_white_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9b6c0b3dcbd42e4eb067fddd0ae68e9b3939fd0
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cancel_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1230ab39288425ee3a32ab8ec474b2d13141fde2
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_chat_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fdbbea1384bea28573f646704c0387608d5fab8
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccf8c7162acdee9013f90f7bb20d7bb8f1947a23
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_delete_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3c4ccef2f5b4ff6ac5096459cef49f30fdc0812
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_black_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ed4351ca2887eaf60a69fdab72ee7279f32759f
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9380370f484dac3f00b86319e05b155b26de06b0
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..990dfb82b383baf0c5e73b33f93393d2744f5da2
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..95502de3f1c91511b8b179b896f866976bb661ee
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_file_download_white_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ac3d4a80f639b20a00a6da229e04c714aa78e7e
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_group_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a62b567729060b00e83b3e61538004b3ea195ff1
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_group_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..06b27ea199ed9555b008d8607632fbb8fe98da00
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_import_export_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f35034c90d8661f85af57c15caa22f764f81014
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_open_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3de35f9b99ca2b4882d3b8ff2aa23075eb3e00a5
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_outline_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e2121e5343d6e719206c3647e8f7ca5eda6fa0b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_person_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d271d8e03f41181bc2ee2c26762a11597ca486ce
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_refresh_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d5136fef8ae0f2f21d3b396f738e52ee5768254
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_remove_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xhdpi/ic_search_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2fc5b2e7087e77c8bebb3999d0504cecb97b611
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_search_white_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..70c21baf77bc426ac481b13dcdcdd08b80588705
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_search_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a70402b4f85220a29aa1d15dfc9396ffafb6247
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_settings_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f401317ef4dbc1ad71dc8dbea663fa58c3a921e
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_warning_white_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b12e040e08381c707280252703332741c447dcba
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b50e51612548c9820f2dfbb9cf1884fbd3896b0f
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..faa409f8023efb648d5feccecab9b63047906b44
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3a7884c2815194281e52d7bca731efc3c5c219a
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cancel_white_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..215c3b386df530607dacfd97e1334b78e189c8f1
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cancel_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb39d1573317f419f4d0c7fa12ed84158aafead5
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..72b3474b0bd83c2f6143afb25cca644aff91b1ef
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8d8ca84dffd42fbaab75704348af80c5102df32
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..74f0c795bb8124172f96b47bd4c37046737e2848
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_black_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..21b617a9f1ab66c30e6c5ed59cf9eaea4db72994
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe5bd13fb32b974f8f35cca90f17fc11766b4aa3
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..95502de3f1c91511b8b179b896f866976bb661ee
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..368dc49cbaaa97bd9f4ce4892a3650766249297d
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_file_download_white_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ff60d6f477b33c9b715b6b1bb11e965424f4af0
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..fffa6a6a28dabbec2285e0e319469eeca30b9cb9
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cabd50c05ad497708235eaaa95ba476dec1c007c
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..031eb06e279be30503c5b0accd47ce404e5bb12d
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f57082d8b276aa04bb7b13ec86c539617918b2a5
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba2424876cc22c80a5c77b62706a0a44a3bdf93c
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..87ab2d6409856edb6de19d330c8586c19746841f
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b1003db0ec962af05d4a9b1e7eac9581e6b0871
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c57219778d765a0fd533fa9a47a8e714f1eca052
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_search_white_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..75d9aa69fa60b6c30eee9dcdc1cfb137ff1c7891
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d47d042e6dd0965eb656b1a7ba0c61d8ecc0af19
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6e5788ba59741c2e137969f4428116f0c4252cc
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd32f0a82b21aaa2ddda9bafc79813aa0818ba4f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..55464b7eb6cfe69a350154e95bce5156cc1063fd
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9b6c0b3dcbd42e4eb067fddd0ae68e9b3939fd0
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..215c3b386df530607dacfd97e1334b78e189c8f1
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_cancel_white_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..bef7e17fedf751057265dbdd3403c9309511fbe4
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_cancel_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..68f14af6d718242d4729604c282e720e4b4d6f5b
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..435c087abbf580a64f51729d7a96ffd6ed040b06
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..47fef5aabed59fc97dc063c76e2e53f27877c9ff
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0429e7e1aeeec0ca2b8b397f85f6abf6c562e628
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_black_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1361eedcdae97ba425432beb5f864c9b73b908a2
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..736806495cda3ada8a955e409798a33cd73c690d
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a57e72f7dc5ba9d61f0d676850045fa63b83dd01
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e261f9a870240a3b8e9cf7ad7de7eff6c858ce13
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_file_download_white_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e9d67f631a69c226b802b086f0f4a43e836fe2d
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a27316be64bf69abeb9fc989f17640b25662830
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea80bc00a0081d1aad62bdc63d7c9ee5d9d24de5
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6dcb0b9f99c7e309e2a1ea4682ab213c97c1c87
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7652e609f529f5df131e30c4a8b1215f191ad9f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..440070a11b9a1c526bbf329ac7397cbe54de5f91
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee2f3a43235d34f72ecfd36e242aa7ee93d46d48
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notification.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..89c1aef24b5515bd6e823b147ff7926e9b4c8e3b
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..86db9890c23ca93096441af04a38abea5f690db1
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe0ae13aae3e7af5b8c0f656213b125c2dd78fe0
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..524cc0a09396f3604d3e3b7b0354544765175d48
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bbeab15018d2d779acfa48a6d31812bd822c0c2
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_search_white_18dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7caf6c9b7e6b5de2abd78d0febddca1b2fda3703
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fea47f60c027ab7318fa15e8505e6e5fce3a1cb
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..abc5c7a5f2fab79589e1183c4705dcc888de559e
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png differ
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 0093f032d735514e8af0b0db2945cc886df2773a..750c28e0b63135cde33b69ca7787ba99c373a873 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -338,7 +338,7 @@
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
android:padding="8dp"
- android:src="@drawable/ic_action_copy"
+ android:src="?attr/icon_copy"
android:visibility="visible"
android:contentDescription="@string/copy_otr_clipboard_description"/>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 332ac2a90341a89ae5fb7242fc7e1940b0e3cc64..36873654eeab561f8a4ec54f825d886dc30a4fda 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -76,7 +76,7 @@
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
android:padding="8dp"
- android:src="@drawable/ic_action_edit_dark"/>
+ android:src="?attr/icon_edit_dark"/>
+ android:src="?attr/icon_settings"/>
\ No newline at end of file
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index e39091b3841b4a0e9601d20a767adecba6f643e3..c025d00f8b8aa37ade00bc65b110c0dfc3567153 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -4,7 +4,7 @@
- 12sp
- 14sp
- 20sp
+
+ - @drawable/ic_group_add_white_48dp
+ - @drawable/ic_person_add_white_48dp
+ - @drawable/ic_cancel_white_24dp
+ - @drawable/ic_chat_white_48dp
+ - @drawable/ic_content_copy_grey600_36dp
+ - @drawable/ic_delete_white_48dp
+ - @drawable/ic_file_download_white_24dp
+ - @drawable/ic_edit_white_48dp
+ - @drawable/ic_edit_grey600_36dp
+ - @drawable/ic_group_white_48dp
+ - @drawable/ic_add_white_48dp
+ - @drawable/ic_attach_file_white_48dp
+ - @drawable/ic_lock_open_white_48dp
+ - @drawable/ic_refresh_white_48dp
+ - @drawable/ic_remove_grey600_36dp
+ - @drawable/ic_search_white_48dp
+ - @drawable/ic_lock_outline_white_48dp
+ - @drawable/ic_settings_grey600_36dp
+ - @drawable/ic_import_export_white_48dp
+
\ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 2354a5e8c9cc455e9167a0e30a64d470684ab5de..e314f752f1813487b1c6b01d409c4dcdd7a2a13c 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -5,4 +5,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3d3d69a3e73ddf7ce11371ea037709257c16c554..ae8dcd678b57b967764a56aeb92b3b3f2f6726f5 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -296,6 +296,7 @@
\n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0)
\n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0)
\n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
+ \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0)
Quiet Hours
Start time
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index fa7973d207129ee08b13228194dbb162c029ad1f..80f2bfe653208ce79c7c6a6eab13b98e68998511 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -8,6 +8,27 @@
- 12sp
- 14sp
- 20sp
+
+ - @drawable/ic_action_add_group
+ - @drawable/ic_action_add_person
+ - @drawable/ic_action_cancel
+ - @drawable/ic_action_chat
+ - @drawable/ic_action_copy
+ - @drawable/ic_action_discard
+ - @drawable/ic_action_download
+ - @drawable/ic_action_edit
+ - @drawable/ic_action_edit_dark
+
+ - @drawable/ic_action_group
+ - @drawable/ic_action_new
+ - @drawable/ic_action_new_attachment
+ - @drawable/ic_action_not_secure
+ - @drawable/ic_action_refresh
+ - @drawable/ic_action_remove
+ - @drawable/ic_action_search
+ - @drawable/ic_action_secure
+ - @drawable/ic_action_settings
+ - @drawable/ic_stat_communication_import_export