diff --git a/art/ic_notifications_none_white80.svg b/art/ic_notifications_none_white80.svg
new file mode 100644
index 000000000..d333130ff
--- /dev/null
+++ b/art/ic_notifications_none_white80.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_notifications_off_white80.svg b/art/ic_notifications_off_white80.svg
new file mode 100644
index 000000000..f0af47b61
--- /dev/null
+++ b/art/ic_notifications_off_white80.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_notifications_paused_white80.svg b/art/ic_notifications_paused_white80.svg
new file mode 100644
index 000000000..4f92e8475
--- /dev/null
+++ b/art/ic_notifications_paused_white80.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_notifications_white80.svg b/art/ic_notifications_white80.svg
new file mode 100644
index 000000000..398e51385
--- /dev/null
+++ b/art/ic_notifications_white80.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_send_cancel_offline_white.svg b/art/ic_send_cancel_offline_white.svg
new file mode 100644
index 000000000..f84f62f57
--- /dev/null
+++ b/art/ic_send_cancel_offline_white.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_send_location_offline_white.svg b/art/ic_send_location_offline_white.svg
new file mode 100644
index 000000000..f7f60a8f4
--- /dev/null
+++ b/art/ic_send_location_offline_white.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_send_photo_offline_white.svg b/art/ic_send_photo_offline_white.svg
new file mode 100644
index 000000000..45875731c
--- /dev/null
+++ b/art/ic_send_photo_offline_white.svg
@@ -0,0 +1,60 @@
+
+
diff --git a/art/ic_send_picture_offline_white.svg b/art/ic_send_picture_offline_white.svg
new file mode 100644
index 000000000..16131740f
--- /dev/null
+++ b/art/ic_send_picture_offline_white.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/art/ic_send_text_offline_white.svg b/art/ic_send_text_offline_white.svg
new file mode 100644
index 000000000..4434d33db
--- /dev/null
+++ b/art/ic_send_text_offline_white.svg
@@ -0,0 +1,70 @@
+
+
+
+
diff --git a/art/ic_send_voice_offline_white.svg b/art/ic_send_voice_offline_white.svg
new file mode 100644
index 000000000..25ffe3223
--- /dev/null
+++ b/art/ic_send_voice_offline_white.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/message_bubble_received_grey.svg b/art/message_bubble_received_grey.svg
new file mode 100644
index 000000000..e1d8347fc
--- /dev/null
+++ b/art/message_bubble_received_grey.svg
@@ -0,0 +1,167 @@
+
+
+
+
diff --git a/art/message_bubble_sent_grey.svg b/art/message_bubble_sent_grey.svg
new file mode 100644
index 000000000..23e13d665
--- /dev/null
+++ b/art/message_bubble_sent_grey.svg
@@ -0,0 +1,167 @@
+
+
+
+
diff --git a/art/render.rb b/art/render.rb
index 06100c5a2..9f3096491 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -12,42 +12,54 @@ resolutions = {
images = {
'conversations_baloon.svg' => ['ic_launcher', 48],
- 'conversations_baloon.svg' => ['main_logo', 200],
+ 'conversations_baloon.svg' => ['main_logo', 200],
'conversations_mono.svg' => ['ic_notification', 24],
'ic_received_indicator.svg' => ['ic_received_indicator', 12],
'ic_send_text_offline.svg' => ['ic_send_text_offline', 36],
+ 'ic_send_text_offline_white.svg' => ['ic_send_text_offline_white', 36],
'ic_send_text_online.svg' => ['ic_send_text_online', 36],
'ic_send_text_away.svg' => ['ic_send_text_away', 36],
'ic_send_text_dnd.svg' => ['ic_send_text_dnd', 36],
'ic_send_photo_online.svg' => ['ic_send_photo_online', 36],
'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36],
+ 'ic_send_photo_offline_white.svg' => ['ic_send_photo_offline_white', 36],
'ic_send_photo_away.svg' => ['ic_send_photo_away', 36],
'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36],
'ic_send_location_online.svg' => ['ic_send_location_online', 36],
'ic_send_location_offline.svg' => ['ic_send_location_offline', 36],
+ 'ic_send_location_offline_white.svg' => ['ic_send_location_offline_white', 36],
'ic_send_location_away.svg' => ['ic_send_location_away', 36],
'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36],
'ic_send_voice_online.svg' => ['ic_send_voice_online', 36],
'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36],
+ 'ic_send_voice_offline_white.svg' => ['ic_send_voice_offline_white', 36],
'ic_send_voice_away.svg' => ['ic_send_voice_away', 36],
'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36],
'ic_send_cancel_online.svg' => ['ic_send_cancel_online', 36],
'ic_send_cancel_offline.svg' => ['ic_send_cancel_offline', 36],
+ 'ic_send_cancel_offline_white.svg' => ['ic_send_cancel_offline_white', 36],
'ic_send_cancel_away.svg' => ['ic_send_cancel_away', 36],
'ic_send_cancel_dnd.svg' => ['ic_send_cancel_dnd', 36],
'ic_send_picture_online.svg' => ['ic_send_picture_online', 36],
'ic_send_picture_offline.svg' => ['ic_send_picture_offline', 36],
+ 'ic_send_picture_offline_white.svg' => ['ic_send_picture_offline_white', 36],
'ic_send_picture_away.svg' => ['ic_send_picture_away', 36],
'ic_send_picture_dnd.svg' => ['ic_send_picture_dnd', 36],
+ 'ic_notifications_none_white80.svg' => ['ic_notifications_none_white80', 24],
+ 'ic_notifications_off_white80.svg' => ['ic_notifications_off_white80', 24],
+ 'ic_notifications_paused_white80.svg' => ['ic_notifications_paused_white80', 24],
+ 'ic_notifications_white80.svg' => ['ic_notifications_white80', 24],
'md_switch_thumb_disable.svg' => ['switch_thumb_disable', 48],
'md_switch_thumb_off_normal.svg' => ['switch_thumb_off_normal', 48],
'md_switch_thumb_off_pressed.svg' => ['switch_thumb_off_pressed', 48],
'md_switch_thumb_on_normal.svg' => ['switch_thumb_on_normal', 48],
'md_switch_thumb_on_pressed.svg' => ['switch_thumb_on_pressed', 48],
'message_bubble_received.svg' => ['message_bubble_received.9', 0],
+ 'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0],
'message_bubble_received_warning.svg' => ['message_bubble_received_warning.9', 0],
'message_bubble_received_white.svg' => ['message_bubble_received_white.9', 0],
'message_bubble_sent.svg' => ['message_bubble_sent.9', 0],
+ 'message_bubble_sent_grey.svg' => ['message_bubble_sent_grey.9', 0],
}
# Executable paths for Mac OSX
diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
index a61b872ae..5d51e8b96 100644
--- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
@@ -1,7 +1,9 @@
package eu.siacs.conversations.ui;
import android.app.Activity;
+import android.content.res.Resources;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import eu.siacs.conversations.R;
@@ -10,6 +12,12 @@ public class AboutActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
+ Boolean dark = PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
+ .getString("theme", "light").equals("dark");
+ int mTheme = dark ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
+ setTheme(mTheme);
+
setContentView(R.layout.activity_about);
}
}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index a82f82458..a39f735ef 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -559,18 +559,23 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
}
}
+ int ic_notifications = getThemeResource(R.attr.icon_notifications, R.drawable.ic_notifications_black54_24dp);
+ int ic_notifications_off = getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black54_24dp);
+ int ic_notifications_paused = getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black54_24dp);
+ int ic_notifications_none = getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black54_24dp);
+
long mutedTill = mConversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
if (mutedTill == Long.MAX_VALUE) {
mNotifyStatusText.setText(R.string.notify_never);
- mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_off_grey600_24dp);
+ mNotifyStatusButton.setImageResource(ic_notifications_off);
} else if (System.currentTimeMillis() < mutedTill) {
mNotifyStatusText.setText(R.string.notify_paused);
- mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_paused_grey600_24dp);
+ mNotifyStatusButton.setImageResource(ic_notifications_paused);
} else if (mConversation.alwaysNotify()) {
- mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_grey600_24dp);
+ mNotifyStatusButton.setImageResource(ic_notifications);
mNotifyStatusText.setText(R.string.notify_on_all_messages);
} else {
- mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_none_grey600_24dp);
+ mNotifyStatusButton.setImageResource(ic_notifications_none);
mNotifyStatusText.setText(R.string.notify_only_when_highlighted);
}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 2717aa3d8..b09747135 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1569,8 +1569,8 @@ public class ConversationActivity extends XmppActivity
return getPreferences().getBoolean("indicate_received", false);
}
- public boolean useWhiteBackground() {
- return getPreferences().getBoolean("use_white_background",false);
+ public boolean useGreenBackground() {
+ return getPreferences().getBoolean("use_green_background",true);
}
protected boolean trustKeysIfNeeded(int requestCode) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 8e0b30a88..53a365257 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -9,6 +9,7 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentSender.SendIntentException;
+import android.content.res.TypedArray;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.Nullable;
@@ -998,7 +999,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_text_dnd;
default:
- return R.drawable.ic_send_text_offline;
+ return activity.getThemeResource(R.attr.ic_send_text_offline, R.drawable.ic_send_text_offline);
}
case TAKE_PHOTO:
switch (status) {
@@ -1011,7 +1012,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_photo_dnd;
default:
- return R.drawable.ic_send_photo_offline;
+ return activity.getThemeResource(R.attr.ic_send_photo_offline, R.drawable.ic_send_photo_offline);
}
case RECORD_VOICE:
switch (status) {
@@ -1024,7 +1025,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_voice_dnd;
default:
- return R.drawable.ic_send_voice_offline;
+ return activity.getThemeResource(R.attr.ic_send_voice_offline, R.drawable.ic_send_voice_offline);
}
case SEND_LOCATION:
switch (status) {
@@ -1037,7 +1038,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_location_dnd;
default:
- return R.drawable.ic_send_location_offline;
+ return activity.getThemeResource(R.attr.ic_send_location_offline, R.drawable.ic_send_location_offline);
}
case CANCEL:
switch (status) {
@@ -1050,7 +1051,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_cancel_dnd;
default:
- return R.drawable.ic_send_cancel_offline;
+ return activity.getThemeResource(R.attr.ic_send_cancel_offline, R.drawable.ic_send_cancel_offline);
}
case CHOOSE_PICTURE:
switch (status) {
@@ -1063,10 +1064,10 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_picture_dnd;
default:
- return R.drawable.ic_send_picture_offline;
+ return activity.getThemeResource(R.attr.ic_send_picture_offline, R.drawable.ic_send_picture_offline);
}
}
- return R.drawable.ic_send_text_offline;
+ return activity.getThemeResource(R.attr.ic_send_text_offline, R.drawable.ic_send_text_offline);
}
public void updateSendButton() {
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 22e126333..17ade7024 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -14,7 +14,6 @@ import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
-import android.util.Log;
import android.widget.Toast;
import java.security.KeyStoreException;
@@ -46,6 +45,13 @@ public class SettingsActivity extends XmppActivity implements
mSettingsFragment = new SettingsFragment();
fm.beginTransaction().replace(android.R.id.content, mSettingsFragment).commit();
}
+
+ this.mTheme = findTheme();
+ setTheme(this.mTheme);
+
+ int bgcolor = getPrimaryBackgroundColor();
+ getWindow().getDecorView().setBackgroundColor(bgcolor);
+
}
@Override
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index c63016434..2d908ff85 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -21,6 +21,7 @@ import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
+import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.Point;
@@ -379,6 +380,7 @@ public abstract class XmppActivity extends Activity {
super.onCreate(savedInstanceState);
metrics = getResources().getDisplayMetrics();
ExceptionHelper.init(getApplicationContext());
+
mPrimaryTextColor = getResources().getColor(R.color.black87);
mSecondaryTextColor = getResources().getColor(R.color.black54);
mTertiaryTextColor = getResources().getColor(R.color.black12);
@@ -388,8 +390,18 @@ public abstract class XmppActivity extends Activity {
mPrimaryColor = getResources().getColor(R.color.primary);
mPrimaryBackgroundColor = getResources().getColor(R.color.grey50);
mSecondaryBackgroundColor = getResources().getColor(R.color.grey200);
+
+ if(isDarkTheme()) {
+ mPrimaryTextColor = getResources().getColor(R.color.white);
+ mSecondaryTextColor = getResources().getColor(R.color.white70);
+ mTertiaryTextColor = getResources().getColor(R.color.white12);
+ mPrimaryBackgroundColor = getResources().getColor(R.color.grey800);
+ mSecondaryBackgroundColor = getResources().getColor(R.color.grey900);
+ }
+
this.mTheme = findTheme();
setTheme(this.mTheme);
+
this.mUsingEnterKey = usingEnterKey();
mUseSubject = getPreferences().getBoolean("use_subject", true);
final ActionBar ab = getActionBar();
@@ -398,6 +410,20 @@ public abstract class XmppActivity extends Activity {
}
}
+ public boolean isDarkTheme() {
+ return getPreferences().getString("theme", "light").equals("dark");
+ }
+
+ public int getThemeResource(int r_attr_name, int r_drawable_def) {
+ int[] attrs = { r_attr_name };
+ TypedArray ta = this.getTheme().obtainStyledAttributes(attrs);
+
+ int res = ta.getResourceId(0, r_drawable_def);
+ ta.recycle();
+
+ return res;
+ }
+
protected boolean isOptimizingBattery() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
@@ -1077,10 +1103,19 @@ public abstract class XmppActivity extends Activity {
}
protected int findTheme() {
- if (getPreferences().getBoolean("use_larger_font", false)) {
- return R.style.ConversationsTheme_LargerText;
+ Boolean dark = getPreferences().getString("theme", "light").equals("dark");
+ Boolean larger = getPreferences().getBoolean("use_larger_font", false);
+
+ if(dark) {
+ if(larger)
+ return R.style.ConversationsTheme_Dark_LargerText;
+ else
+ return R.style.ConversationsTheme_Dark;
} else {
- return R.style.ConversationsTheme;
+ if (larger)
+ return R.style.ConversationsTheme_LargerText;
+ else
+ return R.style.ConversationsTheme;
}
}
@@ -1098,6 +1133,7 @@ public abstract class XmppActivity extends Activity {
final int width = (size.x < size.y ? size.x : size.y);
Bitmap bitmap = createQrCodeBitmap(uri, width);
ImageView view = new ImageView(this);
+ view.setBackgroundColor(Color.WHITE);
view.setImageBitmap(bitmap);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setView(view);
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 34c9d7b32..4576dea3c 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -98,15 +98,18 @@ public class ConversationAdapter extends ArrayAdapter {
long muted_till = conversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
if (muted_till == Long.MAX_VALUE) {
notificationStatus.setVisibility(View.VISIBLE);
- notificationStatus.setImageResource(R.drawable.ic_notifications_off_grey600_24dp);
+ int ic_notifications_off = activity.getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black54_24dp);
+ notificationStatus.setImageResource(ic_notifications_off);
} else if (muted_till >= System.currentTimeMillis()) {
notificationStatus.setVisibility(View.VISIBLE);
- notificationStatus.setImageResource(R.drawable.ic_notifications_paused_grey600_24dp);
+ int ic_notifications_paused = activity.getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black54_24dp);
+ notificationStatus.setImageResource(ic_notifications_paused);
} else if (conversation.alwaysNotify()) {
notificationStatus.setVisibility(View.GONE);
} else {
notificationStatus.setVisibility(View.VISIBLE);
- notificationStatus.setImageResource(R.drawable.ic_notifications_none_grey600_24dp);
+ int ic_notifications_none = activity.getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black54_24dp);
+ notificationStatus.setImageResource(ic_notifications_none);
}
mTimestamp.setText(UIHelper.readableTimeDifference(activity,conversation.getLatestMessage().getTimeSent()));
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 5ba29802d..1ea2c223c 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -80,7 +80,7 @@ public class MessageAdapter extends ArrayAdapter {
}
};
private boolean mIndicateReceived = false;
- private boolean mUseWhiteBackground = false;
+ private boolean mUseGreenBackground = false;
public MessageAdapter(ConversationActivity activity, List messages) {
super(activity, 0, messages);
@@ -294,7 +294,7 @@ public class MessageAdapter extends ArrayAdapter {
viewHolder.messageBody.setText(span);
}
- private void displayTextMessage(final ViewHolder viewHolder, final Message message, boolean darkBackground) {
+ private void displayTextMessage(final ViewHolder viewHolder, final Message message, boolean darkBackground, int type) {
if (viewHolder.download_button != null) {
viewHolder.download_button.setVisibility(View.GONE);
}
@@ -388,7 +388,7 @@ public class MessageAdapter extends ArrayAdapter {
}
viewHolder.messageBody.setTextColor(this.getMessageTextColor(darkBackground, true));
viewHolder.messageBody.setLinkTextColor(this.getMessageTextColor(darkBackground, true));
- viewHolder.messageBody.setHighlightColor(activity.getResources().getColor(darkBackground ? R.color.grey800 : R.color.grey500));
+ viewHolder.messageBody.setHighlightColor(activity.getResources().getColor(darkBackground ? (type == SENT || !mUseGreenBackground ? R.color.black26 : R.color.grey800) : R.color.grey500));
viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
viewHolder.messageBody.setOnLongClickListener(openContextMenu);
}
@@ -556,7 +556,7 @@ public class MessageAdapter extends ArrayAdapter {
}
}
- boolean darkBackground = (type == RECEIVED && (!isInValidSession || !mUseWhiteBackground));
+ boolean darkBackground = type == RECEIVED && (!isInValidSession || mUseGreenBackground) || activity.isDarkTheme();
if (type == STATUS) {
if ("LOAD_MORE".equals(message.getBody())) {
@@ -672,14 +672,15 @@ public class MessageAdapter extends ArrayAdapter {
UIHelper.getFileDescriptionString(activity, message)));
}
} else {
- displayTextMessage(viewHolder, message, darkBackground);
+ displayTextMessage(viewHolder, message, darkBackground, type);
}
}
if (type == RECEIVED) {
if(isInValidSession) {
- if (mUseWhiteBackground) {
- viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_white);
+ if (!mUseGreenBackground) {
+ int bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white);
+ viewHolder.message_box.setBackgroundResource(bubble);
} else {
viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received);
}
@@ -734,7 +735,7 @@ public class MessageAdapter extends ArrayAdapter {
public void updatePreferences() {
this.mIndicateReceived = activity.indicateReceived();
- this.mUseWhiteBackground = activity.useWhiteBackground();
+ this.mUseGreenBackground = activity.useGreenBackground();
}
public interface OnContactPictureClicked {
diff --git a/src/main/res/drawable-hdpi/ic_action_chat.png b/src/main/res/drawable-hdpi/ic_action_chat.png
deleted file mode 100644
index 0847ac466..000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_chat.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_copy_white.png b/src/main/res/drawable-hdpi/ic_action_copy_white.png
new file mode 100644
index 000000000..f97df1d51
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_copy_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_refresh_white.png b/src/main/res/drawable-hdpi/ic_action_refresh_white.png
new file mode 100644
index 000000000..dae27903e
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_refresh_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_remove_white.png b/src/main/res/drawable-hdpi/ic_action_remove_white.png
new file mode 100644
index 000000000..e206f296c
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_remove_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_settings_white.png b/src/main/res/drawable-hdpi/ic_action_settings_white.png
new file mode 100644
index 000000000..54eecded3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_settings_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 000000000..9a9e5706f
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 5592d5c80..000000000
Binary files a/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 000000000..70eb07378
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_delete_black_24dp.png b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png
new file mode 100644
index 000000000..dbbb602a0
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index b72a9f3c6..000000000
Binary files a/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_edit_black_24dp.png b/src/main/res/drawable-hdpi/ic_edit_black_24dp.png
new file mode 100644
index 000000000..b900af02c
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index b5f88c80a..000000000
Binary files a/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 000000000..d0e987e89
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..12969c50f
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index 96b329c4a..000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 000000000..6ea331d13
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 000000000..32470b8be
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_none_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index 6cd4dfc90..000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_white80.png b/src/main/res/drawable-hdpi/ic_notifications_none_white80.png
new file mode 100644
index 000000000..258dad413
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_none_white80.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 000000000..b998c8c49
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_none_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 000000000..98c282978
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 000000000..06cfa7501
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_off_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index 09ebc5d25..000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_white80.png b/src/main/res/drawable-hdpi/ic_notifications_off_white80.png
new file mode 100644
index 000000000..62bd41c67
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_off_white80.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 000000000..d2b23cf74
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_off_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 000000000..3366fc693
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 000000000..a6cf0b15e
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_paused_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index e92d43acf..000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-hdpi/ic_notifications_paused_white80.png
new file mode 100644
index 000000000..396a9247c
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_paused_white80.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 000000000..9210e39ab
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_paused_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_white80.png b/src/main/res/drawable-hdpi/ic_notifications_white80.png
new file mode 100644
index 000000000..9e262175a
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_white80.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png
new file mode 100644
index 000000000..d792f835a
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-hdpi/ic_refresh_black_24dp.png
new file mode 100644
index 000000000..9d94c39c8
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_refresh_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index 51cc4dbd1..000000000
Binary files a/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..ffa7be933
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_cancel_offline_dark.png
new file mode 100644
index 000000000..7eedbb6fd
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_cancel_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 000000000..d5af1d004
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_location_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_location_offline_dark.png
new file mode 100644
index 000000000..301aac16a
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_location_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_location_offline_white.png b/src/main/res/drawable-hdpi/ic_send_location_offline_white.png
new file mode 100644
index 000000000..c6f60c2f7
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_location_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_photo_offline_dark.png
new file mode 100644
index 000000000..e90564f1d
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_photo_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png
new file mode 100644
index 000000000..2ef8d36aa
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_picture_offline_dark.png
new file mode 100644
index 000000000..8d6a0538d
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_picture_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png
new file mode 100644
index 000000000..611785bc3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_text_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_text_offline_dark.png
new file mode 100644
index 000000000..dcb74bcde
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_text_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_text_offline_white.png b/src/main/res/drawable-hdpi/ic_send_text_offline_white.png
new file mode 100644
index 000000000..8d600e355
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_text_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_voice_offline_dark.png
new file mode 100644
index 000000000..87111a627
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_voice_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png
new file mode 100644
index 000000000..73e3bb979
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..acf1ddf85
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 20d2b66e0..000000000
Binary files a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
new file mode 100644
index 000000000..97ded33b5
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_settings_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png
index dfd857cb2..9e6c9551e 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received.9.png and b/src/main/res/drawable-hdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png
new file mode 100644
index 000000000..eaa1fd246
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
index fd07bc20c..29cf4844e 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
index bec207983..45678001b 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
index 10dc2e299..627e3a784 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_sent.9.png and b/src/main/res/drawable-hdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 000000000..a59c12364
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_chat.png b/src/main/res/drawable-mdpi/ic_action_chat.png
deleted file mode 100644
index 8fdb5d752..000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_chat.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_copy_white.png b/src/main/res/drawable-mdpi/ic_action_copy_white.png
new file mode 100644
index 000000000..d846e72c6
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_copy_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_refresh_white.png b/src/main/res/drawable-mdpi/ic_action_refresh_white.png
new file mode 100644
index 000000000..94ab6f4c5
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_refresh_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_remove_white.png b/src/main/res/drawable-mdpi/ic_action_remove_white.png
new file mode 100644
index 000000000..70e6d2d2a
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_remove_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_settings_white.png b/src/main/res/drawable-mdpi/ic_action_settings_white.png
new file mode 100644
index 000000000..25c36db42
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_settings_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 000000000..c94cc28f1
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index bab9b4d66..000000000
Binary files a/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 000000000..80c069557
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_delete_black_24dp.png b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png
new file mode 100644
index 000000000..999aa4ccc
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index e757fdb07..000000000
Binary files a/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_black_24dp.png b/src/main/res/drawable-mdpi/ic_edit_black_24dp.png
new file mode 100644
index 000000000..9efbaae28
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index bae3480cb..000000000
Binary files a/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 000000000..91cd0b849
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..32562b0f3
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index d6c20c203..000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 000000000..7c41a4452
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 000000000..883efb08b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_none_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index 3e8b0805c..000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_white80.png b/src/main/res/drawable-mdpi/ic_notifications_none_white80.png
new file mode 100644
index 000000000..4851fcb12
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_none_white80.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 000000000..45f4704e1
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_none_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 000000000..c2ee2de29
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 000000000..8838da991
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_off_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index af3b63215..000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_white80.png b/src/main/res/drawable-mdpi/ic_notifications_off_white80.png
new file mode 100644
index 000000000..f15f78737
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_off_white80.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 000000000..3fec9c71e
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_off_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 000000000..0c4fc2eff
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 000000000..7c238fd5f
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_paused_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index 9d6308d2c..000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-mdpi/ic_notifications_paused_white80.png
new file mode 100644
index 000000000..83091bbfa
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_paused_white80.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 000000000..8a48f2f72
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_paused_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_white80.png b/src/main/res/drawable-mdpi/ic_notifications_white80.png
new file mode 100644
index 000000000..983aa4549
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_white80.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png
new file mode 100644
index 000000000..2a5c93c73
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-mdpi/ic_refresh_black_24dp.png
new file mode 100644
index 000000000..c82efd5f5
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_refresh_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index c136c59fc..000000000
Binary files a/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..97e42b525
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_cancel_offline_dark.png
new file mode 100644
index 000000000..fac99623b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_cancel_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 000000000..64cdb9918
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_location_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_location_offline_dark.png
new file mode 100644
index 000000000..17185ec24
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_location_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_location_offline_white.png b/src/main/res/drawable-mdpi/ic_send_location_offline_white.png
new file mode 100644
index 000000000..6a70df284
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_location_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_photo_offline_dark.png
new file mode 100644
index 000000000..268182ff2
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_photo_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png
new file mode 100644
index 000000000..69a051862
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_picture_offline_dark.png
new file mode 100644
index 000000000..f153be99e
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_picture_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png
new file mode 100644
index 000000000..98428b794
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_text_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_text_offline_dark.png
new file mode 100644
index 000000000..5cf508afc
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_text_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_text_offline_white.png b/src/main/res/drawable-mdpi/ic_send_text_offline_white.png
new file mode 100644
index 000000000..d8220cf96
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_text_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_voice_offline_dark.png
new file mode 100644
index 000000000..5ae192c41
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_voice_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png
new file mode 100644
index 000000000..1d18b812e
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..c59419c02
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_settings_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 5a1b41f03..000000000
Binary files a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
new file mode 100644
index 000000000..8909c3553
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_settings_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png
index 9835a7361..d5efb9310 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received.9.png and b/src/main/res/drawable-mdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png
new file mode 100644
index 000000000..3cc08a8e9
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
index ff8f80b69..97b492758 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
index d7a3bb5dd..73a99dd7c 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
index 596699bbe..5776b5645 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_sent.9.png and b/src/main/res/drawable-mdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 000000000..72a11f5e1
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_chat.png b/src/main/res/drawable-xhdpi/ic_action_chat.png
deleted file mode 100644
index 8a9a43141..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_chat.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_copy_white.png b/src/main/res/drawable-xhdpi/ic_action_copy_white.png
new file mode 100644
index 000000000..a6e1aa290
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_copy_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_refresh_white.png b/src/main/res/drawable-xhdpi/ic_action_refresh_white.png
new file mode 100644
index 000000000..ab4ab9da6
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_refresh_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_remove_white.png b/src/main/res/drawable-xhdpi/ic_action_remove_white.png
new file mode 100644
index 000000000..d1634205d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_remove_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_settings_white.png b/src/main/res/drawable-xhdpi/ic_action_settings_white.png
new file mode 100644
index 000000000..425a8bc8d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_settings_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 000000000..1cf76a960
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 68ccece61..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 000000000..537fd4e8b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png
new file mode 100644
index 000000000..796ccd225
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index c6bb43e8b..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png
new file mode 100644
index 000000000..87f8de1ca
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 4c95bd577..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 000000000..9bc2a6a6c
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..98cbec6ed
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index d441dc7c9..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 000000000..d55863829
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 000000000..ac14eba94
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_none_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index 1123cea43..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_none_white80.png
new file mode 100644
index 000000000..5585a2ea7
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_none_white80.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 000000000..19eba2084
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_none_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 000000000..92dbcf147
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 000000000..3d6643bcc
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_off_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index aef303a0d..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_off_white80.png
new file mode 100644
index 000000000..ff5246b74
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_off_white80.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 000000000..3e96f6deb
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_off_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 000000000..cd0ddaa03
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 000000000..bea6a8235
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_paused_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index c68bedd38..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_white80.png
new file mode 100644
index 000000000..644e0652b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_paused_white80.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 000000000..cf566ec2a
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_paused_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_white80.png
new file mode 100644
index 000000000..c3405e98d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_white80.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 000000000..9718ccf00
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-xhdpi/ic_refresh_black_24dp.png
new file mode 100644
index 000000000..0b731280f
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_refresh_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index 7891efffa..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..1989184b1
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_dark.png
new file mode 100644
index 000000000..f55c282d8
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 000000000..eb8df8793
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_location_offline_dark.png
new file mode 100644
index 000000000..54788f08e
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_location_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png
new file mode 100644
index 000000000..951bfdee6
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_photo_offline_dark.png
new file mode 100644
index 000000000..ec86ad5e0
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_photo_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 000000000..91a6b719c
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_picture_offline_dark.png
new file mode 100644
index 000000000..3e687799d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_picture_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 000000000..b5b3d84cc
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_text_offline_dark.png
new file mode 100644
index 000000000..b3c91e8ae
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_text_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png
new file mode 100644
index 000000000..bbd5d4449
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_voice_offline_dark.png
new file mode 100644
index 000000000..f7a454df4
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_voice_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 000000000..6df97e9b6
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..e84e188a1
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 2251d2bbb..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
new file mode 100644
index 000000000..5caedc8e5
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
index c0eb47ebb..732ec2f79 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png
new file mode 100644
index 000000000..66f471cac
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
index fe0324cee..b957f6146 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
index fdb6be0d1..68b56dbfc 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
index cb5654b71..018f642ce 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 000000000..a5d0eba05
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_chat.png b/src/main/res/drawable-xxhdpi/ic_action_chat.png
deleted file mode 100644
index 04000fd0f..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_chat.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_copy_white.png b/src/main/res/drawable-xxhdpi/ic_action_copy_white.png
new file mode 100644
index 000000000..a381cdc3f
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_copy_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png b/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png
new file mode 100644
index 000000000..44ee117ee
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_remove_white.png b/src/main/res/drawable-xxhdpi/ic_action_remove_white.png
new file mode 100644
index 000000000..5dc214356
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_remove_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings_white.png b/src/main/res/drawable-xxhdpi/ic_action_settings_white.png
new file mode 100644
index 000000000..fe5fec471
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_settings_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 000000000..074ea8807
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 2fdbbea13..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 000000000..9dff893e7
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png
new file mode 100644
index 000000000..6d7cb81c5
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index 4886ab1e9..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png
new file mode 100644
index 000000000..4af4ae634
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 6ed4351ca..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 000000000..25ca3bf2b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..74c46cf43
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index 7d58d25d8..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 000000000..d11bf922b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 000000000..829541728
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_none_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index b8772d377..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_white80.png
new file mode 100644
index 000000000..48dd4755d
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_none_white80.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 000000000..a1b5b7efd
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_none_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 000000000..bbef75548
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 000000000..b7fa59468
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_off_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index e627b30a8..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_white80.png
new file mode 100644
index 000000000..85faa9bee
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_off_white80.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 000000000..f70ea1284
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_off_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 000000000..108f7b944
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 000000000..796398e46
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index e38f52179..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white80.png
new file mode 100644
index 000000000..d089457a2
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white80.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 000000000..e31b0d36f
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_white80.png
new file mode 100644
index 000000000..b05f3a287
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_white80.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 000000000..cbd0c1e9d
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_black_24dp.png
new file mode 100644
index 000000000..91187eb03
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_refresh_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index 9c1e27d74..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..1692d8a24
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 000000000..d2203a0a1
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png
new file mode 100644
index 000000000..b5fcd9ce2
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 000000000..016ec0792
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 000000000..dbf1f14b4
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png
new file mode 100644
index 000000000..93374aaa4
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 000000000..38fd2a676
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..3023ff8da
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 6a70402b4..000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
new file mode 100644
index 000000000..eabb0a2ba
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
index 10e784089..b2c3d0a86 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png
new file mode 100644
index 000000000..f4c009c24
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
index 53ecbecf7..2183ca992 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
index 436a1bd32..178fe1a1a 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
index f78425d21..906386b31 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 000000000..3f210ba5c
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 000000000..1f6af72d0
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 1eb62d42c..000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 000000000..4ddee9ef0
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png
new file mode 100644
index 000000000..f2b75c311
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index e4e218123..000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png
new file mode 100644
index 000000000..d6761ba16
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 0c0fd76f6..000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 000000000..c05fd3b54
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..b06e6bc28
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index 98dff2f3c..000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 000000000..c433379fb
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 000000000..6ebe6649c
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index ffdb15a83..000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white80.png
new file mode 100644
index 000000000..359365954
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white80.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 000000000..d4627a9ef
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 000000000..2d50a5257
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 000000000..db8f1f3df
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index ab65f4b22..000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white80.png
new file mode 100644
index 000000000..daef1e0d8
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white80.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 000000000..874bc6277
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 000000000..647a611a2
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 000000000..5e12f7c18
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index 53162e569..000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white80.png
new file mode 100644
index 000000000..b0dd0d38f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white80.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 000000000..5c65e5bc2
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_white80.png
new file mode 100644
index 000000000..062b4c219
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_white80.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 000000000..1e70b6332
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_black_24dp.png
new file mode 100644
index 000000000..bcaba5f68
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_refresh_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index e44a6d282..000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_refresh_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 000000000..f5beca251
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 000000000..3e9c1f7ca
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png
new file mode 100644
index 000000000..4fb12a0d9
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 000000000..26683df17
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 000000000..215abff23
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png
new file mode 100644
index 000000000..b07abab38
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 000000000..7258b8e39
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 000000000..476d5c978
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 5eba9e8ec..000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
new file mode 100644
index 000000000..507c5edd4
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
index c474359ea..310e38034 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png
new file mode 100644
index 000000000..dbeaef128
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
index 1421768cc..336906baa 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
index ee89b6706..9ad50df9c 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
index d34038d07..1aa231412 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 000000000..473b1b0d8
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable/infocard_border_dark.xml b/src/main/res/drawable/infocard_border_dark.xml
new file mode 100644
index 000000000..f5b5fed9a
--- /dev/null
+++ b/src/main/res/drawable/infocard_border_dark.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/res/layout-w945dp/fragment_conversations_overview.xml b/src/main/res/layout-w945dp/fragment_conversations_overview.xml
index 7ae1788d7..63eb0e57c 100644
--- a/src/main/res/layout-w945dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w945dp/fragment_conversations_overview.xml
@@ -9,14 +9,14 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@color/grey50"
+ android:background="?attr/color_background_primary"
android:orientation="vertical" >
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index cac9a9fa6..605f63efd 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:scrollHorizontally="false"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeHeadline" />
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index 247e96e59..cae60ebbb 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -1,9 +1,9 @@
+ android:layout_height="fill_parent"
+ android:background="?attr/color_background_primary">
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 6fb1d0131..886c45c65 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -2,7 +2,7 @@
+ android:background="?attr/color_background_secondary">
@@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/current_password"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
@@ -96,7 +96,7 @@
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
- android:background="@color/black12"/>
+ android:background="?attr/divider"/>
@@ -115,7 +115,7 @@
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
- android:background="@drawable/infocard_border"
+ android:background="?attr/infocard_border"
android:divider="?android:dividerHorizontal"
android:orientation="vertical"
android:padding="@dimen/infocard_padding"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index d308b4ce7..e180f1be4 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/grey200">
+ android:background="?attr/color_background_secondary">
@@ -136,7 +136,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/register_account"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
@@ -155,8 +155,8 @@
android:layout_marginTop="8dp"
android:hint="@string/confirm_password"
android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
+ android:textColor="?attr/color_text_primary"
+ android:textColorHint="?attr/color_text_secondary"
android:textSize="?attr/TextSizeBody"
android:visibility="gone"/>
@@ -170,7 +170,7 @@
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
- android:background="@drawable/infocard_border"
+ android:background="?attr/infocard_border"
android:orientation="vertical"
android:padding="@dimen/infocard_padding"
android:visibility="gone">
@@ -179,7 +179,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/battery_optimizations_enabled"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"/>