diff --git a/WordPressEditor/build.gradle b/WordPressEditor/build.gradle
index b90f4106..708e47b7 100644
--- a/WordPressEditor/build.gradle
+++ b/WordPressEditor/build.gradle
@@ -45,9 +45,9 @@ android {
}
dependencies {
- compile 'com.android.support:appcompat-v7:23.1.1'
- compile 'com.android.support:support-v4:23.1.1'
- compile 'com.android.support:design:23.1.1'
+ compile 'com.android.support:appcompat-v7:23.4.0'
+ compile 'com.android.support:support-v4:23.4.0'
+ compile 'com.android.support:design:23.4.0'
compile 'org.wordpress:utils:1.9.0'
// Test libraries
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold.png
deleted file mode 100644
index 5cadbdbb..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_disabled.png
deleted file mode 100644
index 07c51b6d..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_highlighted.png
deleted file mode 100644
index f324e7f3..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_bold_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html.png
deleted file mode 100644
index cf6598c4..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html_disabled.png
deleted file mode 100644
index 8e5e094d..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html_highlighted.png
deleted file mode 100644
index ada19d88..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_html_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic.png
deleted file mode 100644
index 57afe4b6..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic_disabled.png
deleted file mode 100644
index 0bc7247f..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic_highlighted.png
deleted file mode 100644
index 826c9755..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_italic_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link.png
deleted file mode 100644
index bb61856d..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_disabled.png
deleted file mode 100644
index 58558dba..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_highlighted.png
deleted file mode 100644
index c7bb8a76..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_link_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media.png
deleted file mode 100644
index b7ad17ad..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media_disabled.png
deleted file mode 100644
index 78417e4e..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media_highlighted.png
deleted file mode 100644
index 8325930d..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_media_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more.png
deleted file mode 100644
index b3c93eec..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_disabled.png
deleted file mode 100644
index 390d61d7..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_highlighted.png
deleted file mode 100644
index 5a2c8c54..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_more_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol.png
deleted file mode 100644
index c5af4133..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol_disabled.png
deleted file mode 100644
index bd2a9227..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol_highlighted.png
deleted file mode 100644
index 81e998fb..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ol_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote.png
deleted file mode 100644
index c2648147..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote_disabled.png
deleted file mode 100644
index b61a08c7..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote_highlighted.png
deleted file mode 100644
index 28bf6fee..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_quote_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough.png
deleted file mode 100644
index 431c7d87..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough_disabled.png
deleted file mode 100644
index 242e00a0..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough_highlighted.png
deleted file mode 100644
index bd0727ae..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_strikethrough_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul.png
deleted file mode 100644
index d241e520..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_disabled.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_disabled.png
deleted file mode 100644
index b61be7a2..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_highlighted.png b/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_highlighted.png
deleted file mode 100644
index 9781a950..00000000
Binary files a/WordPressEditor/src/main/res/drawable-hdpi/format_bar_button_ul_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold.png
deleted file mode 100644
index 32cd925b..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold_disabled.png
deleted file mode 100644
index 886b58bd..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold_highlighted.png
deleted file mode 100644
index b07ccec4..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_bold_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html.png
deleted file mode 100644
index 28ab8c3d..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html_disabled.png
deleted file mode 100644
index 1b430342..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html_highlighted.png
deleted file mode 100644
index 346d6552..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_html_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic.png
deleted file mode 100644
index 21b7b5c6..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic_disabled.png
deleted file mode 100644
index a88d483c..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic_highlighted.png
deleted file mode 100644
index 0d9b82bc..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_italic_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link.png
deleted file mode 100644
index 42da3887..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_disabled.png
deleted file mode 100644
index 62ad3bf7..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_highlighted.png
deleted file mode 100644
index fb63462a..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_link_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media.png
deleted file mode 100644
index e546778f..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media_disabled.png
deleted file mode 100644
index 5728b301..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media_highlighted.png
deleted file mode 100644
index bb034b79..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_media_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more.png
deleted file mode 100644
index 20f3fd13..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_disabled.png
deleted file mode 100644
index 109cfcc7..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_highlighted.png
deleted file mode 100644
index b0889f02..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_more_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol.png
deleted file mode 100644
index eefdd59d..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol_disabled.png
deleted file mode 100644
index 97e1a3ae..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol_highlighted.png
deleted file mode 100644
index 0de14b65..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ol_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote.png
deleted file mode 100644
index 0582726f..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_disabled.png
deleted file mode 100644
index 973d7b4f..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_highlighted.png
deleted file mode 100644
index c374e951..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_quote_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough.png
deleted file mode 100644
index 6b8cbe3d..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough_disabled.png
deleted file mode 100644
index 0683895e..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough_highlighted.png
deleted file mode 100644
index b6dfe9d7..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_strikethrough_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul.png
deleted file mode 100644
index 19248634..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul_disabled.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul_disabled.png
deleted file mode 100644
index b881d8bf..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul_highlighted.png b/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul_highlighted.png
deleted file mode 100644
index a017124e..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xhdpi/format_bar_button_ul_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold.png
deleted file mode 100644
index 83378cd6..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_disabled.png
deleted file mode 100644
index 3466be62..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_highlighted.png
deleted file mode 100644
index 894b5751..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_bold_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html.png
deleted file mode 100644
index ca57ef98..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_disabled.png
deleted file mode 100644
index 707aca2b..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_highlighted.png
deleted file mode 100644
index f26b36df..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_html_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic.png
deleted file mode 100644
index 2e766d7b..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic_disabled.png
deleted file mode 100644
index 104f0b73..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic_highlighted.png
deleted file mode 100644
index 1126ba10..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_italic_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link.png
deleted file mode 100644
index e4518d2f..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_disabled.png
deleted file mode 100644
index ae686a96..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_highlighted.png
deleted file mode 100644
index 532bba2a..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_link_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media.png
deleted file mode 100644
index e764b0a1..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media_disabled.png
deleted file mode 100644
index dbb45e4d..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media_highlighted.png
deleted file mode 100644
index b88cec4c..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_media_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more.png
deleted file mode 100644
index 500f2dc7..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more_disabled.png
deleted file mode 100644
index bb7b665e..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more_highlighted.png
deleted file mode 100644
index 17adaef8..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_more_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol.png
deleted file mode 100644
index 2e17b34b..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol_disabled.png
deleted file mode 100644
index 5bcc8593..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol_highlighted.png
deleted file mode 100644
index 0ad3d5bd..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ol_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote.png
deleted file mode 100644
index d954ef1e..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_disabled.png
deleted file mode 100644
index 00a61a47..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_highlighted.png
deleted file mode 100644
index 82f4f902..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_quote_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough.png
deleted file mode 100644
index 643f6ffe..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_disabled.png
deleted file mode 100644
index 75076aa8..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_highlighted.png
deleted file mode 100644
index a0d194d4..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_strikethrough_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul.png
deleted file mode 100644
index ffba75e9..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul_disabled.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul_disabled.png
deleted file mode 100644
index 36fa8946..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul_disabled.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul_highlighted.png b/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul_highlighted.png
deleted file mode 100644
index c0f6c41b..00000000
Binary files a/WordPressEditor/src/main/res/drawable-xxhdpi/format_bar_button_ul_highlighted.png and /dev/null differ
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold.xml
new file mode 100755
index 00000000..82788b1f
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_bold.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled.xml
new file mode 100755
index 00000000..1a6fc631
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled_state.xml
deleted file mode 100755
index d0ee5f7d..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_highlighted.xml
new file mode 100755
index 00000000..cdb305cc
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_highlighted.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml
deleted file mode 100755
index 9835de55..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selector.xml
index 2287d449..e35075d6 100755
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selector.xml
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selector.xml
@@ -1,11 +1,7 @@
-
-
-
- -
-
-
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html.xml
new file mode 100755
index 00000000..a17d37c9
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_html.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled.xml
new file mode 100755
index 00000000..b82938df
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled_state.xml
deleted file mode 100755
index e5c0e5fe..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html_highlighted.xml
new file mode 100755
index 00000000..1497cf2b
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_html_highlighted.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html_selected_state.xml
deleted file mode 100755
index 4ab89501..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_html_selected_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_html_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_html_selector.xml
index cc51e2f0..767d6dd6 100755
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_html_selector.xml
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_html_selector.xml
@@ -1,11 +1,7 @@
-
-
-
- -
-
-
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic.xml
new file mode 100755
index 00000000..bf4a9ae2
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_italic.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled.xml
new file mode 100755
index 00000000..acb50bd3
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled_state.xml
deleted file mode 100755
index 5c1a6899..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_highlighted.xml
new file mode 100755
index 00000000..7c8e4de7
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_highlighted.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml
deleted file mode 100755
index 3559953d..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selector.xml
index 21ba9165..6136a680 100755
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selector.xml
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selector.xml
@@ -1,11 +1,7 @@
-
-
-
- -
-
-
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link.xml
new file mode 100755
index 00000000..9ca70c1b
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_link.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled.xml
new file mode 100755
index 00000000..d1b4d83f
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled_state.xml
deleted file mode 100755
index f76c86d1..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_highlighted.xml
new file mode 100755
index 00000000..6ce750b2
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_link_highlighted.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml
deleted file mode 100755
index 7aaad74f..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_selector.xml
index a7185405..eaad54d2 100755
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_link_selector.xml
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_link_selector.xml
@@ -1,11 +1,7 @@
-
-
-
- -
-
-
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media.xml
new file mode 100755
index 00000000..231c3dce
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_media.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled.xml
new file mode 100755
index 00000000..d06f5274
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled_state.xml
deleted file mode 100755
index cdfc9a4b..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_media_disabled_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_highlighted.xml
new file mode 100755
index 00000000..058e338f
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_media_highlighted.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml
deleted file mode 100755
index 1c9c0f4f..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_selector.xml
index 883a797a..d0c31e29 100755
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_media_selector.xml
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_media_selector.xml
@@ -1,11 +1,7 @@
-
-
-
- -
-
-
+
+
+
+
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_more.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_more.xml
new file mode 100755
index 00000000..38d270bd
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_more.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_more_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_more_disabled.xml
new file mode 100755
index 00000000..614bbad2
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_more_disabled.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_more_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_more_highlighted.xml
new file mode 100755
index 00000000..aa3eff01
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_more_highlighted.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol.xml
new file mode 100755
index 00000000..a7160f48
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ol.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled.xml
new file mode 100755
index 00000000..f396c573
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled_state.xml
deleted file mode 100755
index 11095976..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_disabled_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_highlighted.xml
new file mode 100755
index 00000000..915e6c8b
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_highlighted.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selected_state.xml
deleted file mode 100755
index 5209bdb8..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selected_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selector.xml
index 7116a51d..74b09963 100755
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selector.xml
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ol_selector.xml
@@ -1,11 +1,7 @@
-
-
-
- -
-
-
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote.xml
new file mode 100755
index 00000000..9bcf8198
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_quote.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled.xml
new file mode 100755
index 00000000..dd03e26d
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled_state.xml
deleted file mode 100755
index b19edc5b..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_disabled_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_highlighted.xml
new file mode 100755
index 00000000..51b1f7d3
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_highlighted.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
\ No newline at end of file
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
deleted file mode 100755
index ea4f0b14..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
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
index 9d2d91a2..42daf634 100755
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selector.xml
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selector.xml
@@ -1,11 +1,7 @@
-
-
-
- -
-
-
+
+
+
+
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough.xml
new file mode 100755
index 00000000..5b11a244
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled.xml
new file mode 100755
index 00000000..bb763c15
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled_state.xml
deleted file mode 100644
index dfbb3f68..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_disabled_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_highlighted.xml
new file mode 100755
index 00000000..bd8401f9
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_highlighted.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selected_state.xml
deleted file mode 100644
index 17f870fc..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selected_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selector.xml
index 5208dcfc..573755e9 100644
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selector.xml
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_strikethrough_selector.xml
@@ -1,11 +1,7 @@
-
-
-
- -
-
-
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul.xml
new file mode 100755
index 00000000..8e23d215
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ul.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled.xml
new file mode 100755
index 00000000..c1047a0f
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled_state.xml
deleted file mode 100755
index d2df8a43..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_disabled_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_highlighted.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_highlighted.xml
new file mode 100755
index 00000000..de0c4958
--- /dev/null
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_highlighted.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selected_state.xml
deleted file mode 100755
index 77f0b002..00000000
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selected_state.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- -
-
-
-
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selector.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selector.xml
index ea9f0217..98cffc7a 100755
--- a/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selector.xml
+++ b/WordPressEditor/src/main/res/drawable/format_bar_button_ul_selector.xml
@@ -1,12 +1,7 @@
-
-
-
-
- -
-
-
+
+
+
+
\ No newline at end of file
diff --git a/WordPressEditor/src/main/res/layout-w380dp/format_bar.xml b/WordPressEditor/src/main/res/layout-w380dp/format_bar.xml
index 17d9f6d2..3ee179ba 100644
--- a/WordPressEditor/src/main/res/layout-w380dp/format_bar.xml
+++ b/WordPressEditor/src/main/res/layout-w380dp/format_bar.xml
@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/format_bar"
- android:layout_width="fill_parent"
+ android:layout_width="match_parent"
android:layout_height="@dimen/format_bar_height"
android:layout_gravity="bottom"
android:background="@color/format_bar_background"
@@ -12,87 +12,122 @@
-
+ android:gravity="center">
+
+
-
+ android:gravity="center">
+
+
-
+ android:gravity="center">
+
+
-
+ android:gravity="center">
+
+
-
+ android:gravity="center">
+
+
-
+ android:gravity="center">
+
+
-
+ android:gravity="center">
+
+
+
+
diff --git a/WordPressEditor/src/main/res/layout-w600dp/format_bar.xml b/WordPressEditor/src/main/res/layout-w600dp/format_bar.xml
index 58f90708..f4a64666 100644
--- a/WordPressEditor/src/main/res/layout-w600dp/format_bar.xml
+++ b/WordPressEditor/src/main/res/layout-w600dp/format_bar.xml
@@ -27,13 +27,14 @@
+ android:layout_height="fill_parent"
+ android:gravity="center">
@@ -41,13 +42,14 @@
+ android:layout_height="fill_parent"
+ android:gravity="center">
@@ -56,7 +58,7 @@
android:id="@+id/format_bar_button_italic"
style="@style/FormatBarButtonTablet"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="wrap_content"
android:contentDescription="@string/format_bar_description_italic"
android:background="@drawable/format_bar_button_italic_selector"
android:tag="@string/format_bar_tag_italic"/>
@@ -65,7 +67,7 @@
android:id="@+id/format_bar_button_strikethrough"
style="@style/FormatBarButtonTablet"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="wrap_content"
android:background="@drawable/format_bar_button_strikethrough_selector"
android:tag="@string/format_bar_tag_strikethrough"/>
@@ -73,13 +75,14 @@
+ android:layout_height="fill_parent"
+ android:gravity="center">
@@ -88,13 +91,14 @@
+ android:layout_height="fill_parent"
+ android:gravity="center">
@@ -103,7 +107,7 @@
android:id="@+id/format_bar_button_ol"
style="@style/FormatBarButtonTablet"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="wrap_content"
android:contentDescription="@string/format_bar_description_ol"
android:background="@drawable/format_bar_button_ol_selector"
android:tag="@string/format_bar_tag_orderedList"/>
@@ -112,7 +116,7 @@
android:id="@+id/format_bar_button_quote"
style="@style/FormatBarButtonTablet"
android:layout_width="wrap_content"
- android:layout_height="fill_parent"
+ android:layout_height="wrap_content"
android:contentDescription="@string/format_bar_description_quote"
android:background="@drawable/format_bar_button_quote_selector"
android:tag="@string/format_bar_tag_blockquote"/>
@@ -121,13 +125,14 @@
+ android:layout_height="fill_parent"
+ android:gravity="center">