diff --git a/app/src/main/kotlin/com/vanniktech/emoji/sample/MainActivity.kt b/app/src/main/kotlin/com/vanniktech/emoji/sample/MainActivity.kt
index a7a65ce87b..c4d1e54d59 100644
--- a/app/src/main/kotlin/com/vanniktech/emoji/sample/MainActivity.kt
+++ b/app/src/main/kotlin/com/vanniktech/emoji/sample/MainActivity.kt
@@ -76,7 +76,7 @@ class MainActivity : AppCompatActivity() {
       onEmojiClickListener = { emoji -> Timber.d(TAG, "Clicked on Emoji " + emoji.unicode) },
       onEmojiPopupShownListener = { binding.chatEmoji.setImageResource(R.drawable.ic_keyboard) },
       onSoftKeyboardOpenListener = { px -> Timber.d(TAG, "Opened soft keyboard with height $px") },
-      onEmojiPopupDismissListener = { binding.chatEmoji.setImageResource(R.drawable.emoji_ios_category_smileysandpeople) },
+      onEmojiPopupDismissListener = { binding.chatEmoji.setImageResource(R.drawable.ic_emojis) },
       onSoftKeyboardCloseListener = { Timber.d(TAG, "Closed soft keyboard") },
       keyboardAnimationStyle = R.style.emoji_fade_animation_style,
       pageTransformer = PageTransformer(),
diff --git a/app/src/main/kotlin/com/vanniktech/emoji/sample/MainDialog.kt b/app/src/main/kotlin/com/vanniktech/emoji/sample/MainDialog.kt
index c129336f30..fd3ce923c8 100644
--- a/app/src/main/kotlin/com/vanniktech/emoji/sample/MainDialog.kt
+++ b/app/src/main/kotlin/com/vanniktech/emoji/sample/MainDialog.kt
@@ -61,7 +61,7 @@ class MainDialog : DialogFragment() {
       onEmojiClickListener = { emoji: Emoji -> Timber.d(TAG, "Clicked on Emoji " + emoji.unicode) },
       onEmojiPopupShownListener = { emojiButton.setImageResource(R.drawable.ic_keyboard) },
       onSoftKeyboardOpenListener = { px -> Timber.d(TAG, "Opened soft keyboard with height $px") },
-      onEmojiPopupDismissListener = { emojiButton.setImageResource(R.drawable.emoji_ios_category_smileysandpeople) },
+      onEmojiPopupDismissListener = { emojiButton.setImageResource(R.drawable.ic_emojis) },
       onSoftKeyboardCloseListener = { Timber.d(TAG, "Closed soft keyboard") },
       keyboardAnimationStyle = R.style.emoji_fade_animation_style,
     )
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 4a2a3fa296..e15f9a7d49 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_emojis.xml b/app/src/main/res/drawable/ic_emojis.xml
new file mode 100644
index 0000000000..86b99d15b3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_emojis.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM15.5,11c0.83,0 1.5,-0.67 1.5,-1.5S16.33,8 15.5,8 14,8.67 14,9.5s0.67,1.5 1.5,1.5zM8.5,11c0.83,0 1.5,-0.67 1.5,-1.5S9.33,8 8.5,8 7,8.67 7,9.5 7.67,11 8.5,11zM12,17.5c2.33,0 4.31,-1.46 5.11,-3.5L6.89,14c0.8,2.04 2.78,3.5 5.11,3.5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard.xml b/app/src/main/res/drawable/ic_keyboard.xml
index bdc865f0e0..a870386d46 100644
--- a/app/src/main/res/drawable/ic_keyboard.xml
+++ b/app/src/main/res/drawable/ic_keyboard.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
index 00c668c60b..0fbe431291 100644
--- a/app/src/main/res/drawable/ic_send.xml
+++ b/app/src/main/res/drawable/ic_send.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 343f6a7c90..dbd55f46cc 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -94,7 +94,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="12dp"
         android:scaleType="centerCrop"
-        app:srcCompat="@drawable/emoji_ios_category_smileysandpeople"
+        app:srcCompat="@drawable/ic_emojis"
         tools:ignore="ContentDescription"
         />
     <com.vanniktech.emoji.EmojiEditText
diff --git a/app/src/main/res/layout/dialog_main.xml b/app/src/main/res/layout/dialog_main.xml
index 74296c4f26..c9dfb43aba 100644
--- a/app/src/main/res/layout/dialog_main.xml
+++ b/app/src/main/res/layout/dialog_main.xml
@@ -30,7 +30,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="12dp"
         android:scaleType="centerCrop"
-        app:srcCompat="@drawable/emoji_ios_category_smileysandpeople"
+        app:srcCompat="@drawable/ic_emojis"
         tools:ignore="ContentDescription"
         />
     <EditText
diff --git a/emoji-facebook/src/main/res/values/public.xml b/emoji-facebook/src/main/res/values/public.xml
new file mode 100644
index 0000000000..379be515be
--- /dev/null
+++ b/emoji-facebook/src/main/res/values/public.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <public />
+</resources>
diff --git a/emoji-google-compat/src/main/res/values/public.xml b/emoji-google-compat/src/main/res/values/public.xml
new file mode 100644
index 0000000000..379be515be
--- /dev/null
+++ b/emoji-google-compat/src/main/res/values/public.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <public />
+</resources>
diff --git a/emoji-google/src/main/res/values/public.xml b/emoji-google/src/main/res/values/public.xml
new file mode 100644
index 0000000000..379be515be
--- /dev/null
+++ b/emoji-google/src/main/res/values/public.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <public />
+</resources>
diff --git a/emoji-ios/src/main/res/values/public.xml b/emoji-ios/src/main/res/values/public.xml
new file mode 100644
index 0000000000..379be515be
--- /dev/null
+++ b/emoji-ios/src/main/res/values/public.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <public />
+</resources>
diff --git a/emoji-material/src/main/res/values/public.xml b/emoji-material/src/main/res/values/public.xml
new file mode 100644
index 0000000000..379be515be
--- /dev/null
+++ b/emoji-material/src/main/res/values/public.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <public />
+</resources>
diff --git a/emoji-twitter/src/main/res/values/public.xml b/emoji-twitter/src/main/res/values/public.xml
new file mode 100644
index 0000000000..379be515be
--- /dev/null
+++ b/emoji-twitter/src/main/res/values/public.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <public />
+</resources>
diff --git a/emoji/src/main/res/drawable/emoji_backspace.xml b/emoji/src/main/res/drawable/emoji_backspace.xml
index 1cb82c50d5..e9c767c54d 100644
--- a/emoji/src/main/res/drawable/emoji_backspace.xml
+++ b/emoji/src/main/res/drawable/emoji_backspace.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:autoMirrored="true"
     android:height="24dp"
diff --git a/emoji/src/main/res/drawable/emoji_recent.xml b/emoji/src/main/res/drawable/emoji_recent.xml
index 52f9412e7f..94beacfcf3 100644
--- a/emoji/src/main/res/drawable/emoji_recent.xml
+++ b/emoji/src/main/res/drawable/emoji_recent.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
diff --git a/emoji/src/main/res/drawable/emoji_search.xml b/emoji/src/main/res/drawable/emoji_search.xml
index 7f7a3d51ac..802b1433f8 100644
--- a/emoji/src/main/res/drawable/emoji_search.xml
+++ b/emoji/src/main/res/drawable/emoji_search.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
diff --git a/emoji/src/main/res/values/dimens.xml b/emoji/src/main/res/values/dimens.xml
index b2b003d8b5..38b2cf60e3 100644
--- a/emoji/src/main/res/values/dimens.xml
+++ b/emoji/src/main/res/values/dimens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="emoji_grid_view_column_width">36dp</dimen>
-    <dimen name="emoji_grid_view_spacing">6dp</dimen>
-    <dimen name="emoji_search_spacing">16dp</dimen>
-    <dimen name="emoji_search_max_height">300dp</dimen>
+  <dimen name="emoji_grid_view_column_width">36dp</dimen>
+  <dimen name="emoji_grid_view_spacing">6dp</dimen>
+  <dimen name="emoji_search_spacing">16dp</dimen>
+  <dimen name="emoji_search_max_height">300dp</dimen>
 </resources>
diff --git a/emoji/src/main/res/values/public.xml b/emoji/src/main/res/values/public.xml
new file mode 100644
index 0000000000..be823d290d
--- /dev/null
+++ b/emoji/src/main/res/values/public.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <public name="emoji_fade_animation_style" type="style" />
+</resources>
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_1.png
index 30978ad7b0..a2daa28437 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_1.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_2.png
index 5fde36ff75..66eb8e36ed 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_2.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_2.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_3.png
index a1624b2b71..aa972c96b2 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_3.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/twitter_3.png differ