diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 575ec38..70eea7e 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_XL_Edited_API_30.avd" />
+            <value value="$USER_HOME$/.android/avd/Nexus_5_API_24.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-05-22T20:38:24.790448Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-05-23T11:55:33.184891Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2b51ab3..c7d7f7f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,9 @@
         <entry key="app/src/main/res/layout/row_title.xml" value="0.234375" />
         <entry key="app/src/main/res/layout/view_emoji_bottom_sheet.xml" value="0.234375" />
         <entry key="app/src/main/res/layout/view_emoji_category.xml" value="0.234375" />
-        <entry key="emojidialog/src/main/res/layout/view_emoji_category.xml" value="0.11614583333333334" />
+        <entry key="emojidialog/src/main/res/layout/fragment_emoji.xml" value="0.21927083333333333" />
+        <entry key="emojidialog/src/main/res/layout/row_emoji.xml" value="0.21927083333333333" />
+        <entry key="emojidialog/src/main/res/layout/view_emoji_bottom_sheet.xml" value="0.21927083333333333" />
       </map>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 79f3ba2..ee6d360 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,7 +48,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    implementation("androidx.emoji:emoji:1.1.0")
-    implementation("androidx.emoji:emoji-appcompat:1.1.0")
-    implementation("androidx.emoji:emoji-bundled:1.1.0")
+    def emojiVersion = "1.2.0-alpha03"
+    implementation("androidx.emoji:emoji:$emojiVersion")
+    implementation("androidx.emoji:emoji-appcompat:$emojiVersion")
+    implementation("androidx.emoji:emoji-bundled:$emojiVersion")
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d248797..cc4ee15 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,9 +21,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="256dp"
+        android:textSize="28sp"
         android:textAppearance="@style/EmojiBottomSheet.TextAppearance.Body1"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="\uD83C\uDF44" />
diff --git a/emojidialog/build.gradle b/emojidialog/build.gradle
index aa46cc6..e86aabe 100644
--- a/emojidialog/build.gradle
+++ b/emojidialog/build.gradle
@@ -43,7 +43,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    implementation("androidx.emoji:emoji:1.1.0")
-    implementation("androidx.emoji:emoji-appcompat:1.1.0")
-    implementation("androidx.emoji:emoji-bundled:1.1.0")
+    def emojiVersion = "1.2.0-alpha03"
+    implementation("androidx.emoji:emoji:$emojiVersion")
+    implementation("androidx.emoji:emoji-appcompat:$emojiVersion")
+    implementation("androidx.emoji:emoji-bundled:$emojiVersion")
 }
\ No newline at end of file
diff --git a/emojidialog/src/main/java/com/haider/emojidialog/emoji/EmojiCategoryTransformer.kt b/emojidialog/src/main/java/com/haider/emojidialog/emoji/EmojiCategoryTransformer.kt
index bdecefd..3dff595 100644
--- a/emojidialog/src/main/java/com/haider/emojidialog/emoji/EmojiCategoryTransformer.kt
+++ b/emojidialog/src/main/java/com/haider/emojidialog/emoji/EmojiCategoryTransformer.kt
@@ -5,17 +5,17 @@ import com.haider.emojidialog.view.recyclerview.EmojiItemView
 
 class EmojiCategoryTransformer {
 
-    fun transform(category: Category): List<com.haider.emojidialog.view.recyclerview.EmojiItemView> = transformCategoryToEmojiItems(category).filter {
-        com.haider.emojidialog.emoji.EmojiCompatUtils.hasEmojiGlyph(it.unicode)
-//        true
+    fun transform(category: Category): List<EmojiItemView> = transformCategoryToEmojiItems(category).filter {
+//        EmojiCompatUtils.hasEmojiGlyph(it.unicode)
+        true
     }
 
-    private fun transformCategoryToEmojiItems(category: Category): List<com.haider.emojidialog.view.recyclerview.EmojiItemView> {
-        val list: MutableList<com.haider.emojidialog.view.recyclerview.EmojiItemView> = mutableListOf()
+    private fun transformCategoryToEmojiItems(category: Category): List<EmojiItemView> {
+        val list: MutableList<EmojiItemView> = mutableListOf()
 
         list.apply {
             category.categoryUnicode.forEach {
-                list.add(com.haider.emojidialog.view.recyclerview.EmojiItemView.createEmojiViewItem(it.unicode, it.name))
+                list.add(EmojiItemView.createEmojiViewItem(it.unicode, it.name))
             }
         }
 
diff --git a/emojidialog/src/main/res/layout/fragment_emoji.xml b/emojidialog/src/main/res/layout/fragment_emoji.xml
index 2ff7bb6..bef2c22 100644
--- a/emojidialog/src/main/res/layout/fragment_emoji.xml
+++ b/emojidialog/src/main/res/layout/fragment_emoji.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/ll_emoji_category_view_container"
     android:layout_width="match_parent"
@@ -11,34 +10,8 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerViewEmojis"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/dim_16"
+            android:layout_height="230dp"
+            android:padding="@dimen/dim_8"
             tools:listitem="@layout/row_emoji" />
 
-    </LinearLayout>
-
-    <!--<?xml version="1.0" encoding="utf-8"?>-->
-<!--<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"-->
-<!--    xmlns:app="http://schemas.android.com/apk/res-auto"-->
-<!--    xmlns:tools="http://schemas.android.com/tools"-->
-<!--    android:id="@+id/view_help_bottom_sheet"-->
-<!--    android:layout_width="match_parent"-->
-<!--    android:layout_height="wrap_content"-->
-<!--    android:background="@color/white">-->
-
-<!--    <LinearLayout-->
-<!--        android:id="@+id/ll_emoji_category_view_container"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:orientation="vertical"-->
-<!--        app:layout_behavior="android.support.design.widget.BottomSheetBehavior">-->
-
-<!--        <androidx.recyclerview.widget.RecyclerView-->
-<!--            android:id="@+id/recyclerViewEmojis"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:padding="@dimen/dim_16"-->
-<!--            tools:listitem="@layout/row_emoji" />-->
-
-<!--    </LinearLayout>-->
-<!--</androidx.core.widget.NestedScrollView>-->
+    </LinearLayout>
\ No newline at end of file
diff --git a/emojidialog/src/main/res/layout/row_emoji.xml b/emojidialog/src/main/res/layout/row_emoji.xml
index 9f0c3a5..30ba3d7 100644
--- a/emojidialog/src/main/res/layout/row_emoji.xml
+++ b/emojidialog/src/main/res/layout/row_emoji.xml
@@ -4,7 +4,8 @@
     android:id="@+id/etv_emoji"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/dim_16"
+    android:layout_margin="4dp"
+    android:paddingBottom="@dimen/dim_8"
     android:textColor="@color/colorPrimary"
-    android:textSize="@dimen/emoji_size"
+    android:textSize="28sp"
     tools:text="\uD83C\uDF44" />
diff --git a/emojidialog/src/main/res/layout/view_emoji_bottom_sheet.xml b/emojidialog/src/main/res/layout/view_emoji_bottom_sheet.xml
index 0ebc6f1..d6adf23 100644
--- a/emojidialog/src/main/res/layout/view_emoji_bottom_sheet.xml
+++ b/emojidialog/src/main/res/layout/view_emoji_bottom_sheet.xml
@@ -15,7 +15,7 @@
             android:id="@+id/emoji_titles_tab"
             android:layout_width="match_parent"
             android:layout_height="?android:actionBarSize"
-            app:tabMode="scrollable"
+            app:tabMode="fixed"
             android:background="@color/background_color"
             app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
             app:tabIndicatorColor="@color/tab_indicator_color"
diff --git a/emojidialog/src/main/res/values/dimens.xml b/emojidialog/src/main/res/values/dimens.xml
index 7130beb..d4fcdf5 100644
--- a/emojidialog/src/main/res/values/dimens.xml
+++ b/emojidialog/src/main/res/values/dimens.xml
@@ -9,7 +9,7 @@
     <dimen name="dim_25">25dp</dimen>
     <dimen name="dim_40">40dp</dimen>
 
-    <dimen name="emoji_size">20sp</dimen>
+    <dimen name="emoji_size">28sp</dimen>
     <dimen name="text_plain">14sp</dimen>
     <dimen name="text_h1_size">96sp</dimen>
     <dimen name="text_h2_size">64sp</dimen>