diff --git a/art/render.rb b/art/render.rb
index 386366a4..2ab3e94f 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 894af421..2ea0904f 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 7aa48c0c..299fb848 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 00000000..72cedcad
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 00000000..7256ca3d
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 00000000..794b7b78
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 00000000..64c8a6ab
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 00000000..faa409f8
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 00000000..71cac75a
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 00000000..bd2c60b8
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 00000000..0e95e9b1
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 00000000..827b6848
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 00000000..f8970cb2
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 00000000..34ec7092
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 00000000..46aeab45
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 00000000..a0a112dc
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 00000000..a5ad0a29
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 00000000..a6ed594f
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 00000000..c3497037
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 00000000..b90a5980
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 00000000..d0c25290
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 00000000..074db2d3
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 00000000..72128fe6
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 00000000..aeb1cea9
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 00000000..9ad0bfe3
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 00000000..0bbeab15
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 00000000..cff84744
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 00000000..c8b7140a
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 00000000..67042105
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 00000000..db23fd65
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 00000000..df332ef3
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 00000000..794b7b78
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 00000000..e9e9c7a5
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 00000000..526ebec6
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 00000000..5592d5c8
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 00000000..cdb230c2
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 00000000..aa7748ad
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 00000000..b5f88c80
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 00000000..7f0ea51b
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 00000000..e089466d
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 00000000..46aeab45
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 00000000..6055325e
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 00000000..0c5fd333
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 00000000..fb82f420
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 00000000..6e1321e4
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 00000000..2d2c9417
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 00000000..c402e8f0
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 00000000..5f89fc25
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 00000000..efc9560e
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 00000000..d113cdcb
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 00000000..043759ac
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 00000000..20d2b66e
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 00000000..30eee6c4
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 00000000..2bef0595
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 00000000..caaee37a
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 00000000..e9e9c7a5
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 00000000..faa409f8
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 00000000..b9b6c0b3
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 00000000..1230ab39
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 00000000..2fdbbea1
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 00000000..ccf8c716
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 00000000..d3c4ccef
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 00000000..6ed4351c
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 00000000..9380370f
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 00000000..990dfb82
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 00000000..95502de3
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 00000000..0ac3d4a8
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 00000000..a62b5677
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 00000000..06b27ea1
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 00000000..8f35034c
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 00000000..3de35f9b
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 00000000..4e2121e5
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 00000000..d271d8e0
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 00000000..3d5136fe
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 00000000..a2fc5b2e
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 00000000..70c21baf
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 00000000..6a70402b
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 00000000..3f401317
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 00000000..b12e040e
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 00000000..b50e5161
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 00000000..faa409f8
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 00000000..e3a7884c
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 00000000..215c3b38
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 00000000..bb39d157
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 00000000..72b3474b
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 00000000..a8d8ca84
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 00000000..74f0c795
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 00000000..21b617a9
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 00000000..fe5bd13f
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 00000000..95502de3
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 00000000..368dc49c
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 00000000..7ff60d6f
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 00000000..fffa6a6a
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 00000000..cabd50c0
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 00000000..031eb06e
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 00000000..f57082d8
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 00000000..ba242487
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 00000000..87ab2d64
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 00000000..4b1003db
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 00000000..c5721977
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 00000000..75d9aa69
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 00000000..d47d042e
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 00000000..a6e5788b
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 00000000..cd32f0a8
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 00000000..55464b7e
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 00000000..b9b6c0b3
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 00000000..215c3b38
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 00000000..bef7e17f
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 00000000..68f14af6
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 00000000..435c087a
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 00000000..47fef5aa
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 00000000..0429e7e1
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 00000000..1361eedc
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 00000000..73680649
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 00000000..a57e72f7
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 00000000..e261f9a8
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 00000000..7e9d67f6
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 00000000..2a27316b
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 00000000..ea80bc00
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 00000000..b6dcb0b9
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 00000000..f7652e60
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 00000000..440070a1
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 00000000..ee2f3a43
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 00000000..89c1aef2
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 00000000..86db9890
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 00000000..fe0ae13a
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 00000000..524cc0a0
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 00000000..0bbeab15
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 00000000..7caf6c9b
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 00000000..8fea47f6
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 00000000..abc5c7a5
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 0093f032..750c28e0 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 332ac2a9..36873654 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 e39091b3..c025d00f 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -4,7 +4,7 @@
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index ba8889d8..bd81b6d4 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -3,13 +3,13 @@
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index d68c1436..4c724d27 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -2,19 +2,19 @@
@@ -25,7 +25,7 @@
android:title="@string/action_contact_details"/>
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index 5b04484f..f8a30ff7 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -3,7 +3,7 @@
diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index cbd15c11..bc51f462 100644
--- a/src/main/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
@@ -3,7 +3,7 @@
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index 3dd09e90..a89d71ff 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -4,17 +4,17 @@
- 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 2354a5e8..e314f752 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 3d3d69a3..ae8dcd67 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 fa7973d2..80f2bfe6 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