diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 4bc8fd300..32c620f3e 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -34,7 +34,7 @@
         <activity
             android:name=".ui.activities.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"
+            android:theme="@style/MainAppTheme"
             android:windowSoftInputMode="stateHidden|adjustResize">
             <nav-graph android:value="@navigation/navigation" />
             <intent-filter>
diff --git a/Habitica/res/drawable/activity_launch_background.xml b/Habitica/res/drawable/activity_launch_background.xml
new file mode 100644
index 000000000..4b12dee0b
--- /dev/null
+++ b/Habitica/res/drawable/activity_launch_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:drawable="@color/brand_100"/>
+
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@drawable/login_logo"/>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_challenge_detail.xml b/Habitica/res/layout/activity_challenge_detail.xml
index be6a29233..586245cbe 100644
--- a/Habitica/res/layout/activity_challenge_detail.xml
+++ b/Habitica/res/layout/activity_challenge_detail.xml
@@ -10,8 +10,7 @@
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true"
-        android:gravity="center">
+                android:gravity="center">
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/main_content"
@@ -52,8 +51,7 @@
 
                         android:layout_marginTop="?attr/actionBarSize"
                         android:adjustViewBounds="true"
-                        android:fitsSystemWindows="true"
-                        android:focusable="true"
+                                                android:focusable="true"
                         android:focusableInTouchMode="true"
                         android:orientation="vertical"
                         app:layout_collapseMode="parallax">
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index 83f9be0e1..01fb72434 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -30,7 +30,6 @@
                     android:layout_marginTop="5dp"
                     android:adjustViewBounds="true"
                     android:background="@color/transparent"
-                    android:fitsSystemWindows="true"
                     android:focusable="true"
                     android:focusableInTouchMode="true"
                     android:orientation="vertical">
diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml
index 98744addc..83b64c701 100644
--- a/Habitica/res/layout/activity_gem_purchase.xml
+++ b/Habitica/res/layout/activity_gem_purchase.xml
@@ -9,8 +9,7 @@
             android:id="@+id/drawer_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fitsSystemWindows="true"
-            android:gravity="center">
+                        android:gravity="center">
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
                 android:id="@+id/main_content"
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index 8428a5cd6..6cf2232cb 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -10,8 +10,7 @@
         android:layout_height="match_parent" />
     <RelativeLayout
         android:orientation="vertical" android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
+        android:layout_height="match_parent">
         <com.viewpagerindicator.IconPageIndicator
             android:id="@+id/view_pager_indicator"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 425637fff..5aa793042 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -10,8 +10,7 @@
         android:layout_height="match_parent"
         android:id="@+id/background_container"
         android:scrollIndicators="none"
-        android:scrollbars="none"
-        >
+        android:scrollbars="none">
 
         <com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView
             android:id="@+id/background_view"
@@ -67,8 +66,7 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
+        android:layout_height="match_parent">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -78,8 +76,7 @@
             android:id="@+id/login_intro_view"
             android:orientation="vertical"
             android:background="@color/transparent"
-            android:fitsSystemWindows="true"
-            >
+                        >
 
             <ImageView
                 android:id="@+id/logo_view"
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index 20464c5d6..fcb1fe4fa 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -16,8 +16,7 @@
             android:id="@+id/coordinatorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            tools:context=".ui.activities.MainActivity"
-            android:fitsSystemWindows="false">
+            tools:context=".ui.activities.MainActivity">
             <fragment
                 android:id="@+id/nav_host_fragment"
                 android:name="androidx.navigation.fragment.NavHostFragment"
@@ -140,7 +139,6 @@
                     app:bb_tabXmlResource="@xml/main_menu_tasks"
                     app:bb_inActiveTabColor="?colorPrimaryDistinct"
                     app:bb_activeTabColor="@color/white"
-                    app:bb_behavior="underNavbar"
                     app:bb_badgesHideWhenActive="true"
                     app:bb_badgeBackgroundColor="?colorBadgeBackground"
                     android:layout_gravity="bottom"
@@ -154,7 +152,6 @@
             android:layout_height="match_parent"
             android:id="@+id/overlayFrameLayout"
             android:clickable="false"
-            android:fitsSystemWindows="true"
             />
     </FrameLayout>
 
diff --git a/Habitica/res/layout/activity_notifications.xml b/Habitica/res/layout/activity_notifications.xml
index 1f3f7e3bc..fbd294525 100644
--- a/Habitica/res/layout/activity_notifications.xml
+++ b/Habitica/res/layout/activity_notifications.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ui.activities.NotificationsActivity">
+    tools:context=".ui.activities.NotificationsActivity"
+    android:background="@color/white">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_party_invite.xml b/Habitica/res/layout/activity_party_invite.xml
index 601c3659a..ef03ecd2c 100644
--- a/Habitica/res/layout/activity_party_invite.xml
+++ b/Habitica/res/layout/activity_party_invite.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:background="@color/white">
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -42,6 +42,5 @@ android:id="@+id/snackbar_view"
 android:layout_width="match_parent"
 android:layout_height="80dp"
 android:layout_gravity="bottom"
