Renamed legacy editor button selectors and images

wordpress-mobile · Apr 16, 2015 · 8303e45 · 8303e45
1 parent 6195fe0
commit 8303e45
Show file tree

Hide file tree

Showing 72 changed files with 88 additions and 88 deletions.
diff --git a/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java b/WordPressEditor/src/main/java/org/wordpress/android/editor/LegacyEditorFragment.java
@@ -443,7 +443,7 @@ private WPEditImageSpan createWPEditImageSpanLocal(Context context, MediaFile me
     }
 
     private WPEditImageSpan createWPEditImageSpanRemote(Context context, MediaFile mediaFile) {
-        int drawable = mediaFile.isVideo() ? R.drawable.media_movieclip : R.drawable.dashicon_format_image_big_grey;
+        int drawable = mediaFile.isVideo() ? R.drawable.media_movieclip : R.drawable.legacy_dashicon_format_image_big_grey;
         Uri uri = Uri.parse(mediaFile.getFileURL());
         WPEditImageSpan imageSpan = new WPEditImageSpan(context, drawable, uri);
         imageSpan.setMediaFile(mediaFile);
@@ -1046,7 +1046,7 @@ public void appendGallery(MediaGallery mediaGallery) {
 
         editableText.insert(selectionStart, " ");
         MediaGalleryImageSpan is = new MediaGalleryImageSpan(getActivity(), mediaGallery,
-                R.drawable.icon_mediagallery_placeholder);
+                R.drawable.legacy_icon_mediagallery_placeholder);
         editableText.setSpan(is, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
         AlignmentSpan.Standard as = new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER);
         editableText.setSpan(as, selectionStart, selectionEnd + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);

diff --git a/...es/drawable-hdpi/dashicon_admin_links.png → ...able-hdpi/legacy_dashicon_admin_links.png b/...es/drawable-hdpi/dashicon_admin_links.png → ...able-hdpi/legacy_dashicon_admin_links.png
diff --git a/...awable-hdpi/dashicon_admin_links_grey.png → ...hdpi/legacy_dashicon_admin_links_grey.png b/...awable-hdpi/dashicon_admin_links_grey.png → ...hdpi/legacy_dashicon_admin_links_grey.png
diff --git a/...es/drawable-hdpi/dashicon_editor_bold.png → ...able-hdpi/legacy_dashicon_editor_bold.png b/...es/drawable-hdpi/dashicon_editor_bold.png → ...able-hdpi/legacy_dashicon_editor_bold.png
diff --git a/...awable-hdpi/dashicon_editor_bold_grey.png → ...hdpi/legacy_dashicon_editor_bold_grey.png b/...awable-hdpi/dashicon_editor_bold_grey.png → ...hdpi/legacy_dashicon_editor_bold_grey.png
diff --git a/...wable-hdpi/dashicon_editor_insertmore.png → ...dpi/legacy_dashicon_editor_insertmore.png b/...wable-hdpi/dashicon_editor_insertmore.png → ...dpi/legacy_dashicon_editor_insertmore.png
diff --git a/...-hdpi/dashicon_editor_insertmore_grey.png → ...egacy_dashicon_editor_insertmore_grey.png b/...-hdpi/dashicon_editor_insertmore_grey.png → ...egacy_dashicon_editor_insertmore_grey.png
diff --git a/.../drawable-hdpi/dashicon_editor_italic.png → ...le-hdpi/legacy_dashicon_editor_italic.png b/.../drawable-hdpi/dashicon_editor_italic.png → ...le-hdpi/legacy_dashicon_editor_italic.png
diff --git a/...able-hdpi/dashicon_editor_italic_grey.png → ...pi/legacy_dashicon_editor_italic_grey.png b/...able-hdpi/dashicon_editor_italic_grey.png → ...pi/legacy_dashicon_editor_italic_grey.png
diff --git a/...le-hdpi/dashicon_editor_strikethrough.png → .../legacy_dashicon_editor_strikethrough.png b/...le-hdpi/dashicon_editor_strikethrough.png → .../legacy_dashicon_editor_strikethrough.png
diff --git a/...pi/dashicon_editor_strikethrough_grey.png → ...cy_dashicon_editor_strikethrough_grey.png b/...pi/dashicon_editor_strikethrough_grey.png → ...cy_dashicon_editor_strikethrough_grey.png
diff --git a/...awable-hdpi/dashicon_editor_underline.png → ...hdpi/legacy_dashicon_editor_underline.png b/...awable-hdpi/dashicon_editor_underline.png → ...hdpi/legacy_dashicon_editor_underline.png
diff --git a/...e-hdpi/dashicon_editor_underline_grey.png → ...legacy_dashicon_editor_underline_grey.png b/...e-hdpi/dashicon_editor_underline_grey.png → ...legacy_dashicon_editor_underline_grey.png
diff --git a/...e-hdpi/dashicon_format_image_big_grey.png → ...legacy_dashicon_format_image_big_grey.png b/...e-hdpi/dashicon_format_image_big_grey.png → ...legacy_dashicon_format_image_big_grey.png
diff --git a/...s/drawable-hdpi/dashicon_format_quote.png → ...ble-hdpi/legacy_dashicon_format_quote.png b/...s/drawable-hdpi/dashicon_format_quote.png → ...ble-hdpi/legacy_dashicon_format_quote.png
diff --git a/...wable-hdpi/dashicon_format_quote_grey.png → ...dpi/legacy_dashicon_format_quote_grey.png b/...wable-hdpi/dashicon_format_quote_grey.png → ...dpi/legacy_dashicon_format_quote_grey.png
diff --git a/...le-hdpi/icon_mediagallery_placeholder.png → .../legacy_icon_mediagallery_placeholder.png b/...le-hdpi/icon_mediagallery_placeholder.png → .../legacy_icon_mediagallery_placeholder.png
diff --git a/...s/drawable-xhdpi/dashicon_admin_links.png → ...ble-xhdpi/legacy_dashicon_admin_links.png b/...s/drawable-xhdpi/dashicon_admin_links.png → ...ble-xhdpi/legacy_dashicon_admin_links.png
diff --git a/...wable-xhdpi/dashicon_admin_links_grey.png → ...hdpi/legacy_dashicon_admin_links_grey.png b/...wable-xhdpi/dashicon_admin_links_grey.png → ...hdpi/legacy_dashicon_admin_links_grey.png
diff --git a/...s/drawable-xhdpi/dashicon_editor_bold.png → ...ble-xhdpi/legacy_dashicon_editor_bold.png b/...s/drawable-xhdpi/dashicon_editor_bold.png → ...ble-xhdpi/legacy_dashicon_editor_bold.png
diff --git a/...wable-xhdpi/dashicon_editor_bold_grey.png → ...hdpi/legacy_dashicon_editor_bold_grey.png b/...wable-xhdpi/dashicon_editor_bold_grey.png → ...hdpi/legacy_dashicon_editor_bold_grey.png
diff --git a/...able-xhdpi/dashicon_editor_insertmore.png → ...dpi/legacy_dashicon_editor_insertmore.png b/...able-xhdpi/dashicon_editor_insertmore.png → ...dpi/legacy_dashicon_editor_insertmore.png
diff --git a/...xhdpi/dashicon_editor_insertmore_grey.png → ...egacy_dashicon_editor_insertmore_grey.png b/...xhdpi/dashicon_editor_insertmore_grey.png → ...egacy_dashicon_editor_insertmore_grey.png
diff --git a/...drawable-xhdpi/dashicon_editor_italic.png → ...e-xhdpi/legacy_dashicon_editor_italic.png b/...drawable-xhdpi/dashicon_editor_italic.png → ...e-xhdpi/legacy_dashicon_editor_italic.png
diff --git a/...ble-xhdpi/dashicon_editor_italic_grey.png → ...pi/legacy_dashicon_editor_italic_grey.png b/...ble-xhdpi/dashicon_editor_italic_grey.png → ...pi/legacy_dashicon_editor_italic_grey.png
diff --git a/...e-xhdpi/dashicon_editor_strikethrough.png → .../legacy_dashicon_editor_strikethrough.png b/...e-xhdpi/dashicon_editor_strikethrough.png → .../legacy_dashicon_editor_strikethrough.png
diff --git a/...pi/dashicon_editor_strikethrough_grey.png → ...cy_dashicon_editor_strikethrough_grey.png b/...pi/dashicon_editor_strikethrough_grey.png → ...cy_dashicon_editor_strikethrough_grey.png
diff --git a/...wable-xhdpi/dashicon_editor_underline.png → ...hdpi/legacy_dashicon_editor_underline.png b/...wable-xhdpi/dashicon_editor_underline.png → ...hdpi/legacy_dashicon_editor_underline.png
diff --git a/...-xhdpi/dashicon_editor_underline_grey.png → ...legacy_dashicon_editor_underline_grey.png b/...-xhdpi/dashicon_editor_underline_grey.png → ...legacy_dashicon_editor_underline_grey.png
diff --git a/...-xhdpi/dashicon_format_image_big_grey.png → ...legacy_dashicon_format_image_big_grey.png b/...-xhdpi/dashicon_format_image_big_grey.png → ...legacy_dashicon_format_image_big_grey.png
diff --git a/.../drawable-xhdpi/dashicon_format_quote.png → ...le-xhdpi/legacy_dashicon_format_quote.png b/.../drawable-xhdpi/dashicon_format_quote.png → ...le-xhdpi/legacy_dashicon_format_quote.png
diff --git a/...able-xhdpi/dashicon_format_quote_grey.png → ...dpi/legacy_dashicon_format_quote_grey.png b/...able-xhdpi/dashicon_format_quote_grey.png → ...dpi/legacy_dashicon_format_quote_grey.png
diff --git a/...e-xhdpi/icon_mediagallery_placeholder.png → .../legacy_icon_mediagallery_placeholder.png b/...e-xhdpi/icon_mediagallery_placeholder.png → .../legacy_icon_mediagallery_placeholder.png
diff --git a/.../drawable-xxhdpi/dashicon_admin_links.png → ...le-xxhdpi/legacy_dashicon_admin_links.png b/.../drawable-xxhdpi/dashicon_admin_links.png → ...le-xxhdpi/legacy_dashicon_admin_links.png
diff --git a/...able-xxhdpi/dashicon_admin_links_grey.png → ...hdpi/legacy_dashicon_admin_links_grey.png b/...able-xxhdpi/dashicon_admin_links_grey.png → ...hdpi/legacy_dashicon_admin_links_grey.png
diff --git a/.../drawable-xxhdpi/dashicon_editor_bold.png → ...le-xxhdpi/legacy_dashicon_editor_bold.png b/.../drawable-xxhdpi/dashicon_editor_bold.png → ...le-xxhdpi/legacy_dashicon_editor_bold.png
diff --git a/...able-xxhdpi/dashicon_editor_bold_grey.png → ...hdpi/legacy_dashicon_editor_bold_grey.png b/...able-xxhdpi/dashicon_editor_bold_grey.png → ...hdpi/legacy_dashicon_editor_bold_grey.png
diff --git a/...ble-xxhdpi/dashicon_editor_insertmore.png → ...dpi/legacy_dashicon_editor_insertmore.png b/...ble-xxhdpi/dashicon_editor_insertmore.png → ...dpi/legacy_dashicon_editor_insertmore.png
diff --git a/...xhdpi/dashicon_editor_insertmore_grey.png → ...egacy_dashicon_editor_insertmore_grey.png b/...xhdpi/dashicon_editor_insertmore_grey.png → ...egacy_dashicon_editor_insertmore_grey.png
diff --git a/...rawable-xxhdpi/dashicon_editor_italic.png → ...-xxhdpi/legacy_dashicon_editor_italic.png b/...rawable-xxhdpi/dashicon_editor_italic.png → ...-xxhdpi/legacy_dashicon_editor_italic.png
diff --git a/...le-xxhdpi/dashicon_editor_italic_grey.png → ...pi/legacy_dashicon_editor_italic_grey.png b/...le-xxhdpi/dashicon_editor_italic_grey.png → ...pi/legacy_dashicon_editor_italic_grey.png
diff --git a/...-xxhdpi/dashicon_editor_strikethrough.png → .../legacy_dashicon_editor_strikethrough.png b/...-xxhdpi/dashicon_editor_strikethrough.png → .../legacy_dashicon_editor_strikethrough.png
diff --git a/...pi/dashicon_editor_strikethrough_grey.png → ...cy_dashicon_editor_strikethrough_grey.png b/...pi/dashicon_editor_strikethrough_grey.png → ...cy_dashicon_editor_strikethrough_grey.png
diff --git a/...able-xxhdpi/dashicon_editor_underline.png → ...hdpi/legacy_dashicon_editor_underline.png b/...able-xxhdpi/dashicon_editor_underline.png → ...hdpi/legacy_dashicon_editor_underline.png
diff --git a/...xxhdpi/dashicon_editor_underline_grey.png → ...legacy_dashicon_editor_underline_grey.png b/...xxhdpi/dashicon_editor_underline_grey.png → ...legacy_dashicon_editor_underline_grey.png
diff --git a/...xxhdpi/dashicon_format_image_big_grey.png → ...legacy_dashicon_format_image_big_grey.png b/...xxhdpi/dashicon_format_image_big_grey.png → ...legacy_dashicon_format_image_big_grey.png
diff --git a/...drawable-xxhdpi/dashicon_format_quote.png → ...e-xxhdpi/legacy_dashicon_format_quote.png b/...drawable-xxhdpi/dashicon_format_quote.png → ...e-xxhdpi/legacy_dashicon_format_quote.png
diff --git a/...ble-xxhdpi/dashicon_format_quote_grey.png → ...dpi/legacy_dashicon_format_quote_grey.png b/...ble-xxhdpi/dashicon_format_quote_grey.png → ...dpi/legacy_dashicon_format_quote_grey.png
diff --git a/...-xxhdpi/icon_mediagallery_placeholder.png → .../legacy_icon_mediagallery_placeholder.png b/...-xxhdpi/icon_mediagallery_placeholder.png → .../legacy_icon_mediagallery_placeholder.png
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selector.xml
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strike_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strike_selected_state.xml
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strike_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strike_selector.xml
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_underline_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_underline_selected_state.xml
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_underline_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_underline_selector.xml
diff --git a/...format_bar_button_bold_selected_state.xml → ...format_bar_button_bold_selected_state.xml b/...format_bar_button_bold_selected_state.xml → ...format_bar_button_bold_selected_state.xml
@@ -7,6 +7,6 @@
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/dashicon_editor_bold" android:gravity="center"/>
+        <bitmap android:src="@drawable/legacy_dashicon_editor_bold" android:gravity="center"/>
     </item>
 </layer-list>
diff --git a/...wable/format_bar_button_link_selector.xml → ...egacy_format_bar_button_bold_selector.xml b/...wable/format_bar_button_link_selector.xml → ...egacy_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_link_selected_state"/>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_link_selected_state"/>
+    <item android:state_checked="true" android:drawable="@drawable/legacy_format_bar_button_bold_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/legacy_format_bar_button_bold_selected_state"/>
     <item>
-        <bitmap android:src="@drawable/dashicon_admin_links_grey" android:gravity="center"/>
+        <bitmap android:src="@drawable/legacy_dashicon_editor_bold_grey" android:gravity="center"/>
     </item>
 </selector>
diff --git a/...format_bar_button_link_selected_state.xml → ...rmat_bar_button_italic_selected_state.xml b/...format_bar_button_link_selected_state.xml → ...rmat_bar_button_italic_selected_state.xml
@@ -7,6 +7,6 @@
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/dashicon_admin_links" android:gravity="center"/>
+        <bitmap android:src="@drawable/legacy_dashicon_editor_italic" android:gravity="center"/>
     </item>
 </layer-list>
diff --git a/...ble/format_bar_button_italic_selector.xml → ...acy_format_bar_button_italic_selector.xml b/...ble/format_bar_button_italic_selector.xml → ...acy_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 android:state_pressed="true" android:drawable="@drawable/format_bar_button_italic_selected_state"/>
+    <item android:state_checked="true" android:drawable="@drawable/legacy_format_bar_button_italic_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/legacy_format_bar_button_italic_selected_state"/>
     <item>
-        <bitmap android:src="@drawable/dashicon_editor_italic_grey" android:gravity="center"/>
+        <bitmap android:src="@drawable/legacy_dashicon_editor_italic_grey" android:gravity="center"/>
     </item>
 </selector>
diff --git a/...format_bar_button_more_selected_state.xml → ...format_bar_button_link_selected_state.xml b/...format_bar_button_more_selected_state.xml → ...format_bar_button_link_selected_state.xml
@@ -7,6 +7,6 @@
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/dashicon_editor_insertmore" android:gravity="center"/>
+        <bitmap android:src="@drawable/legacy_dashicon_admin_links" android:gravity="center"/>
     </item>
 </layer-list>
diff --git a/...wable/format_bar_button_bold_selector.xml → ...egacy_format_bar_button_link_selector.xml b/...wable/format_bar_button_bold_selector.xml → ...egacy_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_bold_selected_state"/>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_bold_selected_state"/>
+    <item android:state_checked="true" android:drawable="@drawable/legacy_format_bar_button_link_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/legacy_format_bar_button_link_selected_state"/>
     <item>
-        <bitmap android:src="@drawable/dashicon_editor_bold_grey" android:gravity="center"/>
+        <bitmap android:src="@drawable/legacy_dashicon_admin_links_grey" android:gravity="center"/>
     </item>
 </selector>
diff --git a/...ormat_bar_button_media_selected_state.xml → ...ormat_bar_button_media_selected_state.xml b/...ormat_bar_button_media_selected_state.xml → ...ormat_bar_button_media_selected_state.xml
diff --git a/...able/format_bar_button_media_selector.xml → ...gacy_format_bar_button_media_selector.xml b/...able/format_bar_button_media_selector.xml → ...gacy_format_bar_button_media_selector.xml
@@ -1,7 +1,7 @@
 <?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 android:state_pressed="true" android:drawable="@drawable/format_bar_button_media_selected_state"/>
+    <item android:state_checked="true" android:drawable="@drawable/legacy_format_bar_button_media_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/legacy_format_bar_button_media_selected_state"/>
     <item>
         <bitmap android:src="@drawable/noticon_picture_grey" android:gravity="center"/>
     </item>

diff --git a/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_more_selected_state.xml b/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_more_selected_state.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/format_bar_button_selected"/>
+        </shape>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/legacy_dashicon_editor_insertmore" android:gravity="center"/>
+    </item>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_more_selector.xml b/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_more_selector.xml
@@ -0,0 +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/legacy_format_bar_button_more_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/legacy_format_bar_button_more_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/legacy_dashicon_editor_insertmore_grey" android:gravity="center"/>
+    </item>
+</selector>
diff --git a/...rmat_bar_button_italic_selected_state.xml → ...ormat_bar_button_quote_selected_state.xml b/...rmat_bar_button_italic_selected_state.xml → ...ormat_bar_button_quote_selected_state.xml
@@ -7,6 +7,6 @@
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/dashicon_editor_italic" android:gravity="center"/>
+        <bitmap android:src="@drawable/legacy_dashicon_format_quote" android:gravity="center"/>
     </item>
 </layer-list>
diff --git a/...wable/format_bar_button_more_selector.xml → ...gacy_format_bar_button_quote_selector.xml b/...wable/format_bar_button_more_selector.xml → ...gacy_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_more_selected_state"/>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_more_selected_state"/>
+    <item android:state_checked="true" android:drawable="@drawable/legacy_format_bar_button_quote_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/legacy_format_bar_button_quote_selected_state"/>
     <item>
-        <bitmap android:src="@drawable/dashicon_editor_insertmore_grey" android:gravity="center"/>
+        <bitmap android:src="@drawable/legacy_dashicon_format_quote_grey" android:gravity="center"/>
     </item>
 </selector>
diff --git a/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_strike_selected_state.xml b/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_strike_selected_state.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/format_bar_button_selected"/>
+        </shape>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/legacy_dashicon_editor_strikethrough" android:gravity="center"/>
+    </item>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_strike_selector.xml b/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_strike_selector.xml
@@ -0,0 +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/legacy_format_bar_button_strike_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/legacy_format_bar_button_strike_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/legacy_dashicon_editor_strikethrough_grey" android:gravity="center"/>
+    </item>
+</selector>
diff --git a/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_underline_selected_state.xml b/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_underline_selected_state.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/format_bar_button_selected"/>
+        </shape>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/legacy_dashicon_editor_underline" android:gravity="center"/>
+    </item>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_underline_selector.xml b/WordPressEditor/src/main/res/drawable/legacy_format_bar_button_underline_selector.xml
@@ -0,0 +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/legacy_format_bar_button_underline_selected_state"/>
+    <item android:state_pressed="true" android:drawable="@drawable/legacy_format_bar_button_underline_selected_state"/>
+    <item>
+        <bitmap android:src="@drawable/legacy_dashicon_editor_underline_grey" android:gravity="center"/>
+    </item>
+</selector>
diff --git a/WordPressEditor/src/main/res/layout/fragment_edit_post_content.xml b/WordPressEditor/src/main/res/layout/fragment_edit_post_content.xml
@@ -100,49 +100,49 @@
                     style="@style/ToggleButton"
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
-                    android:background="@drawable/format_bar_button_bold_selector" />
+                    android:background="@drawable/legacy_format_bar_button_bold_selector" />
 
                 <ToggleButton
                     android:id="@+id/em"
                     style="@style/ToggleButton"
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
-                    android:background="@drawable/format_bar_button_italic_selector" />
+                    android:background="@drawable/legacy_format_bar_button_italic_selector" />
 
                 <ToggleButton
                     android:id="@+id/underline"
                     style="@style/ToggleButton"
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
-                    android:background="@drawable/format_bar_button_underline_selector" />
+                    android:background="@drawable/legacy_format_bar_button_underline_selector" />
 
                 <ToggleButton
                     android:id="@+id/strike"
                     style="@style/ToggleButton"
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
-                    android:background="@drawable/format_bar_button_strike_selector" />
+                    android:background="@drawable/legacy_format_bar_button_strike_selector" />
 
                 <ToggleButton
                     android:id="@+id/bquote"
                     style="@style/ToggleButton"
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
-                    android:background="@drawable/format_bar_button_quote_selector" />
+                    android:background="@drawable/legacy_format_bar_button_quote_selector" />
 
                 <Button
                     android:id="@+id/link"
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
                     android:minWidth="@dimen/format_bar_height"
-                    android:background="@drawable/format_bar_button_link_selector" />
+                    android:background="@drawable/legacy_format_bar_button_link_selector" />
 
                 <Button
                     android:id="@+id/more"
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
                     android:minWidth="@dimen/format_bar_height"
-                    android:background="@drawable/format_bar_button_more_selector" />
+                    android:background="@drawable/legacy_format_bar_button_more_selector" />
             </LinearLayout>
         </HorizontalScrollView>
 
@@ -151,7 +151,7 @@
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:minWidth="@dimen/format_bar_height"
-            android:background="@drawable/format_bar_button_media_selector" />
+            android:background="@drawable/legacy_format_bar_button_media_selector" />
     </LinearLayout>
 
 </LinearLayout>