diff --git a/java/res/drawable-hdpi/tab_selected.9.png b/java/res/drawable-hdpi/emoji_category_tab_selected_holo_dark.9.png
similarity index 100%
rename from java/res/drawable-hdpi/tab_selected.9.png
rename to java/res/drawable-hdpi/emoji_category_tab_selected_holo_dark.9.png
diff --git a/java/res/drawable-hdpi/tab_unselected.9.png b/java/res/drawable-hdpi/emoji_category_tab_unselected_holo_dark.9.png
similarity index 100%
rename from java/res/drawable-hdpi/tab_unselected.9.png
rename to java/res/drawable-hdpi/emoji_category_tab_unselected_holo_dark.9.png
diff --git a/java/res/drawable-hdpi/ic_emoji_nature_light_activated.png b/java/res/drawable-hdpi/ic_emoji_nature_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_nature_light_activated.png
rename to java/res/drawable-hdpi/ic_emoji_nature_activated_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_nature_light_normal.png b/java/res/drawable-hdpi/ic_emoji_nature_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_nature_light_normal.png
rename to java/res/drawable-hdpi/ic_emoji_nature_normal_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_objects_light_activated.png b/java/res/drawable-hdpi/ic_emoji_objects_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_objects_light_activated.png
rename to java/res/drawable-hdpi/ic_emoji_objects_activated_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_objects_light_normal.png b/java/res/drawable-hdpi/ic_emoji_objects_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_objects_light_normal.png
rename to java/res/drawable-hdpi/ic_emoji_objects_normal_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_people_light_activated.png b/java/res/drawable-hdpi/ic_emoji_people_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_people_light_activated.png
rename to java/res/drawable-hdpi/ic_emoji_people_activated_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_people_light_normal.png b/java/res/drawable-hdpi/ic_emoji_people_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_people_light_normal.png
rename to java/res/drawable-hdpi/ic_emoji_people_normal_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_places_light_activated.png b/java/res/drawable-hdpi/ic_emoji_places_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_places_light_activated.png
rename to java/res/drawable-hdpi/ic_emoji_places_activated_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_places_light_normal.png b/java/res/drawable-hdpi/ic_emoji_places_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_places_light_normal.png
rename to java/res/drawable-hdpi/ic_emoji_places_normal_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_recent_light_activated.png b/java/res/drawable-hdpi/ic_emoji_recent_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_recent_light_activated.png
rename to java/res/drawable-hdpi/ic_emoji_recent_activated_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_recent_light_normal.png b/java/res/drawable-hdpi/ic_emoji_recent_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_recent_light_normal.png
rename to java/res/drawable-hdpi/ic_emoji_recent_normal_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_symbols_light_activated.png b/java/res/drawable-hdpi/ic_emoji_symbols_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_symbols_light_activated.png
rename to java/res/drawable-hdpi/ic_emoji_symbols_activated_holo_dark.png
diff --git a/java/res/drawable-hdpi/ic_emoji_symbols_light_normal.png b/java/res/drawable-hdpi/ic_emoji_symbols_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-hdpi/ic_emoji_symbols_light_normal.png
rename to java/res/drawable-hdpi/ic_emoji_symbols_normal_holo_dark.png
diff --git a/java/res/drawable-mdpi/tab_selected.9.png b/java/res/drawable-mdpi/emoji_category_tab_selected_holo_dark.9.png
similarity index 100%
rename from java/res/drawable-mdpi/tab_selected.9.png
rename to java/res/drawable-mdpi/emoji_category_tab_selected_holo_dark.9.png
diff --git a/java/res/drawable-mdpi/tab_unselected.9.png b/java/res/drawable-mdpi/emoji_category_tab_unselected_holo_dark.9.png
similarity index 100%
rename from java/res/drawable-mdpi/tab_unselected.9.png
rename to java/res/drawable-mdpi/emoji_category_tab_unselected_holo_dark.9.png
diff --git a/java/res/drawable-mdpi/ic_emoji_nature_light_activated.png b/java/res/drawable-mdpi/ic_emoji_nature_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_nature_light_activated.png
rename to java/res/drawable-mdpi/ic_emoji_nature_activated_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_nature_light_normal.png b/java/res/drawable-mdpi/ic_emoji_nature_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_nature_light_normal.png
rename to java/res/drawable-mdpi/ic_emoji_nature_normal_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_objects_light_activated.png b/java/res/drawable-mdpi/ic_emoji_objects_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_objects_light_activated.png
rename to java/res/drawable-mdpi/ic_emoji_objects_activated_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_objects_light_normal.png b/java/res/drawable-mdpi/ic_emoji_objects_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_objects_light_normal.png
rename to java/res/drawable-mdpi/ic_emoji_objects_normal_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_people_light_activated.png b/java/res/drawable-mdpi/ic_emoji_people_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_people_light_activated.png
rename to java/res/drawable-mdpi/ic_emoji_people_activated_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_people_light_normal.png b/java/res/drawable-mdpi/ic_emoji_people_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_people_light_normal.png
rename to java/res/drawable-mdpi/ic_emoji_people_normal_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_places_light_activated.png b/java/res/drawable-mdpi/ic_emoji_places_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_places_light_activated.png
rename to java/res/drawable-mdpi/ic_emoji_places_activated_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_places_light_normal.png b/java/res/drawable-mdpi/ic_emoji_places_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_places_light_normal.png
rename to java/res/drawable-mdpi/ic_emoji_places_normal_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_recent_light_activated.png b/java/res/drawable-mdpi/ic_emoji_recent_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_recent_light_activated.png
rename to java/res/drawable-mdpi/ic_emoji_recent_activated_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_recent_light_normal.png b/java/res/drawable-mdpi/ic_emoji_recent_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_recent_light_normal.png
rename to java/res/drawable-mdpi/ic_emoji_recent_normal_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_symbols_light_activated.png b/java/res/drawable-mdpi/ic_emoji_symbols_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_symbols_light_activated.png
rename to java/res/drawable-mdpi/ic_emoji_symbols_activated_holo_dark.png
diff --git a/java/res/drawable-mdpi/ic_emoji_symbols_light_normal.png b/java/res/drawable-mdpi/ic_emoji_symbols_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-mdpi/ic_emoji_symbols_light_normal.png
rename to java/res/drawable-mdpi/ic_emoji_symbols_normal_holo_dark.png
diff --git a/java/res/drawable-xhdpi/tab_selected.9.png b/java/res/drawable-xhdpi/emoji_category_tab_selected_holo_dark.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/tab_selected.9.png
rename to java/res/drawable-xhdpi/emoji_category_tab_selected_holo_dark.9.png
diff --git a/java/res/drawable-xhdpi/tab_unselected.9.png b/java/res/drawable-xhdpi/emoji_category_tab_unselected_holo_dark.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/tab_unselected.9.png
rename to java/res/drawable-xhdpi/emoji_category_tab_unselected_holo_dark.9.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_nature_light_activated.png b/java/res/drawable-xhdpi/ic_emoji_nature_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_nature_light_activated.png
rename to java/res/drawable-xhdpi/ic_emoji_nature_activated_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_nature_light_normal.png b/java/res/drawable-xhdpi/ic_emoji_nature_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_nature_light_normal.png
rename to java/res/drawable-xhdpi/ic_emoji_nature_normal_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_objects_light_activated.png b/java/res/drawable-xhdpi/ic_emoji_objects_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_objects_light_activated.png
rename to java/res/drawable-xhdpi/ic_emoji_objects_activated_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_objects_light_normal.png b/java/res/drawable-xhdpi/ic_emoji_objects_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_objects_light_normal.png
rename to java/res/drawable-xhdpi/ic_emoji_objects_normal_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_people_light_activated.png b/java/res/drawable-xhdpi/ic_emoji_people_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_people_light_activated.png
rename to java/res/drawable-xhdpi/ic_emoji_people_activated_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_people_light_normal.png b/java/res/drawable-xhdpi/ic_emoji_people_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_people_light_normal.png
rename to java/res/drawable-xhdpi/ic_emoji_people_normal_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_places_light_activated.png b/java/res/drawable-xhdpi/ic_emoji_places_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_places_light_activated.png
rename to java/res/drawable-xhdpi/ic_emoji_places_activated_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_places_light_normal.png b/java/res/drawable-xhdpi/ic_emoji_places_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_places_light_normal.png
rename to java/res/drawable-xhdpi/ic_emoji_places_normal_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_recent_light_activated.png b/java/res/drawable-xhdpi/ic_emoji_recent_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_recent_light_activated.png
rename to java/res/drawable-xhdpi/ic_emoji_recent_activated_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_recent_light_normal.png b/java/res/drawable-xhdpi/ic_emoji_recent_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_recent_light_normal.png
rename to java/res/drawable-xhdpi/ic_emoji_recent_normal_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_symbols_light_activated.png b/java/res/drawable-xhdpi/ic_emoji_symbols_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_symbols_light_activated.png
rename to java/res/drawable-xhdpi/ic_emoji_symbols_activated_holo_dark.png
diff --git a/java/res/drawable-xhdpi/ic_emoji_symbols_light_normal.png b/java/res/drawable-xhdpi/ic_emoji_symbols_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xhdpi/ic_emoji_symbols_light_normal.png
rename to java/res/drawable-xhdpi/ic_emoji_symbols_normal_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/tab_selected.9.png b/java/res/drawable-xxhdpi/emoji_category_tab_selected_holo_dark.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/tab_selected.9.png
rename to java/res/drawable-xxhdpi/emoji_category_tab_selected_holo_dark.9.png
diff --git a/java/res/drawable-xxhdpi/tab_unselected.9.png b/java/res/drawable-xxhdpi/emoji_category_tab_unselected_holo_dark.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/tab_unselected.9.png
rename to java/res/drawable-xxhdpi/emoji_category_tab_unselected_holo_dark.9.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_nature_light_activated.png b/java/res/drawable-xxhdpi/ic_emoji_nature_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_nature_light_activated.png
rename to java/res/drawable-xxhdpi/ic_emoji_nature_activated_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_nature_light_normal.png b/java/res/drawable-xxhdpi/ic_emoji_nature_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_nature_light_normal.png
rename to java/res/drawable-xxhdpi/ic_emoji_nature_normal_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_objects_light_activated.png b/java/res/drawable-xxhdpi/ic_emoji_objects_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_objects_light_activated.png
rename to java/res/drawable-xxhdpi/ic_emoji_objects_activated_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_objects_light_normal.png b/java/res/drawable-xxhdpi/ic_emoji_objects_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_objects_light_normal.png
rename to java/res/drawable-xxhdpi/ic_emoji_objects_normal_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_people_light_activated.png b/java/res/drawable-xxhdpi/ic_emoji_people_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_people_light_activated.png
rename to java/res/drawable-xxhdpi/ic_emoji_people_activated_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_people_light_normal.png b/java/res/drawable-xxhdpi/ic_emoji_people_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_people_light_normal.png
rename to java/res/drawable-xxhdpi/ic_emoji_people_normal_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_places_light_activated.png b/java/res/drawable-xxhdpi/ic_emoji_places_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_places_light_activated.png
rename to java/res/drawable-xxhdpi/ic_emoji_places_activated_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_places_light_normal.png b/java/res/drawable-xxhdpi/ic_emoji_places_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_places_light_normal.png
rename to java/res/drawable-xxhdpi/ic_emoji_places_normal_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_recent_light_activated.png b/java/res/drawable-xxhdpi/ic_emoji_recent_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_recent_light_activated.png
rename to java/res/drawable-xxhdpi/ic_emoji_recent_activated_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_recent_light_normal.png b/java/res/drawable-xxhdpi/ic_emoji_recent_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_recent_light_normal.png
rename to java/res/drawable-xxhdpi/ic_emoji_recent_normal_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_symbols_light_activated.png b/java/res/drawable-xxhdpi/ic_emoji_symbols_activated_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_symbols_light_activated.png
rename to java/res/drawable-xxhdpi/ic_emoji_symbols_activated_holo_dark.png
diff --git a/java/res/drawable-xxhdpi/ic_emoji_symbols_light_normal.png b/java/res/drawable-xxhdpi/ic_emoji_symbols_normal_holo_dark.png
similarity index 100%
rename from java/res/drawable-xxhdpi/ic_emoji_symbols_light_normal.png
rename to java/res/drawable-xxhdpi/ic_emoji_symbols_normal_holo_dark.png
diff --git a/java/res/drawable/ic_emoji_nature_light.xml b/java/res/drawable/ic_emoji_nature_holo_dark.xml
similarity index 74%
rename from java/res/drawable/ic_emoji_nature_light.xml
rename to java/res/drawable/ic_emoji_nature_holo_dark.xml
index 543409e03..b94629580 100644
--- a/java/res/drawable/ic_emoji_nature_light.xml
+++ b/java/res/drawable/ic_emoji_nature_holo_dark.xml
@@ -21,13 +21,13 @@
+ android:drawable="@drawable/ic_emoji_nature_activated_holo_dark" />
+ android:drawable="@drawable/ic_emoji_nature_activated_holo_dark" />
+ android:drawable="@drawable/ic_emoji_nature_activated_holo_dark" />
+ android:drawable="@drawable/ic_emoji_nature_normal_holo_dark" />
diff --git a/java/res/drawable/ic_emoji_objects_holo_dark.xml b/java/res/drawable/ic_emoji_objects_holo_dark.xml
new file mode 100644
index 000000000..266e81e0b
--- /dev/null
+++ b/java/res/drawable/ic_emoji_objects_holo_dark.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
diff --git a/java/res/drawable/ic_emoji_places_light.xml b/java/res/drawable/ic_emoji_people_holo_dark.xml
similarity index 74%
rename from java/res/drawable/ic_emoji_places_light.xml
rename to java/res/drawable/ic_emoji_people_holo_dark.xml
index 312cad9c3..15955d261 100644
--- a/java/res/drawable/ic_emoji_places_light.xml
+++ b/java/res/drawable/ic_emoji_people_holo_dark.xml
@@ -21,12 +21,12 @@
+ android:drawable="@drawable/ic_emoji_people_activated_holo_dark" />
+ android:drawable="@drawable/ic_emoji_people_activated_holo_dark" />
-
+ android:drawable="@drawable/ic_emoji_people_activated_holo_dark" />
+
diff --git a/java/res/drawable/ic_emoji_people_light.xml b/java/res/drawable/ic_emoji_places_holo_dark.xml
similarity index 74%
rename from java/res/drawable/ic_emoji_people_light.xml
rename to java/res/drawable/ic_emoji_places_holo_dark.xml
index ea9e406a4..260bbd843 100644
--- a/java/res/drawable/ic_emoji_people_light.xml
+++ b/java/res/drawable/ic_emoji_places_holo_dark.xml
@@ -21,12 +21,12 @@
+ android:drawable="@drawable/ic_emoji_places_activated_holo_dark" />
+ android:drawable="@drawable/ic_emoji_places_activated_holo_dark" />
-
+ android:drawable="@drawable/ic_emoji_places_activated_holo_dark" />
+
diff --git a/java/res/drawable/ic_emoji_objects_light.xml b/java/res/drawable/ic_emoji_recent_holo_dark.xml
similarity index 74%
rename from java/res/drawable/ic_emoji_objects_light.xml
rename to java/res/drawable/ic_emoji_recent_holo_dark.xml
index 4096e695b..225caeb2b 100644
--- a/java/res/drawable/ic_emoji_objects_light.xml
+++ b/java/res/drawable/ic_emoji_recent_holo_dark.xml
@@ -21,12 +21,12 @@
+ android:drawable="@drawable/ic_emoji_recent_activated_holo_dark" />
+ android:drawable="@drawable/ic_emoji_recent_activated_holo_dark" />
-
+ android:drawable="@drawable/ic_emoji_recent_activated_holo_dark" />
+
diff --git a/java/res/drawable/ic_emoji_recent_light.xml b/java/res/drawable/ic_emoji_recent_light.xml
deleted file mode 100644
index 8c2123f83..000000000
--- a/java/res/drawable/ic_emoji_recent_light.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/java/res/drawable/ic_emoji_symbols_holo_dark.xml b/java/res/drawable/ic_emoji_symbols_holo_dark.xml
new file mode 100644
index 000000000..831d6594b
--- /dev/null
+++ b/java/res/drawable/ic_emoji_symbols_holo_dark.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
diff --git a/java/res/drawable/ic_emoji_symbols_light.xml b/java/res/drawable/ic_emoji_symbols_light.xml
deleted file mode 100644
index 79aaf0fc5..000000000
--- a/java/res/drawable/ic_emoji_symbols_light.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml
index 761887168..8cff503e4 100644
--- a/java/res/layout/emoji_palettes_view.xml
+++ b/java/res/layout/emoji_palettes_view.xml
@@ -41,11 +41,11 @@
android:id="@android:id/tabs"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/tab_selected"
+ android:background="@drawable/emoji_category_tab_selected_holo_dark"
android:divider="@null"
android:tabStripEnabled="true"
- android:tabStripLeft="@drawable/tab_unselected"
- android:tabStripRight="@drawable/tab_unselected" />
+ android:tabStripLeft="@drawable/emoji_category_tab_unselected_holo_dark"
+ android:tabStripRight="@drawable/emoji_category_tab_unselected_holo_dark" />
+ android:background="@color/emoji_category_page_id_background_holo" />
@android:color/holo_blue_light
@android:color/background_light
#FFCCCCCC
- #FF000000
- #80FFFFFF
+ #FF000000
+ #80FFFFFF
#00000000
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java
index dd0e3e838..495fa554b 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java
+++ b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java
@@ -70,12 +70,12 @@ final class EmojiCategory {
"emoticons" };
private static final int[] sCategoryIcon = {
- R.drawable.ic_emoji_recent_light,
- R.drawable.ic_emoji_people_light,
- R.drawable.ic_emoji_objects_light,
- R.drawable.ic_emoji_nature_light,
- R.drawable.ic_emoji_places_light,
- R.drawable.ic_emoji_symbols_light,
+ R.drawable.ic_emoji_recent_holo_dark,
+ R.drawable.ic_emoji_people_holo_dark,
+ R.drawable.ic_emoji_objects_holo_dark,
+ R.drawable.ic_emoji_nature_holo_dark,
+ R.drawable.ic_emoji_places_holo_dark,
+ R.drawable.ic_emoji_symbols_holo_dark,
0 };
private static final String[] sCategoryLabel =
diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java
index 74cfd9b4b..f5aa1079e 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java
+++ b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategoryPageIndicatorView.java
@@ -38,7 +38,7 @@ public final class EmojiCategoryPageIndicatorView extends LinearLayout {
public EmojiCategoryPageIndicatorView(final Context context, final AttributeSet attrs) {
super(context, attrs);
mPaint.setColor(context.getResources().getColor(
- R.color.emoji_category_page_id_view_foreground));
+ R.color.emoji_category_page_id_foreground_holo));
}
public void setCategoryPageId(final int size, final int id, final float offset) {