-android:layout_marginBottom="@dimen/spacing_large"
-android:fitsSystemWindows="true" />
+android:layout_marginBottom="@dimen/spacing_large"/>
 </FrameLayout>
diff --git a/Habitica/res/layout/activity_prefs.xml b/Habitica/res/layout/activity_prefs.xml
index 7526e700b..ce5cfdbe6 100644
--- a/Habitica/res/layout/activity_prefs.xml
+++ b/Habitica/res/layout/activity_prefs.xml
@@ -5,7 +5,8 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              tools:context=".ui.activities.PrefsActivity"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@color/white">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_verify_username.xml b/Habitica/res/layout/activity_verify_username.xml
index 87586f6b7..3208082fa 100644
--- a/Habitica/res/layout/activity_verify_username.xml
+++ b/Habitica/res/layout/activity_verify_username.xml
@@ -2,8 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/white">
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -98,7 +98,7 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
-                                android:text="@"
+                                android:text="\@"
                                 android:gravity="center_vertical"
                                 android:textColor="@color/gray_400"/>
                             <EditText android:id="@+id/username_edit_text"
@@ -166,6 +166,5 @@
         android:layout_width="match_parent"
         android:layout_height="80dp"
         android:layout_marginBottom="@dimen/spacing_large"
-        android:layout_gravity="bottom"
-        android:fitsSystemWindows="true"/>
+        android:layout_gravity="bottom"/>
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 7f864b81f..a5bbacb5c 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -13,7 +13,7 @@
         android:scrollbarAlwaysDrawVerticalTrack="true"
         android:scrollbars="vertical"
         android:layout_marginTop="@dimen/spacing_large"
-        android:paddingBottom="?attr/actionBarSize">
+        >
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/fragment_challengeslist.xml b/Habitica/res/layout/fragment_challengeslist.xml
index 483f3b94a..fb1348dcb 100644
--- a/Habitica/res/layout/fragment_challengeslist.xml
+++ b/Habitica/res/layout/fragment_challengeslist.xml
@@ -13,7 +13,7 @@
             android:clipToPadding="false"
             android:divider="@null"
             android:scrollbars="vertical"
-            android:paddingBottom="?attr/actionBarSize" />
+            />
         <LinearLayout
             android:id="@+id/emptyView"
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_faq_detail.xml b/Habitica/res/layout/fragment_faq_detail.xml
index a5538ad80..9c1a21ba3 100644
--- a/Habitica/res/layout/fragment_faq_detail.xml
+++ b/Habitica/res/layout/fragment_faq_detail.xml
@@ -11,7 +11,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="?attr/actionBarSize">
+        >
 
         <TextView
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_guilds_overview.xml b/Habitica/res/layout/fragment_guilds_overview.xml
index e7672f198..f30cf66c3 100644
--- a/Habitica/res/layout/fragment_guilds_overview.xml
+++ b/Habitica/res/layout/fragment_guilds_overview.xml
@@ -13,7 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingBottom="?attr/actionBarSize">
+            >
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/fragment_inbox.xml b/Habitica/res/layout/fragment_inbox.xml
index 7288b931e..5d1ddcaf2 100644
--- a/Habitica/res/layout/fragment_inbox.xml
+++ b/Habitica/res/layout/fragment_inbox.xml
@@ -9,7 +9,7 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingBottom="?attr/actionBarSize">
+        >
                 <com.habitrpg.android.habitica.ui.views.PaddedLinearLayout
                     android:id="@+id/inbox_messages"
                     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_intro.xml b/Habitica/res/layout/fragment_intro.xml
index c070da590..0c282f84a 100644
--- a/Habitica/res/layout/fragment_intro.xml
+++ b/Habitica/res/layout/fragment_intro.xml
@@ -7,8 +7,7 @@
     android:layout_height="match_parent"
     android:gravity="center_vertical"
     android:background="@color/brand_300"
-    android:id="@+id/container_view"
-    android:fitsSystemWindows="true">
+    android:id="@+id/container_view">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/fragment_items.xml b/Habitica/res/layout/fragment_items.xml
index ac035a62a..62d3a5fdf 100644
--- a/Habitica/res/layout/fragment_items.xml
+++ b/Habitica/res/layout/fragment_items.xml
@@ -25,7 +25,7 @@
             android:scrollbarSize="3dp"
             android:scrollbarThumbVertical="@color/scrollbarThumb"
             android:scrollbars="vertical"
