diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index faeb41200..0f3e86af9 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@@ -36,6 +36,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.SwitchCompat;
@@ -147,7 +148,6 @@ public abstract class BaseMainActivity extends AppCompatActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-
         final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
 
         installProviders();
@@ -987,7 +987,7 @@ public abstract class BaseMainActivity extends AppCompatActivity
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.dark_icon);
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_icon);
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_icon);
-                    changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_icon);
+                    changeDrawableColor(getApplicationContext(), R.drawable.ic_star_border,R.color.dark_icon);
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_text);
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_text);
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_text);
@@ -999,7 +999,7 @@ public abstract class BaseMainActivity extends AppCompatActivity
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.black);
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.black);
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.black);
-                    changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.black);
+                    changeDrawableColor(getApplicationContext(), R.drawable.ic_star_border,R.color.black);
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.white);
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.white);
                     changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.white);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
index b1974e264..4b6ee76c7 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
@@ -160,7 +160,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                 }else {
                     holder.card_status_container.setCardBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_2));
                 }
-                imgH = ContextCompat.getDrawable(context, R.drawable.ic_boost_header_notif);
+                imgH = ContextCompat.getDrawable(context, R.drawable.ic_repeat_head);
                 holder.main_container_trans.setVisibility(View.VISIBLE);
                 break;
             case "favourite":
@@ -174,7 +174,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                 }else {
                     holder.card_status_container.setCardBackgroundColor(ContextCompat.getColor(context, R.color.notif_light_3));
                 }
-                imgH = ContextCompat.getDrawable(context, R.drawable.ic_fav_notif_header);
+                imgH = ContextCompat.getDrawable(context, R.drawable.ic_star_border_header);
                 holder.main_container_trans.setVisibility(View.VISIBLE);
                 break;
             case "follow":
@@ -193,8 +193,8 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                 break;
         }
         changeDrawableColor(context, R.drawable.ic_chat_bubble_outline, R.color.mastodonC4);
-        changeDrawableColor(context, R.drawable.ic_boost_header_notif,R.color.mastodonC4);
-        changeDrawableColor(context, R.drawable.ic_fav_notif_header,R.color.mastodonC4);
+        changeDrawableColor(context, R.drawable.ic_repeat_head,R.color.mastodonC4);
+        changeDrawableColor(context, R.drawable.ic_star_border_header,R.color.mastodonC4);
         changeDrawableColor(context, R.drawable.ic_follow_notif_header,R.color.mastodonC4);
         holder.notification_type.setText(typeString);
         if( imgH != null) {
@@ -222,7 +222,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
             changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.dark_icon);
             changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_icon);
             changeDrawableColor(context, R.drawable.ic_retweet,R.color.dark_icon);
-            changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon);
+            changeDrawableColor(context, R.drawable.ic_star_border,R.color.dark_icon);
             changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text);
             changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_text);
             changeDrawableColor(context, R.drawable.ic_delete,R.color.dark_text);
@@ -234,7 +234,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
             changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.black);
             changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.black);
             changeDrawableColor(context, R.drawable.ic_retweet,R.color.black);
-            changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.black);
+            changeDrawableColor(context, R.drawable.ic_star_border,R.color.black);
             changeDrawableColor(context, R.drawable.ic_photo,R.color.black);
             changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.black);
             changeDrawableColor(context, R.drawable.ic_delete,R.color.black);
@@ -304,25 +304,25 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
 
                 Drawable imgFav, imgReblog;
                 if( status.isFavourited() || (status.getReblog() != null && status.getReblog().isFavourited())) {
-                    changeDrawableColor(context, R.drawable.ic_favorite,R.color.marked_icon);
-                    imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite);
+                    changeDrawableColor(context, R.drawable.ic_star,R.color.marked_icon);
+                    imgFav = ContextCompat.getDrawable(context, R.drawable.ic_star);
                 }else {
                     if( theme == THEME_DARK)
-                        changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon);
+                        changeDrawableColor(context, R.drawable.ic_star_border,R.color.dark_icon);
                     else
