diff --git a/.gitattributes b/.gitattributes
index 1d3f33ac012b..6afe87839806 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 * text=auto
 *.sh text eol=lf
+*.py text eol=lf
 *.bat text eol=crlf
 *.png binary
 *.jpg binary
diff --git a/WordPress/src/main/java/org/wordpress/android/GCMIntentService.java b/WordPress/src/main/java/org/wordpress/android/GCMIntentService.java
index 8a510fd78623..ff733e69f3ec 100644
--- a/WordPress/src/main/java/org/wordpress/android/GCMIntentService.java
+++ b/WordPress/src/main/java/org/wordpress/android/GCMIntentService.java
@@ -6,7 +6,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
@@ -171,7 +170,7 @@ protected void handleDefaultPush(Context context, Bundle extras) {
                 }
                 PendingIntent commentReplyPendingIntent = PendingIntent.getActivity(context, 0, commentReplyIntent,
                         PendingIntent.FLAG_CANCEL_CURRENT);
-                mBuilder.addAction(R.drawable.ab_icon_reply, context.getText(R.string.reply),
+                mBuilder.addAction(R.drawable.ic_action_refresh, context.getText(R.string.reply),
                         commentReplyPendingIntent);
             }
 
@@ -207,7 +206,7 @@ protected void handleDefaultPush(Context context, Bundle extras) {
             String subject = String.format(getString(R.string.new_notifications), mActiveNotificationsMap.size());
 
             mBuilder = new NotificationCompat.Builder(this)
-                    .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.notification_multi))
+                    .setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.noticon_notification))
                     .setSmallIcon(R.drawable.notification_icon)
                     .setContentTitle("WordPress")
                     .setContentText(subject)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java
index 9672928958d0..8c4d0d8f884e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/AppLogViewerActivity.java
@@ -121,7 +121,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         MenuItem item = menu.add(Menu.NONE, ID_SHARE, Menu.NONE, R.string.reader_btn_share);
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        item.setIcon(R.drawable.ab_icon_share);
+        item.setIcon(R.drawable.ic_action_share);
         return true;
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java
index 5bfc361072c3..7714cfc95e87 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPActionBarActivity.java
@@ -248,7 +248,7 @@ private MenuDrawer attachMenuDrawer() {
         int shadowSizeInPixels = getResources().getDimensionPixelSize(R.dimen.menu_shadow_width);
         menuDrawer.setDropShadowSize(shadowSizeInPixels);
         menuDrawer.setDropShadowColor(getResources().getColor(R.color.md__shadowColor));
-        menuDrawer.setSlideDrawable(R.drawable.ic_drawer);
+        menuDrawer.setSlideDrawable(R.drawable.ic_navigation_drawer);
         return menuDrawer;
     }
 