-            android:paddingBottom="?attr/actionBarSize" />
+            />
 
         <TextView
                 android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml
index 8b1bf6512..7f5596a9a 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -12,7 +12,7 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingBottom="?attr/actionBarSize">
+            >
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/fragment_quest_detail.xml b/Habitica/res/layout/fragment_quest_detail.xml
index 6e785a0b6..babef6264 100644
--- a/Habitica/res/layout/fragment_quest_detail.xml
+++ b/Habitica/res/layout/fragment_quest_detail.xml
@@ -8,7 +8,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingBottom="?attr/actionBarSize">
+        >
         <LinearLayout
             android:background="@color/white"
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_recyclerview.xml b/Habitica/res/layout/fragment_recyclerview.xml
index 0207251d9..cbead274e 100644
--- a/Habitica/res/layout/fragment_recyclerview.xml
+++ b/Habitica/res/layout/fragment_recyclerview.xml
@@ -13,7 +13,6 @@
         android:scrollbarThumbVertical="@color/scrollbarThumb"
         android:scrollbars="vertical"
         android:clipToPadding="false"
-        android:paddingBottom="?attr/actionBarSize"
         android:background="@color/white"/>
 
     <TextView
diff --git a/Habitica/res/layout/fragment_refresh_recyclerview.xml b/Habitica/res/layout/fragment_refresh_recyclerview.xml
index 9e7c43702..7f97ebea8 100644
--- a/Habitica/res/layout/fragment_refresh_recyclerview.xml
+++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml
@@ -18,8 +18,7 @@
             android:scrollbarSize="3dp"
             android:scrollbarThumbVertical="@color/scrollbarThumb"
             android:scrollbars="vertical"
-            android:clipToPadding="false"
-            android:paddingBottom="?attr/actionBarSize" />
+            android:clipToPadding="false" />
 
         <LinearLayout
             android:id="@+id/emptyView"
diff --git a/Habitica/res/layout/fragment_shop.xml b/Habitica/res/layout/fragment_shop.xml
index cc031c3c6..73730b4f5 100644
--- a/Habitica/res/layout/fragment_shop.xml
+++ b/Habitica/res/layout/fragment_shop.xml
@@ -25,7 +25,7 @@
             android:scrollbarSize="3dp"
             android:scrollbarThumbVertical="@color/scrollbarThumb"
             android:scrollbars="vertical"
-            android:paddingBottom="?attr/actionBarSize" />
+            />
 
         <FrameLayout
             android:id="@+id/emptyView"
diff --git a/Habitica/res/layout/overlay_tutorial.xml b/Habitica/res/layout/overlay_tutorial.xml
index adef2b2c6..659d1e526 100644
--- a/Habitica/res/layout/overlay_tutorial.xml
+++ b/Habitica/res/layout/overlay_tutorial.xml
@@ -4,8 +4,7 @@
     android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clickable="true"
-    android:fitsSystemWindows="true"
-    android:id="@+id/background">
+        android:id="@+id/background">
     <View android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:background="@android:color/black"
@@ -17,8 +16,7 @@
         android:paddingRight="16dp"
         android:paddingBottom="24dp"
         android:layout_alignParentBottom="true"
-        android:fitsSystemWindows="true"
-        android:layout_marginBottom="?actionBarSize">
+                android:layout_marginBottom="?actionBarSize">
         <com.habitrpg.android.habitica.ui.SpeechBubbleView
             android:id="@+id/speech_bubble"
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/snackbar_view.xml b/Habitica/res/layout/snackbar_view.xml
index 086d614ff..4d67e26b2 100644
--- a/Habitica/res/layout/snackbar_view.xml
+++ b/Habitica/res/layout/snackbar_view.xml
@@ -4,14 +4,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:fitsSystemWindows="true"
     android:clipToPadding="false">
     <LinearLayout
         android:id="@+id/snackbar_view"
         android:orientation="horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="6dp"
+        android:paddingStart="6dp"
         android:gravity="center"
         tools:background="@drawable/snackbar_background_green"
         android:layout_marginBottom="16dp"
@@ -29,8 +28,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="12dp"
-            android:paddingRight="18dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="18dp"
             android:paddingTop="8dp"
             android:paddingBottom="8dp">
             <TextView
@@ -77,7 +76,7 @@
                 android:id="@+id/rightTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingLeft="4dp"
+                android:paddingStart="4dp"
                 tools:text="12"/>
             </LinearLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/tavern_chat_new_entry_item.xml b/Habitica/res/layout/tavern_chat_new_entry_item.xml