-                        changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.black);
-                    imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite_border);
+                        changeDrawableColor(context, R.drawable.ic_star_border,R.color.black);
+                    imgFav = ContextCompat.getDrawable(context, R.drawable.ic_star_border);
                 }
 
                 if( status.isReblogged()|| (status.getReblog() != null && status.getReblog().isReblogged())) {
-                    changeDrawableColor(context, R.drawable.ic_boost,R.color.boost_icon);
-                    imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost);
+                    changeDrawableColor(context, R.drawable.ic_repeat_boost,R.color.boost_icon);
+                    imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_repeat_boost);
                 }else {
                     if( theme == THEME_DARK)
-                        changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_icon);
+                        changeDrawableColor(context, R.drawable.ic_repeat,R.color.dark_icon);
                     else
-                        changeDrawableColor(context, R.drawable.ic_boost_border,R.color.black);
-                    imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost_border);
+                        changeDrawableColor(context, R.drawable.ic_repeat,R.color.black);
+                    imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_repeat);
                 }
 
                 imgFav.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f));
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 3416aaeb1..0cac50ff8 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -413,9 +413,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 changeDrawableColor(context, R.drawable.ic_lock_open,R.color.dark_icon);
                 changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.dark_icon);
                 changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_icon);
-                changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_icon);
-                changeDrawableColor(context, R.drawable.ic_boost_header,R.color.dark_icon);
-                changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon);
+                changeDrawableColor(context, R.drawable.ic_repeat,R.color.dark_icon);
+                changeDrawableColor(context, R.drawable.ic_star_border,R.color.dark_icon);
                 changeDrawableColor(context, R.drawable.ic_action_pin_dark, R.color.dark_icon);
                 changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text);
                 changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_text);
@@ -427,9 +426,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 changeDrawableColor(context, R.drawable.ic_lock_open,R.color.black);
                 changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.black);
                 changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.black);
-                changeDrawableColor(context, R.drawable.ic_boost_border,R.color.black);
-                changeDrawableColor(context, R.drawable.ic_boost_header,R.color.black);
-                changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.black);
+                changeDrawableColor(context, R.drawable.ic_repeat,R.color.black);
+                changeDrawableColor(context, R.drawable.ic_star_border,R.color.black);
                 changeDrawableColor(context, R.drawable.ic_action_pin_dark, R.color.black);
                 changeDrawableColor(context, R.drawable.ic_photo,R.color.white);
                 changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.white);
@@ -439,7 +437,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             //Redraws top icons (boost/reply)
             final float scale = context.getResources().getDisplayMetrics().density;
             if( status.getReblog() != null){
-                Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_boost_header);
+                Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_repeat);
                 img.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (15 * iconSizePercent/100 * scale + 0.5f));
                 holder.status_account_displayname.setCompoundDrawables( img, null, null, null);
                 holder.status_account_displayname.setVisibility(View.VISIBLE);
@@ -687,25 +685,25 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
                 Drawable imgFav, imgReblog, imgPinned, imgReply;
                 if( status.isFavourited() || (status.getReblog() != null && status.getReblog().isFavourited())) {
-                    changeDrawableColor(context, R.drawable.ic_favorite,R.color.marked_icon);
-                    imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite);
+                    changeDrawableColor(context, R.drawable.ic_star,R.color.marked_icon);
+                    imgFav = ContextCompat.getDrawable(context, R.drawable.ic_star);
                 }else {
                     if( theme == THEME_DARK)
-                        changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon);
+                        changeDrawableColor(context, R.drawable.ic_star_border,R.color.dark_icon);
                     else
-                        changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.black);
-                    imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite_border);
+                        changeDrawableColor(context, R.drawable.ic_star_border,R.color.black);
+                    imgFav = ContextCompat.getDrawable(context, R.drawable.ic_star_border);
                 }
 
                 if( status.isReblogged()|| (status.getReblog() != null && status.getReblog().isReblogged())) {
-                    changeDrawableColor(context, R.drawable.ic_boost,R.color.boost_icon);
-                    imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost);
+                    changeDrawableColor(context, R.drawable.ic_repeat,R.color.boost_icon);
+                    imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_repeat);
                 }else {
                     if( theme == THEME_DARK)
-                        changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_icon);
+                        changeDrawableColor(context, R.drawable.ic_repeat,R.color.dark_icon);
                     else