@@ -786,7 +786,7 @@ public void onConfigurationChanged(Configuration newConfig) {
 
     private class ReaderMenuItem extends MenuDrawerItem {
         ReaderMenuItem(){
-            super(ActivityId.READER, R.string.reader, R.drawable.dashboard_icon_subs);
+            super(ActivityId.READER, R.string.reader, R.drawable.noticon_reader_alt_black);
         }
 
         @Override
@@ -811,7 +811,7 @@ public void onSelectItem(){
 
     private class PostsMenuItem extends MenuDrawerItem {
         PostsMenuItem() {
-            super(ActivityId.POSTS, R.string.posts, R.drawable.dashboard_icon_posts);
+            super(ActivityId.POSTS, R.string.posts, R.drawable.dashicon_admin_post_black);
         }
 
         @Override
@@ -839,7 +839,7 @@ public Boolean isVisible() {
 
     private class MediaMenuItem extends MenuDrawerItem {
         MediaMenuItem(){
-            super(ActivityId.MEDIA, R.string.media, R.drawable.dashboard_icon_media);
+            super(ActivityId.MEDIA, R.string.media, R.drawable.dashicon_admin_media_black);
         }
         @Override
         public Boolean isSelected(){
@@ -863,7 +863,7 @@ public Boolean isVisible() {
 
     private class PagesMenuItem extends MenuDrawerItem {
         PagesMenuItem(){
-            super(ActivityId.PAGES, R.string.pages, R.drawable.dashboard_icon_pages);
+            super(ActivityId.PAGES, R.string.pages, R.drawable.dashicon_admin_page_black);
         }
         @Override
         public Boolean isSelected(){
@@ -892,7 +892,7 @@ public Boolean isVisible() {
 
     private class CommentsMenuItem extends MenuDrawerItem {
         CommentsMenuItem(){
-            super(ActivityId.COMMENTS, R.string.tab_comments, R.drawable.dashboard_icon_comments);
+            super(ActivityId.COMMENTS, R.string.tab_comments, R.drawable.dashicon_admin_comments_black);
         }
         @Override
         public Boolean isSelected(){
@@ -960,7 +960,7 @@ public Boolean isVisible() {
 
     private class StatsMenuItem extends MenuDrawerItem {
         StatsMenuItem(){
-            super(ActivityId.STATS, R.string.tab_stats, R.drawable.dashboard_icon_stats);
+            super(ActivityId.STATS, R.string.tab_stats, R.drawable.dashicon_chart_area_black);
         }
         @Override
         public Boolean isSelected(){
@@ -986,7 +986,7 @@ public Boolean isVisible() {
 
     private class QuickPhotoMenuItem extends MenuDrawerItem {
         QuickPhotoMenuItem(){
-            super(R.string.quick_photo, R.drawable.dashboard_icon_photo);
+            super(R.string.quick_photo, R.drawable.dashicon_camera_black);
         }
         @Override
         public void onSelectItem(){
@@ -1006,7 +1006,7 @@ public Boolean isVisible() {
 
     private class QuickVideoMenuItem extends MenuDrawerItem {
         QuickVideoMenuItem(){
-            super(R.string.quick_video, R.drawable.dashboard_icon_video);
+            super(R.string.quick_video, R.drawable.dashicon_video_alt2_black);
         }
         @Override
         public void onSelectItem(){
@@ -1026,7 +1026,7 @@ public Boolean isVisible() {
 
     private class ViewSiteMenuItem extends MenuDrawerItem {
         ViewSiteMenuItem(){
-            super(ActivityId.VIEW_SITE, R.string.view_site, R.drawable.dashboard_icon_view);
+            super(ActivityId.VIEW_SITE, R.string.view_site, R.drawable.noticon_show_black);
         }
         @Override
         public Boolean isSelected(){
@@ -1050,7 +1050,7 @@ public Boolean isVisible() {
 
     private class NotificationsMenuItem extends MenuDrawerItem {
         NotificationsMenuItem(){
-            super(ActivityId.NOTIFICATIONS, R.string.notifications, R.drawable.dashboard_icon_notifications);
+            super(ActivityId.NOTIFICATIONS, R.string.notifications, R.drawable.noticon_notification_black);
         }
         @Override
         public Boolean isVisible(){
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/NewAccountAbstractPageFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/NewAccountAbstractPageFragment.java
index 69daeb137f19..72e17faa8f21 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/NewAccountAbstractPageFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/NewAccountAbstractPageFragment.java
@@ -130,7 +130,7 @@ protected void showError(int messageId) {
     protected void showError(String message) {
         FragmentTransaction ft = getFragmentManager().beginTransaction();
         NUXDialogFragment nuxAlert = NUXDialogFragment.newInstance(getString(R.string.error), message, getString(
-                R.string.nux_tap_continue), R.drawable.nux_icon_alert);
+                R.string.nux_tap_continue), R.drawable.noticon_alert_big);
         ft.add(nuxAlert, "alert");
         ft.commitAllowingStateLoss();
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/WelcomeFragmentSignIn.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/WelcomeFragmentSignIn.java
index b1413ae106df..adcb1af3b19b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/WelcomeFragmentSignIn.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/WelcomeFragmentSignIn.java
@@ -564,7 +564,7 @@ private void signInError() {
             NUXDialogFragment nuxAlert;
             if (mErrorMsgId == R.string.account_two_step_auth_enabled) {
                 nuxAlert = NUXDialogFragment.newInstance(getString(R.string.nux_cannot_log_in), getString(
-                                mErrorMsgId), getString(R.string.nux_tap_continue), R.drawable.nux_icon_alert, true,
+                                mErrorMsgId), getString(R.string.nux_tap_continue), R.drawable.noticon_alert_big, true,
                         getString(R.string.visit_security_settings), NUXDialogFragment.ACTION_OPEN_URL,
                         "https://wordpress.com/settings/security/?ssl=forced");
             } else {
@@ -578,7 +578,7 @@ private void signInError() {
                     return;
                 } else {
                     nuxAlert = NUXDialogFragment.newInstance(getString(R.string.nux_cannot_log_in), getString(
-                            mErrorMsgId), getString(R.string.nux_tap_continue), R.drawable.nux_icon_alert);
+                            mErrorMsgId), getString(R.string.nux_tap_continue), R.drawable.noticon_alert_big);
                 }
             }
             ft.add(nuxAlert, "alert");
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentUtils.java
index 92ea76dcf483..ab512514b526 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentUtils.java
@@ -47,10 +47,11 @@ public static void displayHtmlComment(TextView textView, String content, int max
         // now convert to HTML with an image getter that enforces a max image size
         final Spanned html;
         if (maxImageSize > 0 && content.contains("<img")) {
-            Drawable loading = textView.getContext().getResources().getDrawable(R.drawable.remote_image);
-            Drawable failed = textView.getContext().getResources().getDrawable(R.drawable.remote_failed);
-            html = HtmlUtils.fromHtml(content, new WPImageGetter(textView, maxImageSize, WordPress.imageLoader,
-                    loading, failed));
+            Drawable loading = textView.getContext().getResources().getDrawable(
+                    R.drawable.dashicon_format_image_big_grey);
+            Drawable failed = textView.getContext().getResources().getDrawable(R.drawable.noticon_warning_big_grey);
+            html = HtmlUtils.fromHtml(content, new WPImageGetter(textView, maxImageSize, WordPress.imageLoader, loading,
+                    failed));
         } else {
             html = HtmlUtils.fromHtml(content);
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaUtils.java
index 1a9339f7b0a0..76cdf055c38e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaUtils.java
@@ -280,7 +280,8 @@ public static WPImageSpan prepareWPImageSpan(Context context, String blogId, fin
         boolean isVideo = mimeType != null && mimeType.contains("video");
 
         Uri uri = Uri.parse(url);
-        WPImageSpan imageSpan = new WPImageSpan(context, isVideo ? R.drawable.media_movieclip : R.drawable.remote_image, uri);
+        WPImageSpan imageSpan = new WPImageSpan(context,
+                isVideo ? R.drawable.media_movieclip : R.drawable.dashicon_format_image_big_grey, uri);
         MediaFile mediaFile = imageSpan.getMediaFile();
         mediaFile.setMediaId(mediaId);
         mediaFile.setBlogId(blogId);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java
index ee825ff3c642..dbf898d663fc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java
@@ -70,7 +70,7 @@ public View configureView(View view) {
                 noteBlockHolder.avatarImageView.setOnTouchListener(null);
             }
         } else {
-            noteBlockHolder.avatarImageView.setImageResource(R.drawable.placeholder);
+            noteBlockHolder.avatarImageView.setImageResource(R.drawable.gravatar_placeholder);
             noteBlockHolder.avatarImageView.setOnTouchListener(null);
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java
index 87b3b183a2cb..e152593baba1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/UserNoteBlock.java
@@ -112,7 +112,7 @@ public View configureView(View view) {
                 noteBlockHolder.rootView.setOnClickListener(null);
             }
         } else {
-            noteBlockHolder.avatarImageView.setImageResource(R.drawable.placeholder);
+            noteBlockHolder.avatarImageView.setImageResource(R.drawable.gravatar_placeholder);
             noteBlockHolder.avatarImageView.setOnTouchListener(null);
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
index af3396ad0b1b..179137887635 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
@@ -282,8 +282,8 @@ private static void addImageSpansForBlockMedia(TextView textView, JSONObject sub
             return;
         }
 
-        Drawable loading = context.getResources().getDrawable(R.drawable.remote_image);
-        Drawable failed = context.getResources().getDrawable(R.drawable.remote_failed);
+        Drawable loading = context.getResources().getDrawable(R.drawable.dashicon_format_image_big_grey);
+        Drawable failed = context.getResources().getDrawable(R.drawable.noticon_warning_big_grey);
         // Note: notifications_max_image_size seems to be the max size an ImageSpan can handle,
         // otherwise it would load blank white
         WPImageGetter imageGetter = new WPImageGetter(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AboutActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AboutActivity.java
index 4ab162274f45..4bbb1f603073 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AboutActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AboutActivity.java
@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.prefs;
 
-import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
@@ -8,13 +7,12 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-
-import org.wordpress.passcodelock.AppLockManager;
+import android.view.Window;
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
+import org.wordpress.android.widgets.WPTextView;
+import org.wordpress.passcodelock.AppLockManager;
 
 public class AboutActivity extends Activity implements OnClickListener {
     private static final String URL_TOS = "http://en.wordpress.com/tos";
@@ -24,21 +22,17 @@ public class AboutActivity extends Activity implements OnClickListener {
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.about);
 
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
-        TextView version = (TextView) findViewById(R.id.about_version);
+        WPTextView version = (WPTextView) findViewById(R.id.about_version);
         version.setText(getString(R.string.version) + " "
                 + WordPress.versionName);
 
-        Button tos = (Button) findViewById(R.id.about_tos);
+        WPTextView tos = (WPTextView) findViewById(R.id.about_tos);
         tos.setOnClickListener(this);
 
-        Button pp = (Button) findViewById(R.id.about_privacy);
+        WPTextView pp = (WPTextView) findViewById(R.id.about_privacy);
         pp.setOnClickListener(this);
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/WPNetworkImageView.java b/WordPress/src/main/java/org/wordpress/android/widgets/WPNetworkImageView.java
index 689701ebccd2..a3fb6c8a8594 100644
--- a/WordPress/src/main/java/org/wordpress/android/widgets/WPNetworkImageView.java
+++ b/WordPress/src/main/java/org/wordpress/android/widgets/WPNetworkImageView.java
@@ -302,7 +302,7 @@ void showErrorImage() {
                 break;
             case AVATAR:
                 // "mystery man" for failed avatars
-                setImageResource(R.drawable.placeholder);
+                setImageResource(R.drawable.gravatar_placeholder);
                 break;
             default :
                 // medium grey box for all others
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_bottom_solid_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/ab_bottom_solid_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_icon_new.png b/WordPress/src/main/res/drawable-hdpi/ab_icon_new.png
deleted file mode 100644
index ad8ada6bdfa0..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ab_icon_new.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_icon_refresh.png b/WordPress/src/main/res/drawable-hdpi/ab_icon_refresh.png
deleted file mode 100644
index bb9d855f7769..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ab_icon_refresh.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_icon_reply.png b/WordPress/src/main/res/drawable-hdpi/ab_icon_reply.png
deleted file mode 100644
index 835d96fc6c33..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ab_icon_reply.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_icon_save.png b/WordPress/src/main/res/drawable-hdpi/ab_icon_save.png
deleted file mode 100644
index 306d55a9cbb0..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ab_icon_save.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_icon_send.png b/WordPress/src/main/res/drawable-hdpi/ab_icon_send.png
deleted file mode 100644
index 6bdd9585fcfe..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ab_icon_send.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_icon_send_lite.png b/WordPress/src/main/res/drawable-hdpi/ab_icon_send_lite.png
deleted file mode 100755
index 75e18b15005c..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ab_icon_send_lite.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_icon_share.png b/WordPress/src/main/res/drawable-hdpi/ab_icon_share.png
deleted file mode 100644
index c329f58daae6..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ab_icon_share.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_icon_web.png b/WordPress/src/main/res/drawable-hdpi/ab_icon_web.png
deleted file mode 100644
index e154afdbcbe8..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ab_icon_web.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_icon_wp.png b/WordPress/src/main/res/drawable-hdpi/ab_icon_wp.png
deleted file mode 100644
index 2bc4c6015dbd..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ab_icon_wp.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_stacked_solid_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/ab_stacked_solid_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/ab_transparent_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/ab_transparent_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/btn_cab_done_default_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/btn_cab_done_default_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/btn_cab_done_focused_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/btn_cab_done_focused_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/btn_cab_done_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/btn_cab_done_pressed_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/cab_background_bottom_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/cab_background_bottom_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/cab_background_top_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/cab_background_top_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_comments.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_comments.png
deleted file mode 100644
index d7caa9f7331a..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_comments.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_media.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_media.png
deleted file mode 100644
index 8a12648a97f4..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_media.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_notifications.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_notifications.png
deleted file mode 100644
index 0d103621ac7d..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_notifications.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_pages.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_pages.png
deleted file mode 100644
index bbb9b21f0a21..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_pages.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_photo.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_photo.png
deleted file mode 100644
index 4411f08615b8..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_photo.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_posts.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_posts.png
deleted file mode 100644
index 183d1617d8fa..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_posts.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_stats.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_stats.png
deleted file mode 100644
index bdfd2aa5002a..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_stats.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_subs.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_subs.png
deleted file mode 100644
index f40e912242fe..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_subs.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_video.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_video.png
deleted file mode 100644
index d6e8874d2fb3..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_video.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_view.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_view.png
deleted file mode 100644
index 679b64e6f196..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_view.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_wp.png b/WordPress/src/main/res/drawable-hdpi/dashboard_icon_wp.png
deleted file mode 100644
index 24a6f7cf9f32..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/dashboard_icon_wp.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_admin_comments_black.png b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_comments_black.png
new file mode 100644
index 000000000000..bdb4d8cf1c33
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_comments_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_admin_links.png b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_links.png
new file mode 100644
index 000000000000..55fb8739aecf
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_links.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_admin_links_grey.png b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_links_grey.png
new file mode 100644
index 000000000000..5b66e714c337
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_links_grey.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_admin_media_black.png b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_media_black.png
new file mode 100644
index 000000000000..85c776f321a4
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_media_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_admin_page_black.png b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_page_black.png
new file mode 100644
index 000000000000..34e05db8a681
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_page_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_admin_post_black.png b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_post_black.png
new file mode 100644
index 000000000000..7e2f6ea04cd2
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_admin_post_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_camera_black.png b/WordPress/src/main/res/drawable-hdpi/dashicon_camera_black.png
new file mode 100644
index 000000000000..790d2b7a3b82
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_camera_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_chart_area_black.png b/WordPress/src/main/res/drawable-hdpi/dashicon_chart_area_black.png
new file mode 100644
index 000000000000..5b2f435d940f
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_chart_area_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_editor_bold.png b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_bold.png
new file mode 100644
index 000000000000..0ba4b95e84bc
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_bold.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_editor_bold_grey.png b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_bold_grey.png
new file mode 100644
index 000000000000..fc896135dd02
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_bold_grey.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_editor_insertmore.png b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_insertmore.png
new file mode 100644
index 000000000000..444f735abb57
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_insertmore.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_editor_insertmore_grey.png b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_insertmore_grey.png
new file mode 100644
index 000000000000..32411efc71d5
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_insertmore_grey.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_editor_italic.png b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_italic.png
new file mode 100644
index 000000000000..48db52143558
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_italic.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_editor_italic_grey.png b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_italic_grey.png
new file mode 100644
index 000000000000..eea6add02d63
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_italic_grey.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_editor_strikethrough.png b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_strikethrough.png
new file mode 100644
index 000000000000..7cb2dcd30617
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_strikethrough.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_editor_strikethrough_grey.png b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_strikethrough_grey.png
new file mode 100644
index 000000000000..90354d05d7d6
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_strikethrough_grey.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_editor_underline.png b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_underline.png
new file mode 100644
index 000000000000..7e14c49a5212
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_underline.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_editor_underline_grey.png b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_underline_grey.png
new file mode 100644
index 000000000000..978f975194e2
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_editor_underline_grey.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_external_black.png b/WordPress/src/main/res/drawable-hdpi/dashicon_external_black.png
new file mode 100644
index 000000000000..9f2c50dc1a59
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_external_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_eye_closed.png b/WordPress/src/main/res/drawable-hdpi/dashicon_eye_closed.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_eye_open.png b/WordPress/src/main/res/drawable-hdpi/dashicon_eye_open.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_format_image_big_grey.png b/WordPress/src/main/res/drawable-hdpi/dashicon_format_image_big_grey.png
new file mode 100644
index 000000000000..a61883996571
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_format_image_big_grey.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_format_quote.png b/WordPress/src/main/res/drawable-hdpi/dashicon_format_quote.png
new file mode 100644
index 000000000000..7f7c5181e75d
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_format_quote.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_format_quote_grey.png b/WordPress/src/main/res/drawable-hdpi/dashicon_format_quote_grey.png
new file mode 100644
index 000000000000..4dc307fc74e2
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_format_quote_grey.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_info.png b/WordPress/src/main/res/drawable-hdpi/dashicon_info.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_video_alt2_black.png b/WordPress/src/main/res/drawable-hdpi/dashicon_video_alt2_black.png
new file mode 100644
index 000000000000..9612254f967f
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_video_alt2_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/dashicon_wordpress_alt.png b/WordPress/src/main/res/drawable-hdpi/dashicon_wordpress_alt.png
new file mode 100644
index 000000000000..f9c03d6fab86
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/dashicon_wordpress_alt.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/follow_minus.png b/WordPress/src/main/res/drawable-hdpi/follow_minus.png
deleted file mode 100644
index 276c6371b510..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/follow_minus.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/follow_plus.png b/WordPress/src/main/res/drawable-hdpi/follow_plus.png
deleted file mode 100644
index f7cae6e5d7b1..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/follow_plus.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/gravatar_placeholder.png b/WordPress/src/main/res/drawable-hdpi/gravatar_placeholder.png
new file mode 100644
index 000000000000..c8e44d2a19ff
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/gravatar_placeholder.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_action_accept.png b/WordPress/src/main/res/drawable-hdpi/ic_action_accept.png
new file mode 100644
index 000000000000..700fc81518fc
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/ic_action_accept.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_cab_trash.png b/WordPress/src/main/res/drawable-hdpi/ic_action_discard.png
similarity index 100%
rename from WordPress/src/main/res/drawable-hdpi/ic_cab_trash.png
rename to WordPress/src/main/res/drawable-hdpi/ic_action_discard.png
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_action_new.png b/WordPress/src/main/res/drawable-hdpi/ic_action_new.png
new file mode 100644
index 000000000000..d866d6160db2
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/ic_action_new.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_action_refresh.png b/WordPress/src/main/res/drawable-hdpi/ic_action_refresh.png
new file mode 100644
index 000000000000..dae27903e9ba
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/ic_action_refresh.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_action_save.png b/WordPress/src/main/res/drawable-hdpi/ic_action_save.png
new file mode 100644
index 000000000000..0fe36a1ec3d5
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/ic_action_save.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_action_search.png b/WordPress/src/main/res/drawable-hdpi/ic_action_search.png
new file mode 100644
index 000000000000..772e3598edb5
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/ic_action_search.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_action_send_now.png b/WordPress/src/main/res/drawable-hdpi/ic_action_send_now.png
new file mode 100644
index 000000000000..5c64d31b96d1
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/ic_action_send_now.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_action_send_now_dark.png b/WordPress/src/main/res/drawable-hdpi/ic_action_send_now_dark.png
new file mode 100644
index 000000000000..7e0d46d209f4
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/ic_action_send_now_dark.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_action_share.png b/WordPress/src/main/res/drawable-hdpi/ic_action_share.png
new file mode 100644
index 000000000000..a36464b8be84
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/ic_action_share.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_action_web_site.png b/WordPress/src/main/res/drawable-hdpi/ic_action_web_site.png
new file mode 100644
index 000000000000..8c4add42ef7c
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/ic_action_web_site.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_cab_like.png b/WordPress/src/main/res/drawable-hdpi/ic_cab_like.png
deleted file mode 100644
index 465509e4007a..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_cab_like.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_cab_like_active.png b/WordPress/src/main/res/drawable-hdpi/ic_cab_like_active.png
deleted file mode 100644
index ed8b82f92d57..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_cab_like_active.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_comment_like.png b/WordPress/src/main/res/drawable-hdpi/ic_comment_like.png
deleted file mode 100644
index dd9e28fbfce2..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_comment_like.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_comment_like_active.png b/WordPress/src/main/res/drawable-hdpi/ic_comment_like_active.png
deleted file mode 100644
index 0466415a89c6..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_comment_like_active.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_content_new.png b/WordPress/src/main/res/drawable-hdpi/ic_content_new.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_content_remove.png b/WordPress/src/main/res/drawable-hdpi/ic_content_remove.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_drawer.png b/WordPress/src/main/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index 96cc65fafe80..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_drawer.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_error.png b/WordPress/src/main/res/drawable-hdpi/ic_error.png
deleted file mode 100644
index ff097f85defc..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_error.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_level_indicator.png b/WordPress/src/main/res/drawable-hdpi/ic_level_indicator.png
index d0a42cafc576..f83842120b78 100644
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_level_indicator.png and b/WordPress/src/main/res/drawable-hdpi/ic_level_indicator.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_navigate_next.png b/WordPress/src/main/res/drawable-hdpi/ic_navigate_next.png
deleted file mode 100644
index e6495b29cfe3..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_navigate_next.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_navigate_previous.png b/WordPress/src/main/res/drawable-hdpi/ic_navigate_previous.png
deleted file mode 100644
index 23778ae9b735..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_navigate_previous.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/stats_icon_tags.png b/WordPress/src/main/res/drawable-hdpi/ic_navigation_drawer.png
similarity index 92%
rename from WordPress/src/main/res/drawable-ldpi/stats_icon_tags.png
rename to WordPress/src/main/res/drawable-hdpi/ic_navigation_drawer.png
index 865b48dd35ce..f017cd128f2d 100644
Binary files a/WordPress/src/main/res/drawable-ldpi/stats_icon_tags.png and b/WordPress/src/main/res/drawable-hdpi/ic_navigation_drawer.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_reader_video_overlay.png b/WordPress/src/main/res/drawable-hdpi/ic_reader_video_overlay.png
deleted file mode 100644
index c8166b30ed41..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_reader_video_overlay.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/ic_share.png b/WordPress/src/main/res/drawable-hdpi/ic_share.png
deleted file mode 100644
index 47ae186749df..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/ic_share.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_bold.png b/WordPress/src/main/res/drawable-hdpi/icon_format_bold.png
deleted file mode 100644
index 8cacd807e803..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_bold.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_bold_highlighted.png b/WordPress/src/main/res/drawable-hdpi/icon_format_bold_highlighted.png
deleted file mode 100644
index 246abf32e673..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_bold_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_italic.png b/WordPress/src/main/res/drawable-hdpi/icon_format_italic.png
deleted file mode 100644
index fe3cc9edf806..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_italic.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_italic_highlighted.png b/WordPress/src/main/res/drawable-hdpi/icon_format_italic_highlighted.png
deleted file mode 100644
index a717c7be83b9..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_italic_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_link.png b/WordPress/src/main/res/drawable-hdpi/icon_format_link.png
deleted file mode 100644
index 53e5dd161ddd..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_link.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_link_highlighted.png b/WordPress/src/main/res/drawable-hdpi/icon_format_link_highlighted.png
deleted file mode 100644
index 4d00264165eb..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_link_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_media.png b/WordPress/src/main/res/drawable-hdpi/icon_format_media.png
deleted file mode 100644
index c5015dd7c789..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_media.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_media_highlighted.png b/WordPress/src/main/res/drawable-hdpi/icon_format_media_highlighted.png
deleted file mode 100644
index 402493ca4a07..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_media_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_more.png b/WordPress/src/main/res/drawable-hdpi/icon_format_more.png
deleted file mode 100644
index 4252f9d95052..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_more.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_more_highlighted.png b/WordPress/src/main/res/drawable-hdpi/icon_format_more_highlighted.png
deleted file mode 100644
index 1aa236300b87..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_more_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_quote.png b/WordPress/src/main/res/drawable-hdpi/icon_format_quote.png
deleted file mode 100644
index b5123da0d971..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_quote.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_quote_highlighted.png b/WordPress/src/main/res/drawable-hdpi/icon_format_quote_highlighted.png
deleted file mode 100644
index 1d72ed4dc365..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_quote_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_strikethrough.png b/WordPress/src/main/res/drawable-hdpi/icon_format_strikethrough.png
deleted file mode 100644
index 84858917cf41..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_strikethrough.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_strikethrough_highlighted.png b/WordPress/src/main/res/drawable-hdpi/icon_format_strikethrough_highlighted.png
deleted file mode 100644
index fc1c079d96ae..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_strikethrough_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_underline.png b/WordPress/src/main/res/drawable-hdpi/icon_format_underline.png
deleted file mode 100644
index 27ad117e5e78..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_underline.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/icon_format_underline_highlighted.png b/WordPress/src/main/res/drawable-hdpi/icon_format_underline_highlighted.png
deleted file mode 100644
index 51768e4a7224..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/icon_format_underline_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/list_focused_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/list_focused_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/menu_dropdown_panel_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/menu_dropdown_panel_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/menu_hardkey_panel_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/menu_hardkey_panel_wordpress.9.png
deleted file mode 100644
index d55b8c0a8340..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/menu_hardkey_panel_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/moderate_approve.png b/WordPress/src/main/res/drawable-hdpi/moderate_approve.png
deleted file mode 100644
index 6c6df33ecc49..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/moderate_approve.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/moderate_spam.png b/WordPress/src/main/res/drawable-hdpi/moderate_spam.png
deleted file mode 100644
index 866112a5d057..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/moderate_spam.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/moderate_trash.png b/WordPress/src/main/res/drawable-hdpi/moderate_trash.png
deleted file mode 100644
index 5fd916002e35..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/moderate_trash.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/moderate_unapprove.png b/WordPress/src/main/res/drawable-hdpi/moderate_unapprove.png
deleted file mode 100644
index 4172117d40ef..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/moderate_unapprove.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/noticon_alert_big.png b/WordPress/src/main/res/drawable-hdpi/noticon_alert_big.png
new file mode 100644
index 000000000000..770e483f1d83
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/noticon_alert_big.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/noticon_notification.png b/WordPress/src/main/res/drawable-hdpi/noticon_notification.png
new file mode 100644
index 000000000000..99f0dbe3a07e
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/noticon_notification.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/noticon_notification_black.png b/WordPress/src/main/res/drawable-hdpi/noticon_notification_black.png
new file mode 100644
index 000000000000..d26b17adfce4
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/noticon_notification_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/noticon_picture.png b/WordPress/src/main/res/drawable-hdpi/noticon_picture.png
new file mode 100644
index 000000000000..7900b928346b
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/noticon_picture.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/noticon_picture_grey.png b/WordPress/src/main/res/drawable-hdpi/noticon_picture_grey.png
new file mode 100644
index 000000000000..c4ca1c13c6b6
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/noticon_picture_grey.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/noticon_reader_alt_black.png b/WordPress/src/main/res/drawable-hdpi/noticon_reader_alt_black.png
new file mode 100644
index 000000000000..41d80c1a18f1
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/noticon_reader_alt_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/noticon_show_black.png b/WordPress/src/main/res/drawable-hdpi/noticon_show_black.png
new file mode 100644
index 000000000000..14ebde938428
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/noticon_show_black.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/noticon_star_active.png b/WordPress/src/main/res/drawable-hdpi/noticon_star_active.png
new file mode 100644
index 000000000000..416d7fe8029e
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/noticon_star_active.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/noticon_star_unactive.png b/WordPress/src/main/res/drawable-hdpi/noticon_star_unactive.png
new file mode 100644
index 000000000000..9497228cb6ac
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/noticon_star_unactive.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/noticon_warning_big_grey.png b/WordPress/src/main/res/drawable-hdpi/noticon_warning_big_grey.png
new file mode 100644
index 000000000000..89482da308e7
Binary files /dev/null and b/WordPress/src/main/res/drawable-hdpi/noticon_warning_big_grey.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/notification_icon.png b/WordPress/src/main/res/drawable-hdpi/notification_icon.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/notification_multi.png b/WordPress/src/main/res/drawable-hdpi/notification_multi.png
deleted file mode 100644
index ed981474562c..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/notification_multi.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/nux_icon_alert.png b/WordPress/src/main/res/drawable-hdpi/nux_icon_alert.png
deleted file mode 100644
index ea0ded089147..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/nux_icon_alert.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/progress_bg_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/progress_bg_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/progress_primary_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/progress_primary_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/progress_secondary_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/progress_secondary_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/remote_failed.png b/WordPress/src/main/res/drawable-hdpi/remote_failed.png
deleted file mode 100644
index 072850a4338c..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/remote_failed.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/remote_image.png b/WordPress/src/main/res/drawable-hdpi/remote_image.png
deleted file mode 100644
index a2cf1d68a92d..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/remote_image.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/spinner_ab_default_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/spinner_ab_default_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/spinner_ab_disabled_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/spinner_ab_disabled_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/spinner_ab_focused_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/spinner_ab_focused_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/spinner_ab_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/spinner_ab_pressed_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/stats_chevron_up.png b/WordPress/src/main/res/drawable-hdpi/stats_chevron_up.png
deleted file mode 100644
index 1e2d8e0acb0f..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/stats_chevron_up.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/tab_icon_checkmark.png b/WordPress/src/main/res/drawable-hdpi/tab_icon_checkmark.png
deleted file mode 100644
index 53cf6877eb72..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/tab_icon_checkmark.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/tab_icon_search.png b/WordPress/src/main/res/drawable-hdpi/tab_icon_search.png
deleted file mode 100644
index f12e005ebe83..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/tab_icon_search.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/tab_icon_trash.png b/WordPress/src/main/res/drawable-hdpi/tab_icon_trash.png
deleted file mode 100644
index ffd19d9e80b0..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/tab_icon_trash.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/tab_selected_focused_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/tab_selected_focused_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/tab_selected_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/tab_selected_pressed_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/tab_selected_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/tab_selected_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/tab_unselected_focused_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/tab_unselected_focused_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/tab_unselected_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/tab_unselected_pressed_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-hdpi/wp_small.9.png b/WordPress/src/main/res/drawable-hdpi/wp_small.9.png
deleted file mode 100644
index d22a992d629e..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/wp_small.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/wp_small_down.9.png b/WordPress/src/main/res/drawable-hdpi/wp_small_down.9.png
deleted file mode 100644
index 62ed57c64858..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/wp_small_down.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-hdpi/wp_small_over.9.png b/WordPress/src/main/res/drawable-hdpi/wp_small_over.9.png
deleted file mode 100644
index 9489b137c05b..000000000000
Binary files a/WordPress/src/main/res/drawable-hdpi/wp_small_over.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/ab_icon_wp.png b/WordPress/src/main/res/drawable-ldpi/ab_icon_wp.png
deleted file mode 100644
index 8dba556da2cc..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/ab_icon_wp.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/app_icon.png b/WordPress/src/main/res/drawable-ldpi/app_icon.png
deleted file mode 100644
index 57883c67f47a..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/app_icon.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/button_blue.9.png b/WordPress/src/main/res/drawable-ldpi/button_blue.9.png
deleted file mode 100644
index 4dfb062ea22d..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/button_blue.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/button_blue_disabled.9.png b/WordPress/src/main/res/drawable-ldpi/button_blue_disabled.9.png
deleted file mode 100644
index ccadc7739818..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/button_blue_disabled.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/button_blue_focus.9.png b/WordPress/src/main/res/drawable-ldpi/button_blue_focus.9.png
deleted file mode 100644
index 0f2cc03b75e7..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/button_blue_focus.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/button_darkgray_disabled.9.png b/WordPress/src/main/res/drawable-ldpi/button_darkgray_disabled.9.png
deleted file mode 100644
index ef2c88cedbb6..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/button_darkgray_disabled.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/button_darkgray_focus.9.png b/WordPress/src/main/res/drawable-ldpi/button_darkgray_focus.9.png
deleted file mode 100644
index 2a7b1cc9b4d5..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/button_darkgray_focus.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/dashboard_icon_media.png b/WordPress/src/main/res/drawable-ldpi/dashboard_icon_media.png
deleted file mode 100644
index 832417b59a55..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/dashboard_icon_media.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/dashboard_icon_themes.png b/WordPress/src/main/res/drawable-ldpi/dashboard_icon_themes.png
deleted file mode 100644
index 55f8349248d4..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/dashboard_icon_themes.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_arrow_dropdown_closed.png b/WordPress/src/main/res/drawable-ldpi/gallery_arrow_dropdown_closed.png
deleted file mode 100644
index 6e3192091a49..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_arrow_dropdown_closed.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_arrow_dropdown_open.png b/WordPress/src/main/res/drawable-ldpi/gallery_arrow_dropdown_open.png
deleted file mode 100644
index dee347d348ef..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_arrow_dropdown_open.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_checkbox_empty.png b/WordPress/src/main/res/drawable-ldpi/gallery_checkbox_empty.png
deleted file mode 100644
index f05ea55da3ca..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_checkbox_empty.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_checkbox_filled.png b/WordPress/src/main/res/drawable-ldpi/gallery_checkbox_filled.png
deleted file mode 100644
index d5b31f556450..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_checkbox_filled.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_icon_circles.png b/WordPress/src/main/res/drawable-ldpi/gallery_icon_circles.png
deleted file mode 100644
index 88a157558638..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_icon_circles.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_icon_circles_selected.png b/WordPress/src/main/res/drawable-ldpi/gallery_icon_circles_selected.png
deleted file mode 100644
index bfbfaf1b3526..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_icon_circles_selected.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_icon_slideshow.png b/WordPress/src/main/res/drawable-ldpi/gallery_icon_slideshow.png
deleted file mode 100644
index b9e1fa5baed7..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_icon_slideshow.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_icon_slideshow_selected.png b/WordPress/src/main/res/drawable-ldpi/gallery_icon_slideshow_selected.png
deleted file mode 100644
index 51c80e359139..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_icon_slideshow_selected.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_icon_squares.png b/WordPress/src/main/res/drawable-ldpi/gallery_icon_squares.png
deleted file mode 100644
index 963d4fd10633..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_icon_squares.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_icon_squares_selected.png b/WordPress/src/main/res/drawable-ldpi/gallery_icon_squares_selected.png
deleted file mode 100644
index 8abb57a6bfa9..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_icon_squares_selected.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_icon_thumbnailgrid.png b/WordPress/src/main/res/drawable-ldpi/gallery_icon_thumbnailgrid.png
deleted file mode 100644
index 0866cc84e6be..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_icon_thumbnailgrid.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_icon_thumbnailgrid_selected.png b/WordPress/src/main/res/drawable-ldpi/gallery_icon_thumbnailgrid_selected.png
deleted file mode 100644
index 8284bd5c2dd4..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_icon_thumbnailgrid_selected.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_icon_tiled.png b/WordPress/src/main/res/drawable-ldpi/gallery_icon_tiled.png
deleted file mode 100644
index 8f287f275fdf..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_icon_tiled.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_icon_tiled_selected.png b/WordPress/src/main/res/drawable-ldpi/gallery_icon_tiled_selected.png
deleted file mode 100644
index 0f2c866f67d6..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_icon_tiled_selected.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/gallery_tablet_move_file.png b/WordPress/src/main/res/drawable-ldpi/gallery_tablet_move_file.png
deleted file mode 100644
index 847e28fc97c3..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/gallery_tablet_move_file.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/icon_mediagallery_placeholder.png b/WordPress/src/main/res/drawable-ldpi/icon_mediagallery_placeholder.png
deleted file mode 100644
index ff2fcaf2ca32..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/icon_mediagallery_placeholder.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/media_document.png b/WordPress/src/main/res/drawable-ldpi/media_document.png
deleted file mode 100644
index 657184a6a7ac..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/media_document.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/media_image_placeholder.png b/WordPress/src/main/res/drawable-ldpi/media_image_placeholder.png
deleted file mode 100644
index b631feeffff8..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/media_image_placeholder.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/media_movieclip.png b/WordPress/src/main/res/drawable-ldpi/media_movieclip.png
deleted file mode 100644
index 32197b5353c6..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/media_movieclip.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/media_powerpoint.png b/WordPress/src/main/res/drawable-ldpi/media_powerpoint.png
deleted file mode 100644
index e3a77e21916e..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/media_powerpoint.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/media_spreadsheet.png b/WordPress/src/main/res/drawable-ldpi/media_spreadsheet.png
deleted file mode 100644
index 852204ebe5b7..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/media_spreadsheet.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/notification_icon.png b/WordPress/src/main/res/drawable-ldpi/notification_icon.png
deleted file mode 100644
index f33f0bfdb15f..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/notification_icon.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/stats_chevron_down.png b/WordPress/src/main/res/drawable-ldpi/stats_chevron_down.png
deleted file mode 100644
index 286036913247..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/stats_chevron_down.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/stats_chevron_right.png b/WordPress/src/main/res/drawable-ldpi/stats_chevron_right.png
deleted file mode 100644
index b73e8d083a04..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/stats_chevron_right.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/stats_chevron_up.png b/WordPress/src/main/res/drawable-ldpi/stats_chevron_up.png
deleted file mode 100644
index 67fa2f729706..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/stats_chevron_up.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/stats_icon_plus.png b/WordPress/src/main/res/drawable-ldpi/stats_icon_plus.png
deleted file mode 100644
index 3f30097a2d52..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/stats_icon_plus.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/stats_icon_posts.png b/WordPress/src/main/res/drawable-ldpi/stats_icon_posts.png
deleted file mode 100644
index 6e0873812acb..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/stats_icon_posts.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/stats_nav_checkmark.png b/WordPress/src/main/res/drawable-ldpi/stats_nav_checkmark.png
deleted file mode 100644
index 82e93e93f36e..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/stats_nav_checkmark.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/tab_icon_create_gallery.png b/WordPress/src/main/res/drawable-ldpi/tab_icon_create_gallery.png
deleted file mode 100644
index 517f4580248b..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/tab_icon_create_gallery.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/tab_icon_newpost.png b/WordPress/src/main/res/drawable-ldpi/tab_icon_newpost.png
deleted file mode 100644
index ab8ce71f1422..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/tab_icon_newpost.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/theme_icon_current.png b/WordPress/src/main/res/drawable-ldpi/theme_icon_current.png
deleted file mode 100644
index a871de42852c..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/theme_icon_current.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/theme_icon_premium.png b/WordPress/src/main/res/drawable-ldpi/theme_icon_premium.png
deleted file mode 100644
index 4d4bfb66f826..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/theme_icon_premium.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/theme_icon_tag_current.png b/WordPress/src/main/res/drawable-ldpi/theme_icon_tag_current.png
deleted file mode 100644
index 63de0a6f20fd..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/theme_icon_tag_current.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/theme_icon_tag_premium.png b/WordPress/src/main/res/drawable-ldpi/theme_icon_tag_premium.png
deleted file mode 100644
index 69a0f5dcf339..000000000000
Binary files a/WordPress/src/main/res/drawable-ldpi/theme_icon_tag_premium.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_bottom_solid_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/ab_bottom_solid_wordpress.9.png
deleted file mode 100755
index 635eef3ffaf4..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_bottom_solid_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_icon_edit.png b/WordPress/src/main/res/drawable-mdpi/ab_icon_edit.png
deleted file mode 100644
index eea4a3bca85c..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_icon_edit.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_icon_new.png b/WordPress/src/main/res/drawable-mdpi/ab_icon_new.png
deleted file mode 100644
index 4d5d484b3997..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_icon_new.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_icon_refresh.png b/WordPress/src/main/res/drawable-mdpi/ab_icon_refresh.png
deleted file mode 100644
index bd611e8e24d2..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_icon_refresh.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_icon_reply.png b/WordPress/src/main/res/drawable-mdpi/ab_icon_reply.png
deleted file mode 100644
index 9e344659eedc..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_icon_reply.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_icon_save.png b/WordPress/src/main/res/drawable-mdpi/ab_icon_save.png
deleted file mode 100644
index ad0769553945..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_icon_save.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_icon_send.png b/WordPress/src/main/res/drawable-mdpi/ab_icon_send.png
deleted file mode 100644
index 515668a6b6c3..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_icon_send.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_icon_send_lite.png b/WordPress/src/main/res/drawable-mdpi/ab_icon_send_lite.png
deleted file mode 100755
index 382fdd48496c..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_icon_send_lite.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_icon_share.png b/WordPress/src/main/res/drawable-mdpi/ab_icon_share.png
deleted file mode 100644
index 056deb57b928..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_icon_share.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_icon_web.png b/WordPress/src/main/res/drawable-mdpi/ab_icon_web.png
deleted file mode 100644
index 41b56ec92603..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_icon_web.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_icon_wp.png b/WordPress/src/main/res/drawable-mdpi/ab_icon_wp.png
deleted file mode 100644
index 5438c5522b57..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_icon_wp.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_stacked_solid_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/ab_stacked_solid_wordpress.9.png
deleted file mode 100755
index 8c30b11a2395..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_stacked_solid_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ab_transparent_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/ab_transparent_wordpress.9.png
deleted file mode 100755
index 15868ca3e00b..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ab_transparent_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/app_icon.png b/WordPress/src/main/res/drawable-mdpi/app_icon.png
deleted file mode 100644
index fd432bfec6d3..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/app_icon.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/box_with_pages_bottom.png b/WordPress/src/main/res/drawable-mdpi/box_with_pages_bottom.png
deleted file mode 100644
index 2e685cb30597..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/box_with_pages_bottom.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/box_with_pages_page1.png b/WordPress/src/main/res/drawable-mdpi/box_with_pages_page1.png
deleted file mode 100644
index fb7b3315b06d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/box_with_pages_page1.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/box_with_pages_page2.png b/WordPress/src/main/res/drawable-mdpi/box_with_pages_page2.png
deleted file mode 100644
index 0e61552067c6..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/box_with_pages_page2.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/box_with_pages_page3.png b/WordPress/src/main/res/drawable-mdpi/box_with_pages_page3.png
deleted file mode 100644
index fb3181f32af8..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/box_with_pages_page3.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/box_with_pages_top.png b/WordPress/src/main/res/drawable-mdpi/box_with_pages_top.png
deleted file mode 100644
index df37ace6a146..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/box_with_pages_top.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/btn_cab_done_default_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/btn_cab_done_default_wordpress.9.png
deleted file mode 100755
index 70f1520f186d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/btn_cab_done_default_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/btn_cab_done_focused_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/btn_cab_done_focused_wordpress.9.png
deleted file mode 100755
index 81eac2bd8004..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/btn_cab_done_focused_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/btn_cab_done_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/btn_cab_done_pressed_wordpress.9.png
deleted file mode 100755
index a34db791e625..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/btn_cab_done_pressed_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/button_blue.9.png b/WordPress/src/main/res/drawable-mdpi/button_blue.9.png
deleted file mode 100644
index 9ac162b773e1..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/button_blue.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/button_blue_disabled.9.png b/WordPress/src/main/res/drawable-mdpi/button_blue_disabled.9.png
deleted file mode 100644
index 3d7b38a6a37d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/button_blue_disabled.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/button_blue_focus.9.png b/WordPress/src/main/res/drawable-mdpi/button_blue_focus.9.png
deleted file mode 100644
index f4acb4c3f5aa..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/button_blue_focus.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/button_darkgray.9.png b/WordPress/src/main/res/drawable-mdpi/button_darkgray.9.png
deleted file mode 100644
index ee6e810a076f..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/button_darkgray.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/button_darkgray_disabled.9.png b/WordPress/src/main/res/drawable-mdpi/button_darkgray_disabled.9.png
deleted file mode 100644
index 22c27cc72034..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/button_darkgray_disabled.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/button_darkgray_focus.9.png b/WordPress/src/main/res/drawable-mdpi/button_darkgray_focus.9.png
deleted file mode 100644
index ae223beabb2e..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/button_darkgray_focus.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/cab_background_bottom_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/cab_background_bottom_wordpress.9.png
deleted file mode 100755
index 4163f03f030b..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/cab_background_bottom_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/cab_background_top_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/cab_background_top_wordpress.9.png
deleted file mode 100755
index 8a4ce379499d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/cab_background_top_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_comments.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_comments.png
deleted file mode 100644
index 1abb0c27696a..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_comments.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_media.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_media.png
deleted file mode 100644
index 153522db052b..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_media.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_notifications.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_notifications.png
deleted file mode 100644
index a4361802cd29..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_notifications.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_pages.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_pages.png
deleted file mode 100644
index ea3dcb881c32..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_pages.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_photo.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_photo.png
deleted file mode 100644
index 2e9bc0bff388..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_photo.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_posts.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_posts.png
deleted file mode 100644
index 4401dd83fc87..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_posts.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_stats.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_stats.png
deleted file mode 100644
index 290cddbe03f9..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_stats.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_subs.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_subs.png
deleted file mode 100644
index 3ecd2c409bc9..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_subs.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_themes.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_themes.png
deleted file mode 100644
index 7f0ae31c7751..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_themes.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_video.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_video.png
deleted file mode 100644
index b317051ad669..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_video.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_view.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_view.png
deleted file mode 100644
index ae485b5a9bde..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_view.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_wp.png b/WordPress/src/main/res/drawable-mdpi/dashboard_icon_wp.png
deleted file mode 100644
index 78a464e55965..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashboard_icon_wp.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashicon_admin_site.png b/WordPress/src/main/res/drawable-mdpi/dashicon_admin_site.png
deleted file mode 100644
index 0a223c074283..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashicon_admin_site.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashicon_admin_users.png b/WordPress/src/main/res/drawable-mdpi/dashicon_admin_users.png
deleted file mode 100644
index 7286d0463be4..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashicon_admin_users.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashicon_edit.png b/WordPress/src/main/res/drawable-mdpi/dashicon_edit.png
deleted file mode 100644
index 38ef8d126aa5..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashicon_edit.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashicon_email.png b/WordPress/src/main/res/drawable-mdpi/dashicon_email.png
deleted file mode 100644
index 22b71d0789a6..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashicon_email.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashicon_eye_closed.png b/WordPress/src/main/res/drawable-mdpi/dashicon_eye_closed.png
deleted file mode 100755
index 279415b36fb5..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashicon_eye_closed.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashicon_eye_open.png b/WordPress/src/main/res/drawable-mdpi/dashicon_eye_open.png
deleted file mode 100755
index cbf812484c7a..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashicon_eye_open.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashicon_info.png b/WordPress/src/main/res/drawable-mdpi/dashicon_info.png
deleted file mode 100755
index 9243655961c0..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashicon_info.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/dashicon_lock.png b/WordPress/src/main/res/drawable-mdpi/dashicon_lock.png
deleted file mode 100644
index 9e383dcb4d2e..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/dashicon_lock.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/follow_minus.png b/WordPress/src/main/res/drawable-mdpi/follow_minus.png
deleted file mode 100644
index deab5e2446cb..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/follow_minus.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/follow_plus.png b/WordPress/src/main/res/drawable-mdpi/follow_plus.png
deleted file mode 100644
index 552617968b6d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/follow_plus.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_arrow_dropdown_closed.png b/WordPress/src/main/res/drawable-mdpi/gallery_arrow_dropdown_closed.png
deleted file mode 100644
index 2c3570a2a172..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_arrow_dropdown_closed.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_arrow_dropdown_open.png b/WordPress/src/main/res/drawable-mdpi/gallery_arrow_dropdown_open.png
deleted file mode 100644
index b7346c84899e..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_arrow_dropdown_open.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_checkbox_empty.png b/WordPress/src/main/res/drawable-mdpi/gallery_checkbox_empty.png
deleted file mode 100644
index b5aa9ebd0b38..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_checkbox_empty.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_checkbox_filled.png b/WordPress/src/main/res/drawable-mdpi/gallery_checkbox_filled.png
deleted file mode 100644
index 393e4ff2c9f4..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_checkbox_filled.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_icon_circles.png b/WordPress/src/main/res/drawable-mdpi/gallery_icon_circles.png
deleted file mode 100644
index bdb0e790ef4a..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_icon_circles.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_icon_circles_selected.png b/WordPress/src/main/res/drawable-mdpi/gallery_icon_circles_selected.png
deleted file mode 100644
index 93eef4b2e6df..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_icon_circles_selected.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_icon_slideshow.png b/WordPress/src/main/res/drawable-mdpi/gallery_icon_slideshow.png
deleted file mode 100644
index cb659d019085..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_icon_slideshow.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_icon_slideshow_selected.png b/WordPress/src/main/res/drawable-mdpi/gallery_icon_slideshow_selected.png
deleted file mode 100644
index b2c432c6775f..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_icon_slideshow_selected.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_icon_squares.png b/WordPress/src/main/res/drawable-mdpi/gallery_icon_squares.png
deleted file mode 100644
index bc04c50bc895..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_icon_squares.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_icon_squares_selected.png b/WordPress/src/main/res/drawable-mdpi/gallery_icon_squares_selected.png
deleted file mode 100644
index f76e78603f94..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_icon_squares_selected.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_icon_thumbnailgrid.png b/WordPress/src/main/res/drawable-mdpi/gallery_icon_thumbnailgrid.png
deleted file mode 100644
index 11b8555753d1..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_icon_thumbnailgrid.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_icon_thumbnailgrid_selected.png b/WordPress/src/main/res/drawable-mdpi/gallery_icon_thumbnailgrid_selected.png
deleted file mode 100644
index ee8c44d0ff66..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_icon_thumbnailgrid_selected.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_icon_tiled.png b/WordPress/src/main/res/drawable-mdpi/gallery_icon_tiled.png
deleted file mode 100644
index 130bd312779b..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_icon_tiled.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_icon_tiled_selected.png b/WordPress/src/main/res/drawable-mdpi/gallery_icon_tiled_selected.png
deleted file mode 100644
index ae3aec7aab07..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_icon_tiled_selected.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/gallery_tablet_move_file.png b/WordPress/src/main/res/drawable-mdpi/gallery_tablet_move_file.png
deleted file mode 100644
index 5d131a1c3aa8..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/gallery_tablet_move_file.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_approve.png b/WordPress/src/main/res/drawable-mdpi/ic_action_approve.png
deleted file mode 100644
index 7fd75ce88da7..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_approve.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_approve_active.png b/WordPress/src/main/res/drawable-mdpi/ic_action_approve_active.png
deleted file mode 100644
index 1cbbbe403699..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_approve_active.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_edit.png b/WordPress/src/main/res/drawable-mdpi/ic_action_edit.png
deleted file mode 100644
index 0dce5f794fa8..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_edit.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_like.png b/WordPress/src/main/res/drawable-mdpi/ic_action_like.png
deleted file mode 100644
index 82730777a700..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_like.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_like_active.png b/WordPress/src/main/res/drawable-mdpi/ic_action_like_active.png
deleted file mode 100644
index 072bfc0ab897..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_like_active.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_location_found.png b/WordPress/src/main/res/drawable-mdpi/ic_action_location_found.png
deleted file mode 100644
index 93e73f16c1b6..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_location_found.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_location_off.png b/WordPress/src/main/res/drawable-mdpi/ic_action_location_off.png
deleted file mode 100644
index b4da159da194..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_location_off.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_location_searching.png b/WordPress/src/main/res/drawable-mdpi/ic_action_location_searching.png
deleted file mode 100644
index cfafcadd61c7..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_location_searching.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_more.png b/WordPress/src/main/res/drawable-mdpi/ic_action_more.png
deleted file mode 100644
index 6e5dc0473239..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_more.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_secure.png b/WordPress/src/main/res/drawable-mdpi/ic_action_secure.png
deleted file mode 100644
index 501a905060f3..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_secure.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_spam.png b/WordPress/src/main/res/drawable-mdpi/ic_action_spam.png
deleted file mode 100644
index 5f45029cc717..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_spam.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_tag.png b/WordPress/src/main/res/drawable-mdpi/ic_action_tag.png
deleted file mode 100644
index 3de51beee163..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_tag.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_tag_dark.png b/WordPress/src/main/res/drawable-mdpi/ic_action_tag_dark.png
deleted file mode 100644
index 94f38de6705c..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_tag_dark.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_action_trash.png b/WordPress/src/main/res/drawable-mdpi/ic_action_trash.png
deleted file mode 100644
index 7e66210ceb08..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_action_trash.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_cab_approve.png b/WordPress/src/main/res/drawable-mdpi/ic_cab_approve.png
deleted file mode 100644
index 88f6d7fe8a88..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_cab_approve.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_cab_like.png b/WordPress/src/main/res/drawable-mdpi/ic_cab_like.png
deleted file mode 100644
index 96e4917e9262..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_cab_like.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_cab_like_active.png b/WordPress/src/main/res/drawable-mdpi/ic_cab_like_active.png
deleted file mode 100644
index 02a6f1cfd5d7..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_cab_like_active.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_cab_spam.png b/WordPress/src/main/res/drawable-mdpi/ic_cab_spam.png
deleted file mode 100644
index 57274d77e409..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_cab_spam.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_cab_trash.png b/WordPress/src/main/res/drawable-mdpi/ic_cab_trash.png
deleted file mode 100644
index 248fb09cd0c9..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_cab_trash.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_cab_unapprove.png b/WordPress/src/main/res/drawable-mdpi/ic_cab_unapprove.png
deleted file mode 100644
index acd762285c50..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_cab_unapprove.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_comment.png b/WordPress/src/main/res/drawable-mdpi/ic_comment.png
deleted file mode 100644
index 9ef4612f8cd0..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_comment.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_comment_active.png b/WordPress/src/main/res/drawable-mdpi/ic_comment_active.png
deleted file mode 100644
index bfe31add6c3c..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_comment_active.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_content_new.png b/WordPress/src/main/res/drawable-mdpi/ic_content_new.png
deleted file mode 100755
index 884c9d270377..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_content_new.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_content_remove.png b/WordPress/src/main/res/drawable-mdpi/ic_content_remove.png
deleted file mode 100644
index 9de7acc8fd51..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_content_remove.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_drawer.png b/WordPress/src/main/res/drawable-mdpi/ic_drawer.png
deleted file mode 100644
index 58fe873bae1f..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_drawer.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_error.png b/WordPress/src/main/res/drawable-mdpi/ic_error.png
deleted file mode 100644
index f8a0a6ebc2bc..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_error.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_level_indicator.png b/WordPress/src/main/res/drawable-mdpi/ic_level_indicator.png
deleted file mode 100644
index 2f4a852cefd6..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_level_indicator.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_like.png b/WordPress/src/main/res/drawable-mdpi/ic_like.png
deleted file mode 100644
index 91df8d7d76d1..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_like.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_like_active.png b/WordPress/src/main/res/drawable-mdpi/ic_like_active.png
deleted file mode 100644
index bae5de5b1e6e..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_like_active.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_location.png b/WordPress/src/main/res/drawable-mdpi/ic_location.png
deleted file mode 100644
index 0c6dd9c4bb3c..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_location.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_navigate_next.png b/WordPress/src/main/res/drawable-mdpi/ic_navigate_next.png
deleted file mode 100644
index 88029a82d4f2..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_navigate_next.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_navigate_previous.png b/WordPress/src/main/res/drawable-mdpi/ic_navigate_previous.png
deleted file mode 100644
index 8d19e3911e0d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_navigate_previous.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_post_preview.png b/WordPress/src/main/res/drawable-mdpi/ic_post_preview.png
deleted file mode 100644
index 46ee83473144..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_post_preview.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_post_settings.png b/WordPress/src/main/res/drawable-mdpi/ic_post_settings.png
deleted file mode 100644
index 50bc25650718..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_post_settings.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_reader_video_overlay.png b/WordPress/src/main/res/drawable-mdpi/ic_reader_video_overlay.png
deleted file mode 100644
index f02b0e57c873..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_reader_video_overlay.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_reblog.png b/WordPress/src/main/res/drawable-mdpi/ic_reblog.png
deleted file mode 100644
index 9c0a3af3ceb8..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_reblog.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_reblog_active.png b/WordPress/src/main/res/drawable-mdpi/ic_reblog_active.png
deleted file mode 100644
index dfb768e3fe9c..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_reblog_active.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/ic_share.png b/WordPress/src/main/res/drawable-mdpi/ic_share.png
deleted file mode 100644
index bff81179ac8c..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/ic_share.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_bold.png b/WordPress/src/main/res/drawable-mdpi/icon_format_bold.png
deleted file mode 100644
index 75aa628e8ce1..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_bold.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_bold_highlighted.png b/WordPress/src/main/res/drawable-mdpi/icon_format_bold_highlighted.png
deleted file mode 100644
index 3734073c6bb0..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_bold_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_italic.png b/WordPress/src/main/res/drawable-mdpi/icon_format_italic.png
deleted file mode 100644
index ba1ab5fe88c9..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_italic.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_italic_highlighted.png b/WordPress/src/main/res/drawable-mdpi/icon_format_italic_highlighted.png
deleted file mode 100644
index 3b3c24209897..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_italic_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_link.png b/WordPress/src/main/res/drawable-mdpi/icon_format_link.png
deleted file mode 100644
index 1c33b9da1d25..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_link.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_link_highlighted.png b/WordPress/src/main/res/drawable-mdpi/icon_format_link_highlighted.png
deleted file mode 100644
index 48b87a79ec37..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_link_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_media.png b/WordPress/src/main/res/drawable-mdpi/icon_format_media.png
deleted file mode 100644
index 4970105b2197..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_media.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_media_highlighted.png b/WordPress/src/main/res/drawable-mdpi/icon_format_media_highlighted.png
deleted file mode 100644
index 0dbb2b3cdbb0..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_media_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_more.png b/WordPress/src/main/res/drawable-mdpi/icon_format_more.png
deleted file mode 100644
index f5e6688e6209..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_more.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_more_highlighted.png b/WordPress/src/main/res/drawable-mdpi/icon_format_more_highlighted.png
deleted file mode 100644
index 0d5063d3ad4e..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_more_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_quote.png b/WordPress/src/main/res/drawable-mdpi/icon_format_quote.png
deleted file mode 100644
index 63cd4679cd37..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_quote.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_quote_highlighted.png b/WordPress/src/main/res/drawable-mdpi/icon_format_quote_highlighted.png
deleted file mode 100644
index cf3dbdda09aa..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_quote_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_strikethrough.png b/WordPress/src/main/res/drawable-mdpi/icon_format_strikethrough.png
deleted file mode 100644
index 34bb982de7eb..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_strikethrough.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_strikethrough_highlighted.png b/WordPress/src/main/res/drawable-mdpi/icon_format_strikethrough_highlighted.png
deleted file mode 100644
index 6a0e71f6aba8..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_strikethrough_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_underline.png b/WordPress/src/main/res/drawable-mdpi/icon_format_underline.png
deleted file mode 100644
index a5d8060a47ea..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_underline.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_format_underline_highlighted.png b/WordPress/src/main/res/drawable-mdpi/icon_format_underline_highlighted.png
deleted file mode 100644
index 21b5317ead3b..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_format_underline_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/icon_mediagallery_placeholder.png b/WordPress/src/main/res/drawable-mdpi/icon_mediagallery_placeholder.png
deleted file mode 100644
index 548b6190c3fe..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/icon_mediagallery_placeholder.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/list_focused_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/list_focused_wordpress.9.png
deleted file mode 100755
index 5e568309f6ab..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/list_focused_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/media_document.png b/WordPress/src/main/res/drawable-mdpi/media_document.png
deleted file mode 100644
index 55132a0c37e0..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/media_document.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/media_image_placeholder.png b/WordPress/src/main/res/drawable-mdpi/media_image_placeholder.png
deleted file mode 100644
index 718e5057e114..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/media_image_placeholder.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/media_movieclip.png b/WordPress/src/main/res/drawable-mdpi/media_movieclip.png
deleted file mode 100644
index 088057320daf..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/media_movieclip.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/media_powerpoint.png b/WordPress/src/main/res/drawable-mdpi/media_powerpoint.png
deleted file mode 100644
index e783ca8083cf..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/media_powerpoint.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/media_spreadsheet.png b/WordPress/src/main/res/drawable-mdpi/media_spreadsheet.png
deleted file mode 100644
index 72463648bd23..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/media_spreadsheet.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/menu_button_bg.9.png b/WordPress/src/main/res/drawable-mdpi/menu_button_bg.9.png
deleted file mode 100644
index a71772bb4d51..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/menu_button_bg.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/menu_dropdown_panel_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/menu_dropdown_panel_wordpress.9.png
deleted file mode 100755
index e6eea35d0b78..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/menu_dropdown_panel_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/menu_hardkey_panel_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/menu_hardkey_panel_wordpress.9.png
deleted file mode 100644
index 3c8cb1baca76..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/menu_hardkey_panel_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/moderate_approve.png b/WordPress/src/main/res/drawable-mdpi/moderate_approve.png
deleted file mode 100644
index 9785088db56d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/moderate_approve.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/moderate_spam.png b/WordPress/src/main/res/drawable-mdpi/moderate_spam.png
deleted file mode 100644
index dbb56dbceb95..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/moderate_spam.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/moderate_trash.png b/WordPress/src/main/res/drawable-mdpi/moderate_trash.png
deleted file mode 100644
index 27666c24091d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/moderate_trash.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/moderate_unapprove.png b/WordPress/src/main/res/drawable-mdpi/moderate_unapprove.png
deleted file mode 100644
index 509a40dfd4d7..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/moderate_unapprove.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/new_account_logo.png b/WordPress/src/main/res/drawable-mdpi/new_account_logo.png
deleted file mode 100644
index fd54080b8070..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/new_account_logo.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/note_icon_follow.png b/WordPress/src/main/res/drawable-mdpi/note_icon_follow.png
deleted file mode 100644
index fbbe1725880d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/note_icon_follow.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/note_icon_following.png b/WordPress/src/main/res/drawable-mdpi/note_icon_following.png
deleted file mode 100644
index 60bd71d83241..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/note_icon_following.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/note_icon_reply.png b/WordPress/src/main/res/drawable-mdpi/note_icon_reply.png
deleted file mode 100644
index bcc6c8d5e54b..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/note_icon_reply.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/noticon_clock.png b/WordPress/src/main/res/drawable-mdpi/noticon_clock.png
deleted file mode 100644
index ef0ae59fbca7..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/noticon_clock.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/notification_icon.png b/WordPress/src/main/res/drawable-mdpi/notification_icon.png
deleted file mode 100755
index 9cab245474e4..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/notification_icon.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/notification_multi.png b/WordPress/src/main/res/drawable-mdpi/notification_multi.png
deleted file mode 100644
index ca85a3230e14..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/notification_multi.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/nux_icon_alert.png b/WordPress/src/main/res/drawable-mdpi/nux_icon_alert.png
deleted file mode 100644
index 2440ffbfbac0..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/nux_icon_alert.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/nux_icon_wp.png b/WordPress/src/main/res/drawable-mdpi/nux_icon_wp.png
deleted file mode 100644
index e2af04de7c61..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/nux_icon_wp.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/penandink.png b/WordPress/src/main/res/drawable-mdpi/penandink.png
deleted file mode 100644
index b3b98c7d891e..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/penandink.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/progress_bg_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/progress_bg_wordpress.9.png
deleted file mode 100755
index 9372a60f7b17..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/progress_bg_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/progress_primary_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/progress_primary_wordpress.9.png
deleted file mode 100755
index e029b5df1486..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/progress_primary_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/progress_secondary_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/progress_secondary_wordpress.9.png
deleted file mode 100755
index 1a05e688e5fe..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/progress_secondary_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/reader_arrow_dropdown.png b/WordPress/src/main/res/drawable-mdpi/reader_arrow_dropdown.png
deleted file mode 100644
index 9dfe22251c44..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/reader_arrow_dropdown.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/remote_failed.png b/WordPress/src/main/res/drawable-mdpi/remote_failed.png
deleted file mode 100644
index a370d8bd06e1..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/remote_failed.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/remote_image.png b/WordPress/src/main/res/drawable-mdpi/remote_image.png
deleted file mode 100644
index 827fbdbc9ab5..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/remote_image.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/spinner_ab_default_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/spinner_ab_default_wordpress.9.png
deleted file mode 100755
index 9aeafee201a6..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/spinner_ab_default_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/spinner_ab_disabled_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/spinner_ab_disabled_wordpress.9.png
deleted file mode 100755
index 88dd44151c3b..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/spinner_ab_disabled_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/spinner_ab_focused_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/spinner_ab_focused_wordpress.9.png
deleted file mode 100755
index 9b48172ba70e..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/spinner_ab_focused_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/spinner_ab_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/spinner_ab_pressed_wordpress.9.png
deleted file mode 100755
index f3062cb45dda..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/spinner_ab_pressed_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/stats_chevron_down.png b/WordPress/src/main/res/drawable-mdpi/stats_chevron_down.png
deleted file mode 100644
index 2042b58dfdc8..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/stats_chevron_down.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/stats_chevron_right.png b/WordPress/src/main/res/drawable-mdpi/stats_chevron_right.png
deleted file mode 100644
index 465ba3164499..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/stats_chevron_right.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/stats_chevron_up.png b/WordPress/src/main/res/drawable-mdpi/stats_chevron_up.png
deleted file mode 100644
index b16ce6c8c97f..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/stats_chevron_up.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/stats_icon_categories.png b/WordPress/src/main/res/drawable-mdpi/stats_icon_categories.png
deleted file mode 100644
index 48f846b8ed76..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/stats_icon_categories.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/stats_icon_plus.png b/WordPress/src/main/res/drawable-mdpi/stats_icon_plus.png
deleted file mode 100644
index 025a3aa0d050..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/stats_icon_plus.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/stats_icon_posts.png b/WordPress/src/main/res/drawable-mdpi/stats_icon_posts.png
deleted file mode 100644
index 293a91748fc9..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/stats_icon_posts.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/stats_icon_tags.png b/WordPress/src/main/res/drawable-mdpi/stats_icon_tags.png
deleted file mode 100644
index 9e54452bbac6..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/stats_icon_tags.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/stats_nav_checkmark.png b/WordPress/src/main/res/drawable-mdpi/stats_nav_checkmark.png
deleted file mode 100644
index c1db4c62d8e1..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/stats_nav_checkmark.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/tab_icon_checkmark.png b/WordPress/src/main/res/drawable-mdpi/tab_icon_checkmark.png
deleted file mode 100644
index 35cda8e11213..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/tab_icon_checkmark.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/tab_icon_create_gallery.png b/WordPress/src/main/res/drawable-mdpi/tab_icon_create_gallery.png
deleted file mode 100644
index ecbe2b95fb42..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/tab_icon_create_gallery.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/tab_icon_newpost.png b/WordPress/src/main/res/drawable-mdpi/tab_icon_newpost.png
deleted file mode 100644
index 082b7b803b3d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/tab_icon_newpost.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/tab_icon_trash.png b/WordPress/src/main/res/drawable-mdpi/tab_icon_trash.png
deleted file mode 100644
index a8ee5f253f83..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/tab_icon_trash.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/tab_selected_focused_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/tab_selected_focused_wordpress.9.png
deleted file mode 100755
index 526e2b1e62e8..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/tab_selected_focused_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/tab_selected_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/tab_selected_pressed_wordpress.9.png
deleted file mode 100755
index 457f090f2a53..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/tab_selected_pressed_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/tab_selected_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/tab_selected_wordpress.9.png
deleted file mode 100755
index b259e86f80c1..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/tab_selected_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/tab_unselected_focused_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/tab_unselected_focused_wordpress.9.png
deleted file mode 100755
index 7166b954ab05..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/tab_unselected_focused_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/tab_unselected_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-mdpi/tab_unselected_pressed_wordpress.9.png
deleted file mode 100755
index efc6006c2e97..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/tab_unselected_pressed_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/theme_icon_current.png b/WordPress/src/main/res/drawable-mdpi/theme_icon_current.png
deleted file mode 100644
index 421a614b918c..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/theme_icon_current.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/theme_icon_premium.png b/WordPress/src/main/res/drawable-mdpi/theme_icon_premium.png
deleted file mode 100644
index a42f22f54533..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/theme_icon_premium.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/theme_icon_tag_current.png b/WordPress/src/main/res/drawable-mdpi/theme_icon_tag_current.png
deleted file mode 100644
index b5dc21425b6c..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/theme_icon_tag_current.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/theme_icon_tag_premium.png b/WordPress/src/main/res/drawable-mdpi/theme_icon_tag_premium.png
deleted file mode 100644
index e95368e56c9d..000000000000
Binary files a/WordPress/src/main/res/drawable-mdpi/theme_icon_tag_premium.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_bottom_solid_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/ab_bottom_solid_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_icon_edit.png b/WordPress/src/main/res/drawable-xhdpi/ab_icon_edit.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_icon_new.png b/WordPress/src/main/res/drawable-xhdpi/ab_icon_new.png
deleted file mode 100644
index 23b9a1c18577..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ab_icon_new.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_icon_refresh.png b/WordPress/src/main/res/drawable-xhdpi/ab_icon_refresh.png
deleted file mode 100644
index a7fdc0dfcb1d..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ab_icon_refresh.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_icon_reply.png b/WordPress/src/main/res/drawable-xhdpi/ab_icon_reply.png
deleted file mode 100644
index 4cc854ab8001..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ab_icon_reply.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_icon_save.png b/WordPress/src/main/res/drawable-xhdpi/ab_icon_save.png
deleted file mode 100755
index 272060253d0f..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ab_icon_save.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_icon_send.png b/WordPress/src/main/res/drawable-xhdpi/ab_icon_send.png
deleted file mode 100644
index 0c870d2ce19d..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ab_icon_send.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_icon_send_lite.png b/WordPress/src/main/res/drawable-xhdpi/ab_icon_send_lite.png
deleted file mode 100755
index bd37dc596ad3..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ab_icon_send_lite.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_icon_share.png b/WordPress/src/main/res/drawable-xhdpi/ab_icon_share.png
deleted file mode 100644
index 15549b04eff0..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ab_icon_share.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_icon_web.png b/WordPress/src/main/res/drawable-xhdpi/ab_icon_web.png
deleted file mode 100644
index 9b77be967fb6..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ab_icon_web.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_icon_wp.png b/WordPress/src/main/res/drawable-xhdpi/ab_icon_wp.png
deleted file mode 100644
index f49892e4ad82..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ab_icon_wp.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_stacked_solid_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/ab_stacked_solid_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/ab_transparent_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/ab_transparent_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/btn_cab_done_default_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/btn_cab_done_default_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/btn_cab_done_focused_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/btn_cab_done_focused_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/btn_cab_done_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/btn_cab_done_pressed_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/cab_background_bottom_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/cab_background_bottom_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/cab_background_top_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/cab_background_top_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_comments.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_comments.png
deleted file mode 100644
index db8de60beb2e..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_comments.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_media.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_media.png
deleted file mode 100644
index 783a82ed6626..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_media.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_notifications.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_notifications.png
deleted file mode 100644
index a494ea2ef344..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_notifications.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_pages.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_pages.png
deleted file mode 100644
index 900e43c1bed6..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_pages.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_photo.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_photo.png
deleted file mode 100644
index 4236e05db9d0..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_photo.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_posts.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_posts.png
deleted file mode 100644
index 6685dceb8444..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_posts.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_stats.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_stats.png
deleted file mode 100644
index 92328f8c081f..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_stats.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_subs.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_subs.png
deleted file mode 100644
index 71659f410fc0..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_subs.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_video.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_video.png
deleted file mode 100644
index 1135646a5e2b..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_video.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_view.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_view.png
deleted file mode 100644
index e3c625d2021b..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_view.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_wp.png b/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_wp.png
deleted file mode 100644
index 71d434909e35..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/dashboard_icon_wp.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_comments_black.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_comments_black.png
new file mode 100644
index 000000000000..31c763125760
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_comments_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_links.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_links.png
new file mode 100644
index 000000000000..eef4505a515d
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_links.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_links_grey.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_links_grey.png
new file mode 100644
index 000000000000..f545cd6512b7
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_links_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_media_black.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_media_black.png
new file mode 100644
index 000000000000..9956a6d471af
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_media_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_page_black.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_page_black.png
new file mode 100644
index 000000000000..906b6addaf66
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_page_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_post_black.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_post_black.png
new file mode 100644
index 000000000000..ead48b2f906d
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_admin_post_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_camera_black.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_camera_black.png
new file mode 100644
index 000000000000..71e00b536a57
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_camera_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_chart_area_black.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_chart_area_black.png
new file mode 100644
index 000000000000..3a499f702f2e
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_chart_area_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_bold.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_bold.png
new file mode 100644
index 000000000000..4519f6c043d0
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_bold.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_bold_grey.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_bold_grey.png
new file mode 100644
index 000000000000..b85e413820b5
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_bold_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_insertmore.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_insertmore.png
new file mode 100644
index 000000000000..61ae586afac4
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_insertmore.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_insertmore_grey.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_insertmore_grey.png
new file mode 100644
index 000000000000..912987466189
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_insertmore_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_italic.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_italic.png
new file mode 100644
index 000000000000..dbcea35132e9
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_italic.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_italic_grey.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_italic_grey.png
new file mode 100644
index 000000000000..6a776b669262
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_italic_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_strikethrough.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_strikethrough.png
new file mode 100644
index 000000000000..006acefc1f65
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_strikethrough.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_strikethrough_grey.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_strikethrough_grey.png
new file mode 100644
index 000000000000..c182663816e0
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_strikethrough_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_underline.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_underline.png
new file mode 100644
index 000000000000..c3c76dbc8dcd
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_underline.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_underline_grey.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_underline_grey.png
new file mode 100644
index 000000000000..f728bd9cf5a1
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_editor_underline_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_external_black.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_external_black.png
new file mode 100644
index 000000000000..4cbce95aac57
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_external_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_eye_closed.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_eye_closed.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_eye_open.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_eye_open.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_format_image_big_grey.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_format_image_big_grey.png
new file mode 100644
index 000000000000..95dbdd936edd
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_format_image_big_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_format_quote.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_format_quote.png
new file mode 100644
index 000000000000..164881f53efb
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_format_quote.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_format_quote_grey.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_format_quote_grey.png
new file mode 100644
index 000000000000..797c88e8aeae
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_format_quote_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_info.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_info.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_video_alt2_black.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_video_alt2_black.png
new file mode 100644
index 000000000000..f398e1619dbe
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_video_alt2_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/dashicon_wordpress_alt.png b/WordPress/src/main/res/drawable-xhdpi/dashicon_wordpress_alt.png
new file mode 100644
index 000000000000..21bf32f375f3
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/dashicon_wordpress_alt.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/follow_minus.png b/WordPress/src/main/res/drawable-xhdpi/follow_minus.png
deleted file mode 100644
index 7e29a9018f37..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/follow_minus.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/follow_plus.png b/WordPress/src/main/res/drawable-xhdpi/follow_plus.png
deleted file mode 100644
index 6d24ee1da002..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/follow_plus.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-mdpi/placeholder.png b/WordPress/src/main/res/drawable-xhdpi/gravatar_placeholder.png
similarity index 100%
rename from WordPress/src/main/res/drawable-mdpi/placeholder.png
rename to WordPress/src/main/res/drawable-xhdpi/gravatar_placeholder.png
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_action_accept.png b/WordPress/src/main/res/drawable-xhdpi/ic_action_accept.png
new file mode 100644
index 000000000000..6ee32b64df5f
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/ic_action_accept.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_action_discard.png b/WordPress/src/main/res/drawable-xhdpi/ic_action_discard.png
new file mode 100644
index 000000000000..9eeeed124dbc
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/ic_action_discard.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_action_new.png b/WordPress/src/main/res/drawable-xhdpi/ic_action_new.png
new file mode 100644
index 000000000000..dde2141f2148
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/ic_action_new.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_action_refresh.png b/WordPress/src/main/res/drawable-xhdpi/ic_action_refresh.png
new file mode 100644
index 000000000000..ab4ab9da697b
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/ic_action_refresh.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_action_save.png b/WordPress/src/main/res/drawable-xhdpi/ic_action_save.png
new file mode 100644
index 000000000000..dde278b5e218
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/ic_action_save.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_action_search.png b/WordPress/src/main/res/drawable-xhdpi/ic_action_search.png
new file mode 100644
index 000000000000..19658e4a2acb
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/ic_action_search.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_action_send_now.png b/WordPress/src/main/res/drawable-xhdpi/ic_action_send_now.png
new file mode 100644
index 000000000000..2629040d110a
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/ic_action_send_now.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_action_send_now_dark.png b/WordPress/src/main/res/drawable-xhdpi/ic_action_send_now_dark.png
new file mode 100644
index 000000000000..ff0e369ee4e7
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/ic_action_send_now_dark.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_action_share.png b/WordPress/src/main/res/drawable-xhdpi/ic_action_share.png
new file mode 100644
index 000000000000..40771e480181
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/ic_action_share.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_action_web_site.png b/WordPress/src/main/res/drawable-xhdpi/ic_action_web_site.png
new file mode 100644
index 000000000000..5afa5d26bce0
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/ic_action_web_site.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_cab_like.png b/WordPress/src/main/res/drawable-xhdpi/ic_cab_like.png
deleted file mode 100644
index cbf7d9ff81c1..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ic_cab_like.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_cab_like_active.png b/WordPress/src/main/res/drawable-xhdpi/ic_cab_like_active.png
deleted file mode 100644
index 0c2060883b7e..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ic_cab_like_active.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_cab_trash.png b/WordPress/src/main/res/drawable-xhdpi/ic_cab_trash.png
deleted file mode 100644
index 8c4f649ef3f5..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ic_cab_trash.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_content_new.png b/WordPress/src/main/res/drawable-xhdpi/ic_content_new.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_drawer.png b/WordPress/src/main/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index 17a06149490f..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ic_drawer.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_navigate_next.png b/WordPress/src/main/res/drawable-xhdpi/ic_navigate_next.png
deleted file mode 100644
index c36e050a3968..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ic_navigate_next.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_navigate_previous.png b/WordPress/src/main/res/drawable-xhdpi/ic_navigate_previous.png
deleted file mode 100644
index cf0b485f6810..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ic_navigate_previous.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/stats_icon_categories.png b/WordPress/src/main/res/drawable-xhdpi/ic_navigation_drawer.png
similarity index 92%
rename from WordPress/src/main/res/drawable-ldpi/stats_icon_categories.png
rename to WordPress/src/main/res/drawable-xhdpi/ic_navigation_drawer.png
index 39ecc1f10591..96206f32c6fb 100644
Binary files a/WordPress/src/main/res/drawable-ldpi/stats_icon_categories.png and b/WordPress/src/main/res/drawable-xhdpi/ic_navigation_drawer.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_reader_video_overlay.png b/WordPress/src/main/res/drawable-xhdpi/ic_reader_video_overlay.png
deleted file mode 100644
index b9a9c6206ae1..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ic_reader_video_overlay.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/ic_share.png b/WordPress/src/main/res/drawable-xhdpi/ic_share.png
deleted file mode 100644
index cdafd8abca19..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/ic_share.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_bold.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_bold.png
deleted file mode 100644
index 65664b130e22..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_bold.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_bold_highlighted.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_bold_highlighted.png
deleted file mode 100644
index 4ef30e7b0e0d..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_bold_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_italic.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_italic.png
deleted file mode 100644
index 5d4ba4c84c19..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_italic.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_italic_highlighted.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_italic_highlighted.png
deleted file mode 100644
index b00d3b7b1d0f..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_italic_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_link.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_link.png
deleted file mode 100644
index b33adf6433bb..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_link.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_link_highlighted.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_link_highlighted.png
deleted file mode 100644
index a2c28687109e..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_link_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_media.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_media.png
deleted file mode 100644
index df75042ce7c9..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_media.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_media_highlighted.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_media_highlighted.png
deleted file mode 100644
index 1de2c6db53ab..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_media_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_more.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_more.png
deleted file mode 100644
index a1992a7eceba..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_more.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_more_highlighted.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_more_highlighted.png
deleted file mode 100644
index bc9cc4f0851a..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_more_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_quote.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_quote.png
deleted file mode 100644
index 9cf5d9bb715b..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_quote.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_quote_highlighted.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_quote_highlighted.png
deleted file mode 100644
index 9204e2a8d79b..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_quote_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_strikethrough.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_strikethrough.png
deleted file mode 100644
index d907aefcad5f..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_strikethrough.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_strikethrough_highlighted.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_strikethrough_highlighted.png
deleted file mode 100644
index d261f9ececd3..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_strikethrough_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_underline.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_underline.png
deleted file mode 100644
index c5c02b463e61..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_underline.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/icon_format_underline_highlighted.png b/WordPress/src/main/res/drawable-xhdpi/icon_format_underline_highlighted.png
deleted file mode 100644
index 20709b6cee1c..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/icon_format_underline_highlighted.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/list_focused_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/list_focused_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/menu_dropdown_panel_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/menu_dropdown_panel_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/menu_hardkey_panel_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/menu_hardkey_panel_wordpress.9.png
deleted file mode 100644
index af92fba2bad5..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/menu_hardkey_panel_wordpress.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/moderate_approve.png b/WordPress/src/main/res/drawable-xhdpi/moderate_approve.png
deleted file mode 100644
index 875b6ab11e45..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/moderate_approve.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/moderate_spam.png b/WordPress/src/main/res/drawable-xhdpi/moderate_spam.png
deleted file mode 100644
index 8e17bbba7521..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/moderate_spam.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/moderate_trash.png b/WordPress/src/main/res/drawable-xhdpi/moderate_trash.png
deleted file mode 100644
index b0dba043c859..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/moderate_trash.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/moderate_unapprove.png b/WordPress/src/main/res/drawable-xhdpi/moderate_unapprove.png
deleted file mode 100644
index dc302526d565..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/moderate_unapprove.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/noticon_alert_big.png b/WordPress/src/main/res/drawable-xhdpi/noticon_alert_big.png
new file mode 100644
index 000000000000..fca4089aae36
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/noticon_alert_big.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/noticon_notification.png b/WordPress/src/main/res/drawable-xhdpi/noticon_notification.png
new file mode 100644
index 000000000000..ed021b069bc6
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/noticon_notification.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/noticon_notification_black.png b/WordPress/src/main/res/drawable-xhdpi/noticon_notification_black.png
new file mode 100644
index 000000000000..aea0641753f5
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/noticon_notification_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/noticon_picture.png b/WordPress/src/main/res/drawable-xhdpi/noticon_picture.png
new file mode 100644
index 000000000000..95bffba31aa1
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/noticon_picture.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/noticon_picture_grey.png b/WordPress/src/main/res/drawable-xhdpi/noticon_picture_grey.png
new file mode 100644
index 000000000000..d6aeb0e3db8a
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/noticon_picture_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/noticon_reader_alt_black.png b/WordPress/src/main/res/drawable-xhdpi/noticon_reader_alt_black.png
new file mode 100644
index 000000000000..b54a9725088a
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/noticon_reader_alt_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/noticon_show_black.png b/WordPress/src/main/res/drawable-xhdpi/noticon_show_black.png
new file mode 100644
index 000000000000..52e98bd1052a
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/noticon_show_black.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/noticon_star_active.png b/WordPress/src/main/res/drawable-xhdpi/noticon_star_active.png
new file mode 100644
index 000000000000..bda29117c8b4
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/noticon_star_active.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/noticon_star_unactive.png b/WordPress/src/main/res/drawable-xhdpi/noticon_star_unactive.png
new file mode 100644
index 000000000000..6ce558e06659
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/noticon_star_unactive.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/noticon_warning_big_grey.png b/WordPress/src/main/res/drawable-xhdpi/noticon_warning_big_grey.png
new file mode 100644
index 000000000000..9503dd930731
Binary files /dev/null and b/WordPress/src/main/res/drawable-xhdpi/noticon_warning_big_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/notification_icon.png b/WordPress/src/main/res/drawable-xhdpi/notification_icon.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/notification_multi.png b/WordPress/src/main/res/drawable-xhdpi/notification_multi.png
deleted file mode 100644
index 8357482d2121..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/notification_multi.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/nux_icon_alert.png b/WordPress/src/main/res/drawable-xhdpi/nux_icon_alert.png
deleted file mode 100644
index 1e013f0424d2..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/nux_icon_alert.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/progress_bg_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/progress_bg_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/progress_primary_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/progress_primary_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/progress_secondary_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/progress_secondary_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/spinner_ab_default_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/spinner_ab_default_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/spinner_ab_disabled_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/spinner_ab_disabled_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/spinner_ab_focused_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/spinner_ab_focused_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/spinner_ab_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/spinner_ab_pressed_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/stats_chevron_up.png b/WordPress/src/main/res/drawable-xhdpi/stats_chevron_up.png
deleted file mode 100644
index fbbaf91ce691..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/stats_chevron_up.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/tab_icon_checkmark.png b/WordPress/src/main/res/drawable-xhdpi/tab_icon_checkmark.png
deleted file mode 100644
index b52dc37012a3..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/tab_icon_checkmark.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/tab_icon_trash.png b/WordPress/src/main/res/drawable-xhdpi/tab_icon_trash.png
deleted file mode 100644
index 412b33354138..000000000000
Binary files a/WordPress/src/main/res/drawable-xhdpi/tab_icon_trash.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/tab_selected_focused_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/tab_selected_focused_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/tab_selected_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/tab_selected_pressed_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/tab_selected_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/tab_selected_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/tab_unselected_focused_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/tab_unselected_focused_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xhdpi/tab_unselected_pressed_wordpress.9.png b/WordPress/src/main/res/drawable-xhdpi/tab_unselected_pressed_wordpress.9.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashboard_icon_media.png b/WordPress/src/main/res/drawable-xxhdpi/dashboard_icon_media.png
deleted file mode 100644
index eee1202f8869..000000000000
Binary files a/WordPress/src/main/res/drawable-xxhdpi/dashboard_icon_media.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_comments_black.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_comments_black.png
new file mode 100644
index 000000000000..66d0f149d62b
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_comments_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_links.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_links.png
new file mode 100644
index 000000000000..724dea05eb13
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_links.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_links_grey.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_links_grey.png
new file mode 100644
index 000000000000..a6746556ac5d
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_links_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_media_black.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_media_black.png
new file mode 100644
index 000000000000..dcbcefba5be6
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_media_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_page_black.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_page_black.png
new file mode 100644
index 000000000000..d106d1f6c91b
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_page_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_post_black.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_post_black.png
new file mode 100644
index 000000000000..6d23d75253c5
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_admin_post_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_camera_black.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_camera_black.png
new file mode 100644
index 000000000000..b092ff44179a
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_camera_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_chart_area_black.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_chart_area_black.png
new file mode 100644
index 000000000000..161b67cf4f80
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_chart_area_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_bold.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_bold.png
new file mode 100644
index 000000000000..2fc4e42a1627
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_bold.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_bold_grey.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_bold_grey.png
new file mode 100644
index 000000000000..0a48139a0e91
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_bold_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_insertmore.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_insertmore.png
new file mode 100644
index 000000000000..05437d16b3cf
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_insertmore.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_insertmore_grey.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_insertmore_grey.png
new file mode 100644
index 000000000000..91541b529d45
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_insertmore_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_italic.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_italic.png
new file mode 100644
index 000000000000..f1d118b74801
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_italic.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_italic_grey.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_italic_grey.png
new file mode 100644
index 000000000000..3a684e978f86
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_italic_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_strikethrough.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_strikethrough.png
new file mode 100644
index 000000000000..35d6579b5abb
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_strikethrough.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_strikethrough_grey.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_strikethrough_grey.png
new file mode 100644
index 000000000000..2e9e30f5c13d
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_strikethrough_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_underline.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_underline.png
new file mode 100644
index 000000000000..fb8558945cf2
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_underline.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_underline_grey.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_underline_grey.png
new file mode 100644
index 000000000000..9f1b612d640b
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_editor_underline_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_external_black.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_external_black.png
new file mode 100644
index 000000000000..fb2b00b1fe32
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_external_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_eye_closed.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_eye_closed.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_eye_open.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_eye_open.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_format_image_big_grey.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_format_image_big_grey.png
new file mode 100644
index 000000000000..3a608ed32587
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_format_image_big_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_format_quote.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_format_quote.png
new file mode 100644
index 000000000000..daa89ba17ad7
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_format_quote.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_format_quote_grey.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_format_quote_grey.png
new file mode 100644
index 000000000000..240493fb3496
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_format_quote_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_info.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_info.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_video_alt2_black.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_video_alt2_black.png
new file mode 100644
index 000000000000..dc81b469d870
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_video_alt2_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/dashicon_wordpress_alt.png b/WordPress/src/main/res/drawable-xxhdpi/dashicon_wordpress_alt.png
new file mode 100644
index 000000000000..2a799d4c62a2
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/dashicon_wordpress_alt.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/gravatar_placeholder.png b/WordPress/src/main/res/drawable-xxhdpi/gravatar_placeholder.png
new file mode 100644
index 000000000000..520d49d06c04
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/gravatar_placeholder.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_action_accept.png b/WordPress/src/main/res/drawable-xxhdpi/ic_action_accept.png
new file mode 100644
index 000000000000..68c41deccb55
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/ic_action_accept.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_action_discard.png b/WordPress/src/main/res/drawable-xxhdpi/ic_action_discard.png
new file mode 100644
index 000000000000..cb1260a4c68d
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/ic_action_discard.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_action_new.png b/WordPress/src/main/res/drawable-xxhdpi/ic_action_new.png
new file mode 100644
index 000000000000..c42c2bfb58ae
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/ic_action_new.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/WordPress/src/main/res/drawable-xxhdpi/ic_action_refresh.png
new file mode 100644
index 000000000000..44ee117ee915
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/ic_action_refresh.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_action_save.png b/WordPress/src/main/res/drawable-xxhdpi/ic_action_save.png
new file mode 100644
index 000000000000..ccf8c82cd562
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/ic_action_save.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_action_search.png b/WordPress/src/main/res/drawable-xxhdpi/ic_action_search.png
new file mode 100644
index 000000000000..a10863887e44
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/ic_action_search.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_action_send_now.png b/WordPress/src/main/res/drawable-xxhdpi/ic_action_send_now.png
new file mode 100644
index 000000000000..793f2cb27cb0
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/ic_action_send_now.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_action_send_now_dark.png b/WordPress/src/main/res/drawable-xxhdpi/ic_action_send_now_dark.png
new file mode 100644
index 000000000000..373dde239e0e
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/ic_action_send_now_dark.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_action_share.png b/WordPress/src/main/res/drawable-xxhdpi/ic_action_share.png
new file mode 100644
index 000000000000..22ed428fc3d9
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/ic_action_share.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_action_web_site.png b/WordPress/src/main/res/drawable-xxhdpi/ic_action_web_site.png
new file mode 100644
index 000000000000..e24eed7584a9
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/ic_action_web_site.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_cab_like.png b/WordPress/src/main/res/drawable-xxhdpi/ic_cab_like.png
deleted file mode 100644
index 54a95505cff8..000000000000
Binary files a/WordPress/src/main/res/drawable-xxhdpi/ic_cab_like.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_cab_like_active.png b/WordPress/src/main/res/drawable-xxhdpi/ic_cab_like_active.png
deleted file mode 100644
index dfabbf437633..000000000000
Binary files a/WordPress/src/main/res/drawable-xxhdpi/ic_cab_like_active.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_cab_trash.png b/WordPress/src/main/res/drawable-xxhdpi/ic_cab_trash.png
deleted file mode 100644
index 8f27b7153514..000000000000
Binary files a/WordPress/src/main/res/drawable-xxhdpi/ic_cab_trash.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_navigate_next.png b/WordPress/src/main/res/drawable-xxhdpi/ic_navigate_next.png
deleted file mode 100644
index 51479d8ddfde..000000000000
Binary files a/WordPress/src/main/res/drawable-xxhdpi/ic_navigate_next.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_navigate_previous.png b/WordPress/src/main/res/drawable-xxhdpi/ic_navigate_previous.png
deleted file mode 100644
index bc8ff1241ade..000000000000
Binary files a/WordPress/src/main/res/drawable-xxhdpi/ic_navigate_previous.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-ldpi/button_darkgray.9.png b/WordPress/src/main/res/drawable-xxhdpi/ic_navigation_drawer.png
similarity index 92%
rename from WordPress/src/main/res/drawable-ldpi/button_darkgray.9.png
rename to WordPress/src/main/res/drawable-xxhdpi/ic_navigation_drawer.png
index afac1e39bd9a..f60c55f454c6 100644
Binary files a/WordPress/src/main/res/drawable-ldpi/button_darkgray.9.png and b/WordPress/src/main/res/drawable-xxhdpi/ic_navigation_drawer.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/ic_share.png b/WordPress/src/main/res/drawable-xxhdpi/ic_share.png
deleted file mode 100644
index 0630d3174f7d..000000000000
Binary files a/WordPress/src/main/res/drawable-xxhdpi/ic_share.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/noticon_alert_big.png b/WordPress/src/main/res/drawable-xxhdpi/noticon_alert_big.png
new file mode 100644
index 000000000000..10d6ff7aa681
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/noticon_alert_big.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/noticon_notification.png b/WordPress/src/main/res/drawable-xxhdpi/noticon_notification.png
new file mode 100644
index 000000000000..2562af982da8
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/noticon_notification.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/noticon_notification_black.png b/WordPress/src/main/res/drawable-xxhdpi/noticon_notification_black.png
new file mode 100644
index 000000000000..23398061a9fe
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/noticon_notification_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/noticon_picture.png b/WordPress/src/main/res/drawable-xxhdpi/noticon_picture.png
new file mode 100644
index 000000000000..a132b6da37b6
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/noticon_picture.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/noticon_picture_grey.png b/WordPress/src/main/res/drawable-xxhdpi/noticon_picture_grey.png
new file mode 100644
index 000000000000..7b8ff960825a
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/noticon_picture_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/noticon_reader_alt_black.png b/WordPress/src/main/res/drawable-xxhdpi/noticon_reader_alt_black.png
new file mode 100644
index 000000000000..44d0bc5e4edc
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/noticon_reader_alt_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/noticon_show_black.png b/WordPress/src/main/res/drawable-xxhdpi/noticon_show_black.png
new file mode 100644
index 000000000000..ba52918bd7e9
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/noticon_show_black.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/noticon_star_active.png b/WordPress/src/main/res/drawable-xxhdpi/noticon_star_active.png
new file mode 100644
index 000000000000..1fcf29dba080
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/noticon_star_active.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/noticon_star_unactive.png b/WordPress/src/main/res/drawable-xxhdpi/noticon_star_unactive.png
new file mode 100644
index 000000000000..6231542dfde8
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/noticon_star_unactive.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/noticon_warning_big_grey.png b/WordPress/src/main/res/drawable-xxhdpi/noticon_warning_big_grey.png
new file mode 100644
index 000000000000..a4ecc0636522
Binary files /dev/null and b/WordPress/src/main/res/drawable-xxhdpi/noticon_warning_big_grey.png differ
diff --git a/WordPress/src/main/res/drawable-xxhdpi/notification_icon.png b/WordPress/src/main/res/drawable-xxhdpi/notification_icon.png
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable-xxhdpi/stats_chevron_up.png b/WordPress/src/main/res/drawable-xxhdpi/stats_chevron_up.png
deleted file mode 100644
index c1d67a4fff86..000000000000
Binary files a/WordPress/src/main/res/drawable-xxhdpi/stats_chevron_up.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xxxhdpi/ic_action_tag.png b/WordPress/src/main/res/drawable-xxxhdpi/ic_action_tag.png
deleted file mode 100644
index 5a2fc0da12fc..000000000000
Binary files a/WordPress/src/main/res/drawable-xxxhdpi/ic_action_tag.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xxxhdpi/ic_action_tag_dark.png b/WordPress/src/main/res/drawable-xxxhdpi/ic_action_tag_dark.png
deleted file mode 100644
index 27adaa7c8afd..000000000000
Binary files a/WordPress/src/main/res/drawable-xxxhdpi/ic_action_tag_dark.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable-xxxhdpi/notification_icon.png b/WordPress/src/main/res/drawable-xxxhdpi/notification_icon.png
deleted file mode 100755
index 009fa95b3f08..000000000000
Binary files a/WordPress/src/main/res/drawable-xxxhdpi/notification_icon.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable/btn_cab_done_wordpress.xml b/WordPress/src/main/res/drawable/btn_cab_done_wordpress.xml
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable/follow_indicator.xml b/WordPress/src/main/res/drawable/follow_indicator.xml
deleted file mode 100644
index 0aa877003b48..000000000000
--- a/WordPress/src/main/res/drawable/follow_indicator.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:state_selected="true"
-    android:drawable="@drawable/follow_minus" />
-  <item
-    android:state_selected="false"
-    android:drawable="@drawable/follow_plus" />
-</selector>
diff --git a/WordPress/src/main/res/drawable/format_bar_button_bold_selected_state.xml b/WordPress/src/main/res/drawable/format_bar_button_bold_selected_state.xml
index 6b8c25e29e81..0e7309e4fb3a 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_bold_selected_state.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_bold_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid" />
+            <solid android:color="@color/blue_new_kid"/>
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/icon_format_bold_highlighted" />
+        <bitmap android:src="@drawable/dashicon_editor_bold" android:gravity="center"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_bold_selector.xml b/WordPress/src/main/res/drawable/format_bar_button_bold_selector.xml
index 024d67db52c2..905d41c187f2 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_bold_selector.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_bold_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_bold_selected_state"></item>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_bold_selected_state"></item>
-    <item android:drawable="@drawable/icon_format_bold"></item>
-
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_bold_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_bold_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/dashicon_editor_bold_grey" android:gravity="center"/>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_italic_selected_state.xml b/WordPress/src/main/res/drawable/format_bar_button_italic_selected_state.xml
index e6537d578586..b01b18738d8d 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_italic_selected_state.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_italic_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid" />
+            <solid android:color="@color/blue_new_kid"/>
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/icon_format_italic_highlighted" />
+        <bitmap android:src="@drawable/dashicon_editor_italic" android:gravity="center"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_italic_selector.xml b/WordPress/src/main/res/drawable/format_bar_button_italic_selector.xml
index 5ebf54c59afc..2b8cb68bcfd0 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_italic_selector.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_italic_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_italic_selected_state"></item>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_italic_selected_state"></item>
-    <item android:drawable="@drawable/icon_format_italic"></item>
-
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_italic_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_italic_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/dashicon_editor_italic_grey" android:gravity="center"/>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_link_selected_state.xml b/WordPress/src/main/res/drawable/format_bar_button_link_selected_state.xml
index db0c1da46d08..aa147f669e6e 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_link_selected_state.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_link_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid" />
+            <solid android:color="@color/blue_new_kid"/>
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/icon_format_link_highlighted" />
+        <bitmap android:src="@drawable/dashicon_admin_links" android:gravity="center"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_link_selector.xml b/WordPress/src/main/res/drawable/format_bar_button_link_selector.xml
index 5a7ac8f18f28..736f212f1076 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_link_selector.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_link_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_link_selected_state"></item>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_link_selected_state"></item>
-    <item android:drawable="@drawable/icon_format_link"></item>
-
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_link_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_link_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/dashicon_admin_links_grey" android:gravity="center"/>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_media_selected_state.xml b/WordPress/src/main/res/drawable/format_bar_button_media_selected_state.xml
index 3c8415156089..5041c00f77ba 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_media_selected_state.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_media_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid" />
+            <solid android:color="@color/blue_new_kid"/>
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/icon_format_media_highlighted" />
+        <bitmap android:src="@drawable/noticon_picture" android:gravity="center"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_media_selector.xml b/WordPress/src/main/res/drawable/format_bar_button_media_selector.xml
index f9abfc0cebee..7c2f5bb64ab5 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_media_selector.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_media_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_media_selected_state"></item>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_media_selected_state"></item>
-    <item android:drawable="@drawable/icon_format_media"></item>
-
-</selector>
\ No newline at end of file
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_media_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_media_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/noticon_picture_grey" android:gravity="center"/>
+    </item>
+</selector>
diff --git a/WordPress/src/main/res/drawable/format_bar_button_more_selected_state.xml b/WordPress/src/main/res/drawable/format_bar_button_more_selected_state.xml
index dbd92a80ad83..9ff1e9f3480d 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_more_selected_state.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_more_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid" />
+            <solid android:color="@color/blue_new_kid"/>
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/icon_format_more_highlighted" />
+        <bitmap android:src="@drawable/dashicon_editor_insertmore" android:gravity="center"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_more_selector.xml b/WordPress/src/main/res/drawable/format_bar_button_more_selector.xml
index 6acf70730043..412de63a4799 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_more_selector.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_more_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_more_selected_state"></item>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_more_selected_state"></item>
-    <item android:drawable="@drawable/icon_format_more"></item>
-
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_more_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_more_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/dashicon_editor_insertmore_grey" android:gravity="center"/>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_quote_selected_state.xml b/WordPress/src/main/res/drawable/format_bar_button_quote_selected_state.xml
index b51add092418..d145faf7882d 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_quote_selected_state.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_quote_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid" />
+            <solid android:color="@color/blue_new_kid"/>
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/icon_format_quote_highlighted" />
+        <bitmap android:src="@drawable/dashicon_format_quote" android:gravity="center"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_quote_selector.xml b/WordPress/src/main/res/drawable/format_bar_button_quote_selector.xml
index 20929826121f..4de783f1a1ab 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_quote_selector.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_quote_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_quote_selected_state"></item>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_quote_selected_state"></item>
-    <item android:drawable="@drawable/icon_format_quote"></item>
-
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_quote_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_quote_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/dashicon_format_quote_grey" android:gravity="center"/>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_strike_selected_state.xml b/WordPress/src/main/res/drawable/format_bar_button_strike_selected_state.xml
index a1ec3ab1e0aa..d00af024af89 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_strike_selected_state.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_strike_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid" />
+            <solid android:color="@color/blue_new_kid"/>
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/icon_format_strikethrough_highlighted" />
+        <bitmap android:src="@drawable/dashicon_editor_strikethrough" android:gravity="center"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_strike_selector.xml b/WordPress/src/main/res/drawable/format_bar_button_strike_selector.xml
index a912f602f518..9d00180ad04c 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_strike_selector.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_strike_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_strike_selected_state"></item>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_strike_selected_state"></item>
-    <item android:drawable="@drawable/icon_format_strikethrough"></item>
-
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_strike_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_strike_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/dashicon_editor_strikethrough_grey" android:gravity="center"/>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_underline_selected_state.xml b/WordPress/src/main/res/drawable/format_bar_button_underline_selected_state.xml
index f106778d7ffe..be0b25dd1e58 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_underline_selected_state.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_underline_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_new_kid" />
+            <solid android:color="@color/blue_new_kid"/>
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/icon_format_underline_highlighted" />
+        <bitmap android:src="@drawable/dashicon_editor_underline" android:gravity="center"/>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/format_bar_button_underline_selector.xml b/WordPress/src/main/res/drawable/format_bar_button_underline_selector.xml
index d932497c852a..8f42668e2346 100644
--- a/WordPress/src/main/res/drawable/format_bar_button_underline_selector.xml
+++ b/WordPress/src/main/res/drawable/format_bar_button_underline_selector.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_underline_selected_state"></item>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_underline_selected_state"></item>
-    <item android:drawable="@drawable/icon_format_underline"></item>
-
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_underline_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_underline_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/dashicon_editor_underline_grey" android:gravity="center"/>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/menu_button_bg.9.png b/WordPress/src/main/res/drawable/menu_button_bg.9.png
deleted file mode 100644
index ef401d81bace..000000000000
Binary files a/WordPress/src/main/res/drawable/menu_button_bg.9.png and /dev/null differ
diff --git a/WordPress/src/main/res/drawable/menu_button_selector.xml b/WordPress/src/main/res/drawable/menu_button_selector.xml
deleted file mode 100644
index 47426cd73701..000000000000
--- a/WordPress/src/main/res/drawable/menu_button_selector.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:state_selected="true"
-    android:drawable="@drawable/menu_button_bg" />
-  <item
-    android:state_pressed="true"
-    android:state_selected="false"
-    android:drawable="@drawable/menu_button_bg" />
-  <item
-    android:state_selected="false"
-    android:drawable="@android:color/transparent" />
-</selector>
diff --git a/WordPress/src/main/res/drawable/pressed_background_wordpress.xml b/WordPress/src/main/res/drawable/pressed_background_wordpress.xml
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable/progress_horizontal_wordpress.xml b/WordPress/src/main/res/drawable/progress_horizontal_wordpress.xml
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable/progressbar_horizontal.xml b/WordPress/src/main/res/drawable/progressbar_horizontal.xml
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable/reader_button_comment_like.xml b/WordPress/src/main/res/drawable/reader_button_comment_like.xml
index 61f5b6fb874a..9bca9c8a8075 100644
--- a/WordPress/src/main/res/drawable/reader_button_comment_like.xml
+++ b/WordPress/src/main/res/drawable/reader_button_comment_like.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/ic_comment_like_active" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_comment_like_active" android:state_selected="true"/>
-    <item android:drawable="@drawable/ic_comment_like"/>
-
+    <item android:drawable="@drawable/noticon_star_active" android:state_pressed="true"/>
+    <item android:drawable="@drawable/noticon_star_active" android:state_selected="true"/>
+    <item android:drawable="@drawable/noticon_star_unactive"/>
 </selector>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/reader_edittext_frame.xml b/WordPress/src/main/res/drawable/reader_edittext_frame.xml
deleted file mode 100644
index 264b2b4d128b..000000000000
--- a/WordPress/src/main/res/drawable/reader_edittext_frame.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- border (background) for EditTexts such as the comment editor on the reblog activity -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/grey_light" />
-    <solid android:color="@android:color/white" />
-    <corners android:radius="2dp" />
-
-</shape>
\ No newline at end of file
diff --git a/WordPress/src/main/res/drawable/reply_row_background.xml b/WordPress/src/main/res/drawable/reply_row_background.xml
deleted file mode 100644
index 07b57c25abe6..000000000000
--- a/WordPress/src/main/res/drawable/reply_row_background.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:state_pressed="true"
-    android:drawable="@color/wordpress_blue" />
-  <item
-    android:drawable="@color/gray" />
-</selector>
diff --git a/WordPress/src/main/res/drawable/reply_row_textcolor.xml b/WordPress/src/main/res/drawable/reply_row_textcolor.xml
deleted file mode 100644
index 473482d457d9..000000000000
--- a/WordPress/src/main/res/drawable/reply_row_textcolor.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:state_pressed="true"
-    android:color="@android:color/white" />
-  <item
-    android:color="@android:color/primary_text_light" />
-</selector>
diff --git a/WordPress/src/main/res/drawable/selectable_background_wordpress.xml b/WordPress/src/main/res/drawable/selectable_background_wordpress.xml
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable/spinner_background_ab_wordpress.xml b/WordPress/src/main/res/drawable/spinner_background_ab_wordpress.xml
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable/tab_indicator_ab_wordpress.xml b/WordPress/src/main/res/drawable/tab_indicator_ab_wordpress.xml
old mode 100755
new mode 100644
diff --git a/WordPress/src/main/res/drawable/throbber.xml b/WordPress/src/main/res/drawable/throbber.xml
deleted file mode 100644
index 6753f3a6204f..000000000000
--- a/WordPress/src/main/res/drawable/throbber.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:pivotX="50%"
-  android:pivotY="50%"
-  android:fromDegrees="0"
-  android:toDegrees="360" >
-  <shape
-    android:shape="ring"
-    android:innerRadiusRatio="3"
-    android:thicknessRatio="8"
-    android:useLevel="false" >
-    <size
-      android:width="18dip"
-      android:height="18dip" />
-      <gradient
-        android:type="sweep"
-        android:useLevel="false"
-        android:centerY="0.5"
-        android:startColor="#CCC"
-        android:centerColor="#AAA"
-        android:endColor="#999" />
-  <!-- <rotate xmlns:android="http://schemas.android.com/apk/res/android"
-      android:pivotX="50%" android:pivotY="50%" android:fromDegrees="0"
-      android:toDegrees="360">
-
-      <shape android:shape="ring" android:innerRadiusRatio="3"
-          android:thicknessRatio="8" android:useLevel="false">
-
-          <size android:width="48dip" android:height="48dip" />
-
-          <gradient android:type="sweep" android:useLevel="false"
-              android:startColor="#4c737373" android:centerColor="#4c737373"
-              android:centerY="0.50" android:endColor="#ffffd300" />
-
-      </shape>
-
-  </rotate> -->
-  </shape>
-</rotate>
diff --git a/WordPress/src/main/res/drawable/wp_button_small.xml b/WordPress/src/main/res/drawable/wp_button_small.xml
deleted file mode 100644
index 7847495710a7..000000000000
--- a/WordPress/src/main/res/drawable/wp_button_small.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  <item
-    android:state_window_focused="false"
-    android:state_enabled="true"
-    android:drawable="@drawable/wp_small" />
-  <item
-    android:state_pressed="true"
-    android:drawable="@drawable/wp_small_down" />
-  <item
-    android:state_focused="true"
-    android:state_enabled="true"
-    android:drawable="@drawable/wp_small_over" />
-  <item
-    android:state_enabled="true"
-    android:drawable="@drawable/wp_small" />
-</selector>
-
-
-
diff --git a/WordPress/src/main/res/layout/about.xml b/WordPress/src/main/res/layout/about.xml
index a6b113cd9f1e..06a0ed3de4df 100644
--- a/WordPress/src/main/res/layout/about.xml
+++ b/WordPress/src/main/res/layout/about.xml
@@ -1,89 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" 
-    android:background="#F4F4F4">
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/main_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/nux_background"
+            android:fillViewport="true">
 
-    <LinearLayout
-        android:id="@+id/about"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical" >
+    <org.wordpress.android.widgets.WPLinearLayoutSizeBound
+        app:maxWidth="@dimen/nux_width"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center">
 
-        <ImageView
-            android:id="@+id/about_wp_logo"
-            android:layout_width="130dp"
-            android:layout_height="130dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="10dp"
-            android:scaleType="centerInside"
-            android:src="@drawable/new_account_logo" />
-
-        <TextView
-            android:id="@+id/about_first_line"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:shadowColor="#FFFFFF"
-            android:shadowDx="0"
-            android:shadowDy="1"
-            android:shadowRadius="1"
-            android:text="@string/app_title"
-            android:textSize="25sp" />
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:orientation="vertical"
+            android:gravity="center">
 
-        <TextView
-            android:id="@+id/about_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/version"
-            android:textSize="18sp" />
+            <ImageView
+                android:id="@+id/nux_fragment_icon"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:src="@drawable/nux_icon_wp"
+                android:layout_marginTop="@dimen/margin_medium"/>
 
-        <TextView
-            android:id="@+id/about_second_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="30dp"
-            android:text="@string/publisher"
-            android:textSize="18sp" />
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/WordPress.NUXTitle"
+                android:id="@+id/about_first_line"
+                android:text="@string/app_title"
+                app:fontVariation="light"
+                android:layout_marginTop="@dimen/margin_extra_large"
+                android:layout_marginBottom="@dimen/margin_small"/>
 
-        <TextView
-            android:id="@+id/about_third_line"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/copyright"
-            android:textSize="18sp" />
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/WordPress.NUXGreyButtonNoBg"
+                android:id="@+id/about_version"
+                android:text="@string/version"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
 
-        <Button
-            android:id="@+id/about_tos"
-            android:layout_width="220dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="30dp"
-            android:text="@string/tos"
-            android:textSize="18sp" />
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/WordPress.NUXGreyButtonNoBg"
+                android:id="@+id/about_second_line"
+                android:text="@string/publisher"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_extra_large"/>
 
-        <Button
-            android:id="@+id/about_privacy"
-            android:layout_width="220dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/privacy_policy"
-            android:textSize="18sp" />
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/WordPress.NUXGreyButtonNoBg"
+                android:id="@+id/about_third_line"
+                android:text="@string/copyright"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
 
-        <TextView
-            android:id="@+id/about_url"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="30dp"
-            android:clickable="true"
-            android:onClick="onClick"
-            android:text="automattic.com"
-            android:textSize="18sp" />
-    </LinearLayout>
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/WordPress.NUXPrimaryButton"
+                android:id="@+id/about_privacy"
+                android:text="@string/privacy_policy"
+                android:layout_width="match_parent"
+                android:gravity="center"
+                android:layout_marginTop="@dimen/margin_medium"/>
+
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/WordPress.NUXPrimaryButton"
+                android:id="@+id/about_tos"
+                android:text="@string/tos"
+                android:layout_width="match_parent"
+                android:gravity="center"/>
+
+            <org.wordpress.android.widgets.WPTextView
+                style="@style/WordPress.NUXGreyButtonNoBg"
+                android:id="@+id/about_url"
+                android:text="automattic.com"
+                android:clickable="true"
+                android:onClick="onClick"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_medium"
+                android:layout_marginBottom="@dimen/margin_medium"/>
+        </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+    </org.wordpress.android.widgets.WPLinearLayoutSizeBound>
+</ScrollView>
diff --git a/WordPress/src/main/res/layout/blog_preferences.xml b/WordPress/src/main/res/layout/blog_preferences.xml
index 69b9579d1072..60f7e129aa8f 100644
--- a/WordPress/src/main/res/layout/blog_preferences.xml
+++ b/WordPress/src/main/res/layout/blog_preferences.xml
@@ -150,7 +150,7 @@
                     android:layout_below="@id/l_section4"
                     android:layout_marginTop="4dp"
                     android:text="@string/view_admin"
-                    android:drawableRight="@drawable/dashboard_icon_wp"
+                    android:drawableRight="@drawable/dashicon_external_black"
                     android:onClick="viewAdmin"
                     />
 
diff --git a/WordPress/src/main/res/layout/comment_listitem.xml b/WordPress/src/main/res/layout/comment_listitem.xml
index f8c52728dbca..80075f9e1879 100644
--- a/WordPress/src/main/res/layout/comment_listitem.xml
+++ b/WordPress/src/main/res/layout/comment_listitem.xml
@@ -29,7 +29,7 @@
                 android:layout_height="@dimen/avatar_sz_medium"
                 android:background="@color/blue_medium"
                 android:padding="@dimen/margin_medium"
-                android:src="@drawable/tab_icon_checkmark"
+                android:src="@drawable/ic_action_accept"
                 android:visibility="gone" />
 
             <LinearLayout
diff --git a/WordPress/src/main/res/layout/menu_drawer_row.xml b/WordPress/src/main/res/layout/menu_drawer_row.xml
index 9b39412216df..bc99cba221ad 100644
--- a/WordPress/src/main/res/layout/menu_drawer_row.xml
+++ b/WordPress/src/main/res/layout/menu_drawer_row.xml
@@ -15,7 +15,7 @@
         android:clickable="false"
         android:contentDescription="@string/posts"
         android:scaleType="centerInside"
-        android:src="@drawable/dashboard_icon_posts"
+        android:src="@drawable/dashicon_admin_post_black"
         android:tint="@color/md__iconTintColor" />
 
     <org.wordpress.android.widgets.WPTextView
diff --git a/WordPress/src/main/res/layout/menu_refresh_view.xml b/WordPress/src/main/res/layout/menu_refresh_view.xml
index 095bd1601849..f1497c2beccc 100644
--- a/WordPress/src/main/res/layout/menu_refresh_view.xml
+++ b/WordPress/src/main/res/layout/menu_refresh_view.xml
@@ -2,7 +2,7 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:src="@drawable/ab_icon_refresh"
+    android:src="@drawable/ic_action_refresh"
     android:gravity="center"
     android:paddingLeft="@dimen/refresh_icon_padding"
     android:paddingRight="@dimen/refresh_icon_padding"
diff --git a/WordPress/src/main/res/layout/reader_include_comment_box.xml b/WordPress/src/main/res/layout/reader_include_comment_box.xml
index 1c98a734254e..95b3a1a907a1 100644
--- a/WordPress/src/main/res/layout/reader_include_comment_box.xml
+++ b/WordPress/src/main/res/layout/reader_include_comment_box.xml
@@ -43,7 +43,7 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:paddingRight="@dimen/margin_medium"
-        android:src="@drawable/ab_icon_send" />
+        android:src="@drawable/ic_action_send_now_dark" />
 
     <ProgressBar
         android:id="@+id/progress_submit_comment"
diff --git a/WordPress/src/main/res/layout/viewpost.xml b/WordPress/src/main/res/layout/viewpost.xml
index 705e47019c13..68c2284f1017 100644
--- a/WordPress/src/main/res/layout/viewpost.xml
+++ b/WordPress/src/main/res/layout/viewpost.xml
@@ -80,7 +80,7 @@
             android:scaleType="fitCenter"
             android:padding="9dp"
             android:tint="@color/post_detail_icon_tint"
-            android:src="@drawable/ic_cab_trash"
+            android:src="@drawable/ic_action_discard"
             android:contentDescription="@string/delete_post" />
 
         <LinearLayout
@@ -108,7 +108,7 @@
                 android:scaleType="fitCenter"
                 android:padding="10dp"
                 android:tint="@color/post_detail_icon_tint"
-                android:src="@drawable/ab_icon_share"
+                android:src="@drawable/ic_action_share"
                 android:contentDescription="@string/share_url" />
 
             <ImageButton
@@ -118,9 +118,9 @@
                 android:background="@drawable/selectable_background_wordpress"
                 android:scaleType="fitCenter"
                 android:padding="9dp"
-                android:src="@drawable/dashboard_icon_comments"
+                android:src="@drawable/dashicon_admin_comments_black"
                 android:contentDescription="@string/add_comment" />
-            
+
             <ImageButton
                 android:id="@+id/editPost"
                 android:layout_width="@dimen/post_detail_button_size"
diff --git a/WordPress/src/main/res/menu/categories.xml b/WordPress/src/main/res/menu/categories.xml
index a3c87984febc..1b575a44a0f7 100644
--- a/WordPress/src/main/res/menu/categories.xml
+++ b/WordPress/src/main/res/menu/categories.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/menu_new_category"
-        android:icon="@drawable/ab_icon_new"
+        android:icon="@drawable/ic_action_new"
         android:showAsAction="ifRoom"
         android:title="@string/new_post"/>
     <item
diff --git a/WordPress/src/main/res/menu/dashboard.xml b/WordPress/src/main/res/menu/dashboard.xml
index f943bb5cb412..d39caa6c839d 100644
--- a/WordPress/src/main/res/menu/dashboard.xml
+++ b/WordPress/src/main/res/menu/dashboard.xml
@@ -3,12 +3,12 @@
 
     <item
         android:id="@+id/menu_browser"
-        android:icon="@drawable/ab_icon_web"
+        android:icon="@drawable/ic_action_web_site"
         android:showAsAction="ifRoom"
         android:title="@string/view_in_browser"/>
     <item
         android:id="@+id/menu_refresh"
-        android:icon="@drawable/ab_icon_refresh"
+        android:icon="@drawable/ic_action_refresh"
         android:showAsAction="never"
         android:title="@string/refresh"/>
 </menu>
\ No newline at end of file
diff --git a/WordPress/src/main/res/menu/edit_comment.xml b/WordPress/src/main/res/menu/edit_comment.xml
index 89a215a76be6..ad262d27b679 100644
--- a/WordPress/src/main/res/menu/edit_comment.xml
+++ b/WordPress/src/main/res/menu/edit_comment.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/menu_save_comment"
-        android:icon="@drawable/ab_icon_send_lite"
+        android:icon="@drawable/ic_action_send_now"
         android:showAsAction="always"
         android:title="@string/upload" />
 </menu>
\ No newline at end of file
diff --git a/WordPress/src/main/res/menu/media.xml b/WordPress/src/main/res/menu/media.xml
index 64eca66a1a30..edaba2a33ed0 100644
--- a/WordPress/src/main/res/menu/media.xml
+++ b/WordPress/src/main/res/menu/media.xml
@@ -3,13 +3,13 @@
 
 	<item
         android:id="@+id/menu_new_media"
-        android:icon="@drawable/ab_icon_new"
+        android:icon="@drawable/ic_action_new"
         android:showAsAction="ifRoom"
         android:title="@string/new_media"/>
     <item
         android:id="@+id/menu_search"
         android:actionViewClass="android.widget.SearchView"
-        android:icon="@drawable/tab_icon_search"
+        android:icon="@drawable/ic_action_search"
         android:showAsAction="ifRoom"
         android:title="@string/menu_search"/>
     <item
diff --git a/WordPress/src/main/res/menu/media_edit.xml b/WordPress/src/main/res/menu/media_edit.xml
index 940234998761..bae5b7653468 100644
--- a/WordPress/src/main/res/menu/media_edit.xml
+++ b/WordPress/src/main/res/menu/media_edit.xml
@@ -3,7 +3,7 @@
 
 	<item
         android:id="@+id/menu_save_media"
-        android:icon="@drawable/ab_icon_save"
+        android:icon="@drawable/ic_action_save"
         android:showAsAction="ifRoom"
         android:title="@string/new_media"/>
 
diff --git a/WordPress/src/main/res/menu/media_gallery.xml b/WordPress/src/main/res/menu/media_gallery.xml
index 3c6304badd84..292ba0ff77ba 100644
--- a/WordPress/src/main/res/menu/media_gallery.xml
+++ b/WordPress/src/main/res/menu/media_gallery.xml
@@ -3,12 +3,12 @@
 
     <item
         android:id="@+id/menu_add_media"
-        android:icon="@drawable/ab_icon_new"
+        android:icon="@drawable/ic_action_new"
         android:showAsAction="always"
         android:title="@string/content_description_add_media"/>
     <item
         android:id="@+id/menu_save"
-        android:icon="@drawable/ab_icon_save"
+        android:icon="@drawable/ic_action_save"
         android:showAsAction="always"
         android:title="@string/save"/>
 
diff --git a/WordPress/src/main/res/menu/media_multiselect.xml b/WordPress/src/main/res/menu/media_multiselect.xml
index d08356a6e7a2..aea6fc4f34d1 100644
--- a/WordPress/src/main/res/menu/media_multiselect.xml
+++ b/WordPress/src/main/res/menu/media_multiselect.xml
@@ -13,7 +13,7 @@
         android:title="@string/new_post"/>
     <item
         android:id="@+id/media_multiselect_actionbar_trash"
-        android:icon="@drawable/tab_icon_trash"
+        android:icon="@drawable/ic_action_discard"
         android:showAsAction="always"
         android:title="@string/delete"/>
 
diff --git a/WordPress/src/main/res/menu/menu_comments_cab.xml b/WordPress/src/main/res/menu/menu_comments_cab.xml
index d2ed99cd954e..6a9c139c0dcd 100644
--- a/WordPress/src/main/res/menu/menu_comments_cab.xml
+++ b/WordPress/src/main/res/menu/menu_comments_cab.xml
@@ -23,7 +23,7 @@
         android:title="@string/mnu_comment_spam" />
     <item
         android:id="@+id/menu_trash"
-        android:icon="@drawable/ic_cab_trash"
+        android:icon="@drawable/ic_action_discard"
         android:showAsAction="ifRoom"
         android:title="@string/mnu_comment_trash" />
 
diff --git a/WordPress/src/main/res/menu/posts.xml b/WordPress/src/main/res/menu/posts.xml
index dc4e6e273c2a..53b81782e765 100644
--- a/WordPress/src/main/res/menu/posts.xml
+++ b/WordPress/src/main/res/menu/posts.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/menu_new_post"
-        android:icon="@drawable/ab_icon_new"
+        android:icon="@drawable/ic_action_new"
         android:showAsAction="ifRoom"
         android:title="@string/new_post"/>
     <item
diff --git a/WordPress/src/main/res/menu/reader_native_detail.xml b/WordPress/src/main/res/menu/reader_native_detail.xml
index fcf9fd5fb4a1..0587abbaead8 100644
--- a/WordPress/src/main/res/menu/reader_native_detail.xml
+++ b/WordPress/src/main/res/menu/reader_native_detail.xml
@@ -3,14 +3,14 @@
 
     <item
         android:id="@+id/menu_browse"
-        android:icon="@drawable/ab_icon_web"
+        android:icon="@drawable/ic_action_web_site"
         android:title="@string/view_in_browser"
         android:showAsAction="always" />
 
     <item
         android:id="@+id/menu_share"
-        android:icon="@drawable/ab_icon_share"
+        android:icon="@drawable/ic_action_share"
         android:title="@string/share_action"
         android:showAsAction="always" />
-    
+
 </menu>
\ No newline at end of file
diff --git a/WordPress/src/main/res/menu/theme.xml b/WordPress/src/main/res/menu/theme.xml
index bca72164ee04..e01922e6b7d0 100644
--- a/WordPress/src/main/res/menu/theme.xml
+++ b/WordPress/src/main/res/menu/theme.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/menu_search"
-        android:icon="@drawable/tab_icon_search"
+        android:icon="@drawable/ic_action_search"
         android:showAsAction="collapseActionView|ifRoom"
         android:title="@string/menu_search"/>
     <item
diff --git a/WordPress/src/main/res/menu/theme_preview.xml b/WordPress/src/main/res/menu/theme_preview.xml
index f34b4c46653d..13db6dc614c7 100644
--- a/WordPress/src/main/res/menu/theme_preview.xml
+++ b/WordPress/src/main/res/menu/theme_preview.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/menu_activate"
-        android:icon="@drawable/tab_icon_checkmark"
+        android:icon="@drawable/ic_action_accept"
         android:showAsAction="always"
         android:title="@string/theme_activate_button"/>
 
diff --git a/WordPress/src/main/res/menu/theme_search.xml b/WordPress/src/main/res/menu/theme_search.xml
index f4b25588b046..29845990cc46 100644
--- a/WordPress/src/main/res/menu/theme_search.xml
+++ b/WordPress/src/main/res/menu/theme_search.xml
@@ -3,7 +3,7 @@
     <item
         android:id="@+id/menu_theme_search"
         android:actionViewClass="android.widget.SearchView"
-        android:icon="@drawable/tab_icon_search"
+        android:icon="@drawable/ic_action_search"
         android:showAsAction="collapseActionView|ifRoom"
         android:title="@string/menu_search"/>
 </menu>
\ No newline at end of file
diff --git a/WordPress/src/main/res/menu/webview.xml b/WordPress/src/main/res/menu/webview.xml
index 1e13a5888815..5193accba650 100644
--- a/WordPress/src/main/res/menu/webview.xml
+++ b/WordPress/src/main/res/menu/webview.xml
@@ -3,17 +3,17 @@
 
     <item
         android:id="@+id/menu_browser"
-        android:icon="@drawable/ab_icon_web"
+        android:icon="@drawable/ic_action_web_site"
         android:showAsAction="ifRoom"
         android:title="@string/view_in_browser"/>
     <item
         android:id="@+id/menu_share"
-        android:icon="@drawable/ab_icon_share"
+        android:icon="@drawable/ic_action_share"
         android:showAsAction="ifRoom"
         android:title="@string/share_link"/>
     <item
         android:id="@+id/menu_refresh"
-        android:icon="@drawable/ab_icon_refresh"
+        android:icon="@drawable/ic_action_refresh"
         android:showAsAction="never"
         android:title="@string/refresh"/>
     <item
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index bf8b325e4a41..c82014674a97 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -27,7 +27,7 @@
     </style>
 
     <style name="ActionBar.Solid.WordPress" parent="android:Widget.Holo.Light.ActionBar.Solid.Inverse">
-        <item name="android:icon">@drawable/ab_icon_wp</item>
+        <item name="android:icon">@drawable/dashicon_wordpress_alt</item>
         <item name="android:background">@color/blue_new_kid</item>
         <item name="android:backgroundStacked">@drawable/ab_stacked_solid_wordpress</item>
         <item name="android:backgroundSplit">@drawable/ab_bottom_solid_wordpress</item>
diff --git a/tools/check-missing-drawables.py b/tools/check-missing-drawables.py
old mode 100644
new mode 100755
index 1f573ad7cd07..a953a4d05096
--- a/tools/check-missing-drawables.py
+++ b/tools/check-missing-drawables.py
@@ -1,10 +1,12 @@
+#!/usr/bin/env python
+
 from collections import defaultdict
 from pprint import pprint
 import os
 import sys
 
 RESDIR="WordPress/src/main/res"
-TO_CHECK = ["-mdpi", "-hdpi", "-xhdpi", "-xxhdpi", ""]
+TO_CHECK = ["-hdpi", "-xhdpi", "-xxhdpi"]
 
 def main():
     if len(sys.argv) == 2:
@@ -21,10 +23,7 @@ def check_drawables(rootdir):
             for dpi in TO_CHECK:
                 if subdir.endswith("drawable" + dpi) and \
                    filename.endswith("png"):
-                    if dpi == "": # merge drawable-mdpi and drawable dir
-                        filenames[subdir + "-mdpi"].add(filename)
-                    else:
-                        filenames[subdir].add(filename)
+                   filenames[subdir].add(filename)
     # check missing drawables
     for subdir in filenames:
         for filename in filenames[subdir]: