diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2f6073a..9b05983 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -61,6 +61,7 @@ tasks {
 dependencies {
 
     val lifecycleVersion = "2.3.0-alpha07"
+    val emojiCompatVersion = "1.2.0-alpha01"
     val roomVersion = "2.3.0-alpha02"
     val okHttpVersion = "4.8.1"
     val retrofitVersion = "2.9.0"
@@ -84,7 +85,8 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
     implementation("androidx.preference:preference:1.1.1")
-    implementation("androidx.emoji:emoji-bundled:1.2.0-alpha01")
+    implementation("androidx.emoji:emoji-bundled:$emojiCompatVersion")
+    implementation("androidx.emoji:emoji-appcompat:$emojiCompatVersion")
     implementation("androidx.paging:paging-runtime-ktx:3.0.0-alpha06")
     implementation("androidx.viewpager2:viewpager2:1.0.0")
 
diff --git a/app/src/main/res/font/nunito_bold.ttf b/app/src/main/res/font/nunito_bold.ttf
index 4ce517a..d203733 100644
Binary files a/app/src/main/res/font/nunito_bold.ttf and b/app/src/main/res/font/nunito_bold.ttf differ
diff --git a/app/src/main/res/font/nunito_regular.ttf b/app/src/main/res/font/nunito_regular.ttf
index aafdc88..93a3f3e 100644
Binary files a/app/src/main/res/font/nunito_regular.ttf and b/app/src/main/res/font/nunito_regular.ttf differ
diff --git a/app/src/main/res/layout/item_account_selection.xml b/app/src/main/res/layout/item_account_selection.xml
index c6ce6d3..9c52146 100644
--- a/app/src/main/res/layout/item_account_selection.xml
+++ b/app/src/main/res/layout/item_account_selection.xml
@@ -1,54 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:background="@drawable/background_selectable"
-        xmlns:tools="http://schemas.android.com/tools">
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="8dp"
+    android:layout_marginTop="4dp"
+    android:layout_marginRight="8dp"
+    android:layout_marginBottom="4dp"
+    android:background="@drawable/background_selectable"
+    android:paddingLeft="8dp"
+    android:paddingTop="4dp"
+    android:paddingRight="8dp"
+    android:paddingBottom="4dp">
 
     <ImageView
-            android:id="@+id/accountAvatar"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:background="#f00"
-            app:layout_constraintTop_toTopOf="parent"/>
+        android:id="@+id/accountAvatar"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:background="#f00" />
 
-
-    <androidx.emoji.widget.EmojiTextView
-            android:id="@+id/accountDisplayName"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toEndOf="@id/accountAvatar"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginStart="16dp"
-
-            app:layout_constraintBottom_toTopOf="@id/accountName"
-            android:ellipsize="end"
-            tools:text="Conny Duck"
-            android:textStyle="bold"
-            app:layout_constraintTop_toTopOf="parent"
-            android:lines="1"/>
+    <androidx.emoji.widget.EmojiAppCompatTextView
+        android:id="@+id/accountDisplayName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:ellipsize="end"
+        android:lines="1"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/accountName"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/accountAvatar"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Conny Duck" />
 
     <TextView
-            android:id="@+id/accountName"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:layout_marginStart="16dp"
-            app:layout_constraintStart_toEndOf="@id/accountAvatar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/accountDisplayName"
-            tools:text="\@connyduck@pixelfed.social" />
-
+        android:id="@+id/accountName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:ellipsize="end"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/accountAvatar"
+        app:layout_constraintTop_toBottomOf="@id/accountDisplayName"
+        tools:text="\@connyduck@pixelfed.social" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_notification.xml b/app/src/main/res/layout/item_notification.xml
index 781ea4d..9b90b84 100644
--- a/app/src/main/res/layout/item_notification.xml
+++ b/app/src/main/res/layout/item_notification.xml
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:background="#f00" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji.widget.EmojiAppCompatTextView
         android:id="@+id/notificationText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_notification_follow.xml b/app/src/main/res/layout/item_notification_follow.xml
index b90cfba..2b9c5db 100644
--- a/app/src/main/res/layout/item_notification_follow.xml
+++ b/app/src/main/res/layout/item_notification_follow.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji.widget.EmojiAppCompatTextView
         android:id="@+id/notificationText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -27,7 +27,7 @@
         app:layout_constraintTop_toBottomOf="@id/notificationText"
         tools:background="#f00" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji.widget.EmojiAppCompatTextView
         android:id="@+id/notificationDisplayName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_profile_header.xml b/app/src/main/res/layout/item_profile_header.xml
index 2513fec..beb04a8 100644
--- a/app/src/main/res/layout/item_profile_header.xml
+++ b/app/src/main/res/layout/item_profile_header.xml
@@ -108,7 +108,7 @@
             app:layout_constraintTop_toBottomOf="@id/profileImage"
             tools:text="Hi I am a placeholder text" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji.widget.EmojiAppCompatTextView
             android:id="@+id/profileNote"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_reply.xml b/app/src/main/res/layout/item_reply.xml
index c2c693d..c653931 100644
--- a/app/src/main/res/layout/item_reply.xml
+++ b/app/src/main/res/layout/item_reply.xml
@@ -19,7 +19,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:background="#f00" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji.widget.EmojiAppCompatTextView
             android:id="@+id/postDisplayName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:text="\@connyduck\@chaos.social" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji.widget.EmojiAppCompatTextView
             android:id="@+id/postDescription"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 1c0ca27..9734fa0 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -19,7 +19,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:background="#f00" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji.widget.EmojiAppCompatTextView
         android:id="@+id/postDisplayName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -123,7 +123,7 @@
         app:layout_constraintStart_toEndOf="@id/postReplyButton"
         app:layout_constraintTop_toTopOf="@id/postReplyButton" />
 
-    <androidx.emoji.widget.EmojiTextView
+    <androidx.emoji.widget.EmojiAppCompatTextView
         android:id="@+id/postDescription"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"