index 65dd1dccf..e919baead 100644
--- a/Habitica/res/layout/tavern_chat_new_entry_item.xml
+++ b/Habitica/res/layout/tavern_chat_new_entry_item.xml
@@ -2,11 +2,6 @@
 <merge 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">
-    <LinearLayout
-        android:id="@+id/chatBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
         <LinearLayout
             android:id="@+id/chatBarContent"
             android:layout_width="match_parent"
@@ -96,10 +91,4 @@
                 style="@style/HabiticaButton.Blue"
                 android:text="@string/i_agree_to_follow_the_guidelines"/>
         </LinearLayout>
-
-        <Space
-            android:id="@+id/spacing"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index b4654925c..d8a6e3e37 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -42,6 +42,7 @@
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
     </style>
 
+
     <style name="BottomSheetTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
@@ -60,9 +61,7 @@
 
     <style name="AppTheme.ActionBar.Transparent" parent="AppTheme.ActionBar">
         <item name="actionBarStyle">@style/ActionBarTransparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:navigationBarColor">@color/brand_50</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="windowNoTitle">true</item>
@@ -76,13 +75,15 @@
     <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:navigationBarColor">@color/brand_50</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
+    <style name="MainAppTheme" parent="AppTheme.NoActionBar">
+        <item name="android:windowBackground">@drawable/activity_launch_background</item>
+    </style>
+
     <style name="AppTheme.NoActionBar.Green">
         <item name="colorPrimary">@color/green_10</item>
         <item name="colorPrimaryDark">@color/green_5</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
index f977ca029..943d16b49 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/ChatBarView.kt
@@ -1,13 +1,14 @@
 package com.habitrpg.android.habitica.ui.views.social
 
 import android.content.Context
-import android.os.Build
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.*
+import android.widget.ImageButton
+import android.widget.LinearLayout
+import android.widget.MultiAutoCompleteTextView
+import android.widget.TextView
 import androidx.core.content.ContextCompat
-import androidx.core.view.updateLayoutParams
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.SocialRepository
@@ -16,12 +17,11 @@ import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.helpers.AutocompleteAdapter
 import com.habitrpg.android.habitica.ui.helpers.AutocompleteTokenizer
-import com.habitrpg.android.habitica.ui.helpers.NavbarUtils
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import javax.inject.Inject
 
 
-class ChatBarView : FrameLayout {
+class ChatBarView : LinearLayout {
 
     @Inject
     lateinit var socialRepository: SocialRepository
@@ -33,8 +33,6 @@ class ChatBarView : FrameLayout {
     private val chatEditText: MultiAutoCompleteTextView by bindView(R.id.chatEditText)
     private val textIndicator: TextView by bindView(R.id.text_indicator)
     private val indicatorSpacing: View by bindView(R.id.indicator_spacing)
-    private val spacing: Space by bindView(R.id.spacing)
-    private var navBarAccountedHeightCalculated = false
 
     var chatMessages: List<ChatMessage>
         get() = autocompleteAdapter?.chatMessages ?: listOf()
@@ -67,6 +65,7 @@ class ChatBarView : FrameLayout {
     private var autocompleteAdapter: AutocompleteAdapter? = null
 
     private fun setupView(context: Context) {
+        orientation = LinearLayout.VERTICAL
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as? LayoutInflater
         inflater?.inflate(R.layout.tavern_chat_new_entry_item, this)
         this.setBackgroundResource(R.color.white)
@@ -80,8 +79,6 @@ class ChatBarView : FrameLayout {
 
         sendButton.setOnClickListener { sendButtonPressed() }
 
-        resizeForDrawingUnderNavbar()
-
         autocompleteAdapter = AutocompleteAdapter(context, socialRepository, autocompleteContext, groupID, appConfigManager.enableUsernameAutocomplete())
         chatEditText.setAdapter(autocompleteAdapter)
         chatEditText.threshold = 2
@@ -106,29 +103,6 @@ class ChatBarView : FrameLayout {
         }
     }
 
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-        if (changed) {
-            resizeForDrawingUnderNavbar()
-        }
-    }
-
-    //https://github.com/roughike/BottomBar/blob/master/bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java#L834
-    private fun resizeForDrawingUnderNavbar() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            val currentHeight = height
-
-            if (currentHeight != 0 && !navBarAccountedHeightCalculated) {
-                navBarAccountedHeightCalculated = true
-
-                val navbarHeight = NavbarUtils.getNavbarHeight(context)
-                spacing.updateLayoutParams<LinearLayout.LayoutParams> {
-                    height = navbarHeight
-                }
-            }
-        }
-    }
-
     private fun setSendButtonEnabled(enabled: Boolean) {
         val tintColor: Int = if (enabled) {
             ContextCompat.getColor(context, R.color.brand_400)