-                        changeDrawableColor(context, R.drawable.ic_boost_border,R.color.black);
-                    imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost_border);
+                        changeDrawableColor(context, R.drawable.ic_repeat,R.color.black);
+                    imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_repeat);
                 }
 
                 if( status.isPinned()|| (status.getReblog() != null && status.getReblog().isPinned())) {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 897296639..f5f4e5f9d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -1441,6 +1441,8 @@ public class Helper {
      */
     public static Drawable changeDrawableColor(Context context, int drawable, int hexaColor){
         Drawable mDrawable = ContextCompat.getDrawable(context, drawable);
+        int color = Color.parseColor(context.getString(hexaColor));
+        mDrawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
         DrawableCompat.setTint(mDrawable, ContextCompat.getColor(context, hexaColor));
         return mDrawable;
     }
diff --git a/app/src/main/res/drawable-anydpi/ic_arrow_drop_down.xml b/app/src/main/res/drawable-anydpi/ic_arrow_drop_down.xml
index 62b27ef0b..b82186765 100644
--- a/app/src/main/res/drawable-anydpi/ic_arrow_drop_down.xml
+++ b/app/src/main/res/drawable-anydpi/ic_arrow_drop_down.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M7,10l5,5 5,-5z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_arrow_drop_up.xml b/app/src/main/res/drawable-anydpi/ic_arrow_drop_up.xml
index b1442ce15..c63c8c652 100644
--- a/app/src/main/res/drawable-anydpi/ic_arrow_drop_up.xml
+++ b/app/src/main/res/drawable-anydpi/ic_arrow_drop_up.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M7,14l5,-5 5,5z"/>
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_cancel.xml b/app/src/main/res/drawable-anydpi/ic_cancel.xml
new file mode 100644
index 000000000..7d2b57eb2
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_cancel.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_chat_bubble_outline.xml b/app/src/main/res/drawable-anydpi/ic_chat_bubble_outline.xml
new file mode 100644
index 000000000..880a1b1a9
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_chat_bubble_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,16L6,16l-2,2L4,4h16v12z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_check.xml b/app/src/main/res/drawable-anydpi/ic_check.xml
new file mode 100644
index 000000000..3c728c59f
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_close.xml b/app/src/main/res/drawable-anydpi/ic_close.xml
new file mode 100644
index 000000000..d11cc5c9c
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_close.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_delete.xml b/app/src/main/res/drawable-anydpi/ic_delete.xml
new file mode 100644
index 000000000..39e64d698
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_edit.xml b/app/src/main/res/drawable-anydpi/ic_edit.xml
new file mode 100644
index 000000000..35a774a51
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_edit.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_email.xml b/app/src/main/res/drawable-anydpi/ic_email.xml
new file mode 100644
index 000000000..c300537f6
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_email.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_fiber_new.xml b/app/src/main/res/drawable-anydpi/ic_fiber_new.xml
new file mode 100644
index 000000000..6097dff02
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_fiber_new.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM8.5,15L7.3,15l-2.55,-3.5L4.75,15L3.5,15L3.5,9h1.25l2.5,3.5L7.25,9L8.5,9v6zM13.5,10.26L11,10.26v1.12h2.5v1.26L11,12.64v1.11h2.5L13.5,15h-4L9.5,9h4v1.26zM20.5,14c0,0.55 -0.45,1 -1,1h-4c-0.55,0 -1,-0.45 -1,-1L14.5,9h1.25v4.51h1.13L16.88,9.99h1.25v3.51h1.12L19.25,9h1.25v5z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_repeat.xml b/app/src/main/res/drawable-anydpi/ic_repeat.xml
new file mode 100644
index 000000000..e7c67d710
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_repeat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_repeat_boost.xml b/app/src/main/res/drawable-anydpi/ic_repeat_boost.xml
new file mode 100644
index 000000000..e7c67d710
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_repeat_boost.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_repeat_head.xml b/app/src/main/res/drawable-anydpi/ic_repeat_head.xml
new file mode 100644
index 000000000..e7c67d710
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_repeat_head.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_star.xml b/app/src/main/res/drawable-anydpi/ic_star.xml
new file mode 100644
index 000000000..a87ca098d
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_star.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_star_border.xml b/app/src/main/res/drawable-anydpi/ic_star_border.xml
new file mode 100644
index 000000000..b36536b99
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_star_border.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_star_border_header.xml b/app/src/main/res/drawable-anydpi/ic_star_border_header.xml
new file mode 100644
index 000000000..b36536b99
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_star_border_header.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_star_menu.xml b/app/src/main/res/drawable-anydpi/ic_star_menu.xml
new file mode 100644
index 000000000..a87ca098d
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_star_menu.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_drop_down.png b/app/src/main/res/drawable-hdpi/ic_arrow_drop_down.png
new file mode 100644
index 000000000..ce914f90a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_arrow_drop_down.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_boost.png b/app/src/main/res/drawable-hdpi/ic_boost.png
deleted file mode 100644
index aabe84ac9..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_boost.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_boost_border.png b/app/src/main/res/drawable-hdpi/ic_boost_border.png
deleted file mode 100644
index aabe84ac9..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_boost_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_boost_header.png b/app/src/main/res/drawable-hdpi/ic_boost_header.png
deleted file mode 100644
index aabe84ac9..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_boost_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_boost_header_notif.png b/app/src/main/res/drawable-hdpi/ic_boost_header_notif.png
deleted file mode 100644
index aabe84ac9..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_boost_header_notif.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_cancel.png b/app/src/main/res/drawable-hdpi/ic_cancel.png
deleted file mode 100644
index e25273a14..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_chat_bubble_outline.png b/app/src/main/res/drawable-hdpi/ic_chat_bubble_outline.png
deleted file mode 100644
index 81157515f..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_chat_bubble_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_check.png b/app/src/main/res/drawable-hdpi/ic_check.png
deleted file mode 100644
index f61a0322f..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_delete.png b/app/src/main/res/drawable-hdpi/ic_delete.png
deleted file mode 100644
index f40c83bd9..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_email.png b/app/src/main/res/drawable-hdpi/ic_email.png
deleted file mode 100644
index e2782b58c..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_email.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_email_white.png b/app/src/main/res/drawable-hdpi/ic_email_white.png
deleted file mode 100644
index 715102565..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_email_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_fav_notif_header.png b/app/src/main/res/drawable-hdpi/ic_fav_notif_header.png
deleted file mode 100644
index c19afd294..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_fav_notif_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_favorite.png b/app/src/main/res/drawable-hdpi/ic_favorite.png
deleted file mode 100644
index a099f0d2d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_favorite.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_favorite_border.png b/app/src/main/res/drawable-hdpi/ic_favorite_border.png
deleted file mode 100644
index c19afd294..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_favorite_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_favorite_menu.png b/app/src/main/res/drawable-hdpi/ic_favorite_menu.png
deleted file mode 100644
index a099f0d2d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_favorite_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_fiber_new.png b/app/src/main/res/drawable-hdpi/ic_fiber_new.png
deleted file mode 100644
index ec7fdc454..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_boost.png b/app/src/main/res/drawable-ldpi/ic_boost.png
deleted file mode 100644
index fb82dacb4..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_boost.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_boost_border.png b/app/src/main/res/drawable-ldpi/ic_boost_border.png
deleted file mode 100644
index fb82dacb4..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_boost_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_boost_header.png b/app/src/main/res/drawable-ldpi/ic_boost_header.png
deleted file mode 100644
index fb82dacb4..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_boost_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_boost_header_notif.png b/app/src/main/res/drawable-ldpi/ic_boost_header_notif.png
deleted file mode 100644
index fb82dacb4..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_boost_header_notif.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_cancel.png b/app/src/main/res/drawable-ldpi/ic_cancel.png
deleted file mode 100644
index 3b95a3913..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_chat_bubble_outline.png b/app/src/main/res/drawable-ldpi/ic_chat_bubble_outline.png
deleted file mode 100644
index 1750c8e47..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_chat_bubble_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_check.png b/app/src/main/res/drawable-ldpi/ic_check.png
deleted file mode 100644
index c06a89570..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_close.png b/app/src/main/res/drawable-ldpi/ic_close.png
deleted file mode 100644
index 834a5afcc..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_close.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_delete.png b/app/src/main/res/drawable-ldpi/ic_delete.png
deleted file mode 100644
index 0b30f712d..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_edit.png b/app/src/main/res/drawable-ldpi/ic_edit.png
deleted file mode 100644
index 1d75bd154..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_edit.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_email.png b/app/src/main/res/drawable-ldpi/ic_email.png
deleted file mode 100644
index eced406f0..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_email.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_email_white.png b/app/src/main/res/drawable-ldpi/ic_email_white.png
deleted file mode 100644
index 985135adb..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_email_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_fav_notif_header.png b/app/src/main/res/drawable-ldpi/ic_fav_notif_header.png
deleted file mode 100644
index bd4e201f5..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_fav_notif_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_favorite.png b/app/src/main/res/drawable-ldpi/ic_favorite.png
deleted file mode 100644
index 17af1355c..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_favorite.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_favorite_border.png b/app/src/main/res/drawable-ldpi/ic_favorite_border.png
deleted file mode 100644
index bd4e201f5..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_favorite_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_favorite_menu.png b/app/src/main/res/drawable-ldpi/ic_favorite_menu.png
deleted file mode 100644
index 17af1355c..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_favorite_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/ic_fiber_new.png b/app/src/main/res/drawable-ldpi/ic_fiber_new.png
deleted file mode 100644
index 45be937c6..000000000
Binary files a/app/src/main/res/drawable-ldpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_drop_down.png b/app/src/main/res/drawable-mdpi/ic_arrow_drop_down.png
new file mode 100644
index 000000000..3acbaf8df
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_arrow_drop_down.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_boost.png b/app/src/main/res/drawable-mdpi/ic_boost.png
deleted file mode 100644
index 9d947b318..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_boost.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_boost_border.png b/app/src/main/res/drawable-mdpi/ic_boost_border.png
deleted file mode 100644
index 9d947b318..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_boost_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_boost_header.png b/app/src/main/res/drawable-mdpi/ic_boost_header.png
deleted file mode 100644
index 9d947b318..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_boost_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_boost_header_notif.png b/app/src/main/res/drawable-mdpi/ic_boost_header_notif.png
deleted file mode 100644
index 9d947b318..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_boost_header_notif.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_cancel.png b/app/src/main/res/drawable-mdpi/ic_cancel.png
deleted file mode 100644
index ff5bd2973..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_chat_bubble_outline.png b/app/src/main/res/drawable-mdpi/ic_chat_bubble_outline.png
deleted file mode 100644
index 6bd612daf..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_chat_bubble_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_check.png b/app/src/main/res/drawable-mdpi/ic_check.png
deleted file mode 100644
index f2b1eb21e..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete.png b/app/src/main/res/drawable-mdpi/ic_delete.png
deleted file mode 100644
index c7149ad4e..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_email.png b/app/src/main/res/drawable-mdpi/ic_email.png
deleted file mode 100644
index 33d399914..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_email.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_email_white.png b/app/src/main/res/drawable-mdpi/ic_email_white.png
deleted file mode 100644
index f1aea58fe..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_email_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_fav_notif_header.png b/app/src/main/res/drawable-mdpi/ic_fav_notif_header.png
deleted file mode 100644
index 1c58019b8..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_fav_notif_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_favorite.png b/app/src/main/res/drawable-mdpi/ic_favorite.png
deleted file mode 100644
index cffe7ed71..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_favorite.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_favorite_border.png b/app/src/main/res/drawable-mdpi/ic_favorite_border.png
deleted file mode 100644
index 1c58019b8..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_favorite_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_favorite_menu.png b/app/src/main/res/drawable-mdpi/ic_favorite_menu.png
deleted file mode 100644
index cffe7ed71..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_favorite_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_fiber_new.png b/app/src/main/res/drawable-mdpi/ic_fiber_new.png
deleted file mode 100644
index 589f71501..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_drop_down.png b/app/src/main/res/drawable-xhdpi/ic_arrow_drop_down.png
new file mode 100644
index 000000000..43666f202
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_arrow_drop_down.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_boost.png b/app/src/main/res/drawable-xhdpi/ic_boost.png
deleted file mode 100644
index 40d602432..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_boost.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_boost_border.png b/app/src/main/res/drawable-xhdpi/ic_boost_border.png
deleted file mode 100644
index 40d602432..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_boost_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_boost_header.png b/app/src/main/res/drawable-xhdpi/ic_boost_header.png
deleted file mode 100644
index 40d602432..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_boost_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_boost_header_notif.png b/app/src/main/res/drawable-xhdpi/ic_boost_header_notif.png
deleted file mode 100644
index 40d602432..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_boost_header_notif.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_cancel.png b/app/src/main/res/drawable-xhdpi/ic_cancel.png
deleted file mode 100644
index 8a3c23efc..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_chat_bubble_outline.png b/app/src/main/res/drawable-xhdpi/ic_chat_bubble_outline.png
deleted file mode 100644
index c263bbd35..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_chat_bubble_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_check.png b/app/src/main/res/drawable-xhdpi/ic_check.png
deleted file mode 100644
index 18650ca67..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete.png b/app/src/main/res/drawable-xhdpi/ic_delete.png
deleted file mode 100644
index eec14f009..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_email.png b/app/src/main/res/drawable-xhdpi/ic_email.png
deleted file mode 100644
index d86e1c615..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_email.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_email_white.png b/app/src/main/res/drawable-xhdpi/ic_email_white.png
deleted file mode 100644
index 77ddef573..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_email_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_fav_notif_header.png b/app/src/main/res/drawable-xhdpi/ic_fav_notif_header.png
deleted file mode 100644
index 1f53e3391..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_fav_notif_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_favorite.png b/app/src/main/res/drawable-xhdpi/ic_favorite.png
deleted file mode 100644
index d76866575..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_favorite.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_favorite_border.png b/app/src/main/res/drawable-xhdpi/ic_favorite_border.png
deleted file mode 100644
index 1f53e3391..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_favorite_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_favorite_menu.png b/app/src/main/res/drawable-xhdpi/ic_favorite_menu.png
deleted file mode 100644
index d76866575..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_favorite_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_fiber_new.png b/app/src/main/res/drawable-xhdpi/ic_fiber_new.png
deleted file mode 100644
index 08208c303..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down.png
new file mode 100644
index 000000000..9db496b4c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_arrow_drop_down.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_boost.png b/app/src/main/res/drawable-xxhdpi/ic_boost.png
deleted file mode 100644
index e13c41b88..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_boost.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_boost_border.png b/app/src/main/res/drawable-xxhdpi/ic_boost_border.png
deleted file mode 100644
index e13c41b88..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_boost_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_boost_header.png b/app/src/main/res/drawable-xxhdpi/ic_boost_header.png
deleted file mode 100644
index e13c41b88..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_boost_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_boost_header_notif.png b/app/src/main/res/drawable-xxhdpi/ic_boost_header_notif.png
deleted file mode 100644
index e13c41b88..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_boost_header_notif.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxhdpi/ic_cancel.png
deleted file mode 100644
index aeb96f0c9..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_chat_bubble_outline.png b/app/src/main/res/drawable-xxhdpi/ic_chat_bubble_outline.png
deleted file mode 100644
index 2ee74b735..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_chat_bubble_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_check.png b/app/src/main/res/drawable-xxhdpi/ic_check.png
deleted file mode 100644
index 7b2d70097..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete.png b/app/src/main/res/drawable-xxhdpi/ic_delete.png
deleted file mode 100644
index 8377c1da7..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_email.png b/app/src/main/res/drawable-xxhdpi/ic_email.png
deleted file mode 100644
index bb00df40a..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_email.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_email_white.png b/app/src/main/res/drawable-xxhdpi/ic_email_white.png
deleted file mode 100644
index 107653456..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_email_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_fav_notif_header.png b/app/src/main/res/drawable-xxhdpi/ic_fav_notif_header.png
deleted file mode 100644
index 46f7f901f..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_fav_notif_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite.png b/app/src/main/res/drawable-xxhdpi/ic_favorite.png
deleted file mode 100644
index 3a98f4d4c..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_favorite.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite_border.png b/app/src/main/res/drawable-xxhdpi/ic_favorite_border.png
deleted file mode 100644
index 46f7f901f..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_favorite_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_favorite_menu.png b/app/src/main/res/drawable-xxhdpi/ic_favorite_menu.png
deleted file mode 100644
index 3a98f4d4c..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_favorite_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_fiber_new.png b/app/src/main/res/drawable-xxhdpi/ic_fiber_new.png
deleted file mode 100644
index 160387cdd..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down.png
new file mode 100644
index 000000000..3a5f84646
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_arrow_drop_down.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_boost.png b/app/src/main/res/drawable-xxxhdpi/ic_boost.png
deleted file mode 100644
index 63ab26f7b..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_boost.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_boost_border.png b/app/src/main/res/drawable-xxxhdpi/ic_boost_border.png
deleted file mode 100644
index 63ab26f7b..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_boost_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_boost_header.png b/app/src/main/res/drawable-xxxhdpi/ic_boost_header.png
deleted file mode 100644
index 63ab26f7b..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_boost_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_boost_header_notif.png b/app/src/main/res/drawable-xxxhdpi/ic_boost_header_notif.png
deleted file mode 100644
index 63ab26f7b..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_boost_header_notif.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cancel.png b/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
deleted file mode 100644
index 5cb6fbb47..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_cancel.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_chat_bubble_outline.png b/app/src/main/res/drawable-xxxhdpi/ic_chat_bubble_outline.png
deleted file mode 100644
index 94a4b2d4d..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_chat_bubble_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_check.png b/app/src/main/res/drawable-xxxhdpi/ic_check.png
deleted file mode 100644
index 3c4896ebc..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete.png b/app/src/main/res/drawable-xxxhdpi/ic_delete.png
deleted file mode 100644
index 3a25d9b62..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_email.png b/app/src/main/res/drawable-xxxhdpi/ic_email.png
deleted file mode 100644
index 9abfba56b..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_email.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_email_white.png b/app/src/main/res/drawable-xxxhdpi/ic_email_white.png
deleted file mode 100644
index 2b7b8cda6..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_email_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fav_notif_header.png b/app/src/main/res/drawable-xxxhdpi/ic_fav_notif_header.png
deleted file mode 100644
index f8b658911..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_fav_notif_header.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite.png b/app/src/main/res/drawable-xxxhdpi/ic_favorite.png
deleted file mode 100644
index f8b1e4176..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_favorite.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite_border.png b/app/src/main/res/drawable-xxxhdpi/ic_favorite_border.png
deleted file mode 100644
index f8b658911..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_favorite_border.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_favorite_menu.png b/app/src/main/res/drawable-xxxhdpi/ic_favorite_menu.png
deleted file mode 100644
index f8b1e4176..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_favorite_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png b/app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png
deleted file mode 100644
index 30dacde3c..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_fiber_new.png and /dev/null differ
diff --git a/app/src/main/res/layout/activity_instance.xml b/app/src/main/res/layout/activity_instance.xml
index 4412790a4..2b88155a6 100644
--- a/app/src/main/res/layout/activity_instance.xml
+++ b/app/src/main/res/layout/activity_instance.xml
@@ -81,7 +81,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="@dimen/fab_margin"
-            app:srcCompat="@drawable/ic_email_white" />
+             />
     </LinearLayout>
     <!-- Main Loader -->
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 56e4b3582..2a3a42e6c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -90,7 +90,6 @@
         <android.support.v4.view.ViewPager
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/viewpager"
-            xmlns:app="http://schemas.android.com/apk/res-auto"
             xmlns:tools="http://schemas.android.com/tools"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -103,7 +102,6 @@
         <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
             android:visibility="gone"
             android:id="@+id/main_app_container"
-            xmlns:app="http://schemas.android.com/apk/res-auto"
             xmlns:tools="http://schemas.android.com/tools"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 9c8fd19ed..cad1bea03 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -17,6 +17,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
     style="?attr/headerbg"
@@ -36,11 +37,11 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             tools:ignore="ContentDescription" />
-        <ImageView
+        <android.support.v7.widget.AppCompatImageView
             android:layout_marginStart="30dp"
             android:layout_marginLeft="30dp"
             android:gravity="center_vertical"
-            android:src="@drawable/ic_edit"
+            app:srcCompat="@drawable/ic_edit"
             android:id="@+id/header_edit_profile"
             android:layout_width="30dp"
             android:layout_height="30dp"
@@ -73,13 +74,13 @@
             android:layout_height="wrap_content"
             android:textSize="18sp"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-        <ImageView
+        <android.support.v7.widget.AppCompatImageView
             android:gravity="center_vertical"
             android:layout_marginLeft="5dp"
             android:layout_marginStart="5dp"
             android:id="@+id/owner_accounts"
             android:layout_width="30dp"
-            android:src="@drawable/ic_arrow_drop_down"
+            app:srcCompat="@drawable/ic_arrow_drop_down"
             android:layout_height="30dp"
             tools:ignore="ContentDescription" />
     </LinearLayout>
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 616d72c3e..debd5f76b 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -41,7 +41,7 @@
                         android:title="@string/settings" />
                     <item
                         android:id="@+id/nav_favorites"
-                        android:icon="@drawable/ic_favorite_menu"
+                        android:icon="@drawable/ic_star_menu"
                         android:title="@string/favorites_menu" />
                     <item
                         android:id="@+id/nav_blocked"