diff --git a/README.md b/README.md
index a52347822..342921f40 100644
--- a/README.md
+++ b/README.md
@@ -21,17 +21,16 @@ Screenshots
 
 Requirements
 ------
-* Android Studio 2.2.x
-* Gradle 2.2.x
-* Android 7.0 SDK
-* Android Support Library, revision 24 or newer
-* Google Play Services, version 9.6.0 or newer
+* Android Studio 4.1.x
+* Gradle 4.1.x
+* Android 11.0 SDK
+* Latest versions of AndroidX and Google Play Services
 * android-websockets library: https://github.com/irccloud/android-websockets
-* An Android device running Android 2.2 or newer
+* An Android device running Android 5.1 or newer
 
 Building
 ------
-* Make sure you've installed the Android 7.0 SDK and upgraded to the latest version of Android Studio
+* Make sure you've installed the Android 11.0 SDK and upgraded to the latest version of Android Studio
 * Make sure you've updated all support repository and Google Play Services repository packages in the Android SDK manager
 * Check out android-websockets and the IRCCloud Android project from github
 * Open Android studio and select the IRCCloud Android build.gradle file
@@ -43,7 +42,7 @@ _You must uninstall the Play Store version of the app first before installing a
 
 License
 ------
-Copyright (C) 2016 IRCCloud, Ltd.
+Copyright (C) 2021 IRCCloud, Ltd.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/build.gradle b/build.gradle
index f0e23ce84..95702aa9d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,9 +70,8 @@ android {
     defaultConfig {
         versionCode 298
         versionName "4.24"
-        minSdkVersion 17
+        minSdkVersion 22
         targetSdkVersion 30
-        multiDexEnabled true
         applicationId "com.irccloud.android"
         testApplicationId "com.irccloud.android.test"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -359,14 +358,14 @@ dependencies {
     implementation "androidx.browser:browser:1.3.0"
     implementation "androidx.emoji:emoji:1.1.0"
     implementation "androidx.exifinterface:exifinterface:1.3.2"
-    implementation "androidx.room:room-runtime:2.2.5"
-    annotationProcessor "androidx.room:room-compiler:2.2.5"
+    implementation "androidx.room:room-runtime:2.2.6"
+    annotationProcessor "androidx.room:room-compiler:2.2.6"
     implementation "com.google.android.gms:play-services-base:17.5.0"
     implementation "com.google.android.gms:play-services-auth:19.0.0"
     implementation "com.google.android.gms:play-services-identity:17.0.0"
-    implementation 'com.google.firebase:firebase-messaging:21.0.0'
+    implementation 'com.google.firebase:firebase-messaging:21.0.1'
     implementation 'com.google.firebase:firebase-analytics:18.0.0'
-    implementation 'com.google.firebase:firebase-perf:19.0.10'
+    implementation 'com.google.firebase:firebase-perf:19.0.11'
     implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
     implementation 'com.vandalsoftware.android:dslv:0.6.3'
     implementation 'com.damnhandy:handy-uri-templates:2.1.7'
diff --git a/irccloud-android.iml b/irccloud-android.iml
index 98bf0369e..ce0baed0a 100644
--- a/irccloud-android.iml
+++ b/irccloud-android.iml
@@ -84,14 +84,15 @@
     <orderEntry type="library" name="Gradle: ./libs/sdk-v1.0.0.jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.databinding:databinding-common:4.1.1" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.room:room-common:2.2.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-encoders:16.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.room:room-common:2.2.6" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-encoders:16.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:listenablefuture:1.0" level="project" />
     <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-javalite:3.11.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-annotations:16.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-javalite:3.14.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.12.1" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: com.damnhandy:handy-uri-templates:2.1.7" level="project" />
@@ -101,10 +102,9 @@
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
     <orderEntry type="library" name="Gradle: androidx.databinding:databinding-adapters:4.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.databinding:databinding-runtime:4.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.databinding:viewbinding:4.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.2.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-perf:19.0.10@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-perf:19.0.11@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.theartofdev.edmodo:android-image-cropper:2.8.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.2.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.vandalsoftware.android:dslv:0.6.3@aar" level="project" />
@@ -124,21 +124,21 @@
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-api-phone:17.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-base:17.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-clearcut:17.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging:21.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid:21.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging:21.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid:21.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop:17.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-phenotype:17.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:17.5.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-crashlytics:17.3.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cloud-messaging:16.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-datatransport:17.0.9@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-datatransport:17.0.10@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics:18.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-api:18.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-config:20.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-installations:16.3.4@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-installations:16.3.5@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-abt:20.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:19.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-installations-interop:16.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:19.5.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-installations-interop:16.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:17.2.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement:18.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-sdk:18.0.0@aar" level="project" />
@@ -168,18 +168,18 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.room:room-runtime:2.2.5@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.room:room-runtime:2.2.6@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.sqlite:sqlite-framework:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.sqlite:sqlite:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.work:work-runtime:2.4.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.datatransport:transport-backend-cct:2.3.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.datatransport:transport-backend-cct:2.3.3@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.datatransport:transport-runtime:2.2.5@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.datatransport:transport-api:2.2.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-components:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-encoders-json:17.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-components:16.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-encoders-json:17.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
@@ -187,7 +187,7 @@
     <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:protolite-well-known-types:17.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:protolite-well-known-types:17.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.commonsware.cwac:richedit:0.5.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: pl.droidsonroids.gif:android-gif-drawable:1.2.19@aar" level="project" />
     <orderEntry type="library" name="Gradle: pl.droidsonroids:relinker:1.3.1@aar" level="project" />
diff --git a/res/drawable-hdpi-v21/scrollbar_handle_mtrl_alpha.9.png b/res/drawable-hdpi/scrollbar_handle_mtrl_alpha.9.png
similarity index 100%
rename from res/drawable-hdpi-v21/scrollbar_handle_mtrl_alpha.9.png
rename to res/drawable-hdpi/scrollbar_handle_mtrl_alpha.9.png
diff --git a/res/drawable-ldpi-v21/scrollbar_handle_mtrl_alpha.9.png b/res/drawable-ldpi/scrollbar_handle_mtrl_alpha.9.png
similarity index 100%
rename from res/drawable-ldpi-v21/scrollbar_handle_mtrl_alpha.9.png
rename to res/drawable-ldpi/scrollbar_handle_mtrl_alpha.9.png
diff --git a/res/drawable-mdpi-v21/scrollbar_handle_mtrl_alpha.9.png b/res/drawable-mdpi/scrollbar_handle_mtrl_alpha.9.png
similarity index 100%
rename from res/drawable-mdpi-v21/scrollbar_handle_mtrl_alpha.9.png
rename to res/drawable-mdpi/scrollbar_handle_mtrl_alpha.9.png
diff --git a/res/drawable-v21/dismiss_bg.xml b/res/drawable-v21/dismiss_bg.xml
deleted file mode 100644
index 090d95e22..000000000
--- a/res/drawable-v21/dismiss_bg.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 IRCCloud, Ltd.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="@drawable/dismiss_blue"/>
-</ripple>
\ No newline at end of file
diff --git a/res/drawable-v21/row_failed_bg.xml b/res/drawable-v21/row_failed_bg.xml
deleted file mode 100644
index 7f8348fbb..000000000
--- a/res/drawable-v21/row_failed_bg.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 IRCCloud, Ltd.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-    <item android:drawable="@drawable/row_failed_bgcolor"/>
-</ripple>
\ No newline at end of file
diff --git a/res/drawable-xhdpi-v21/scrollbar_handle_mtrl_alpha.9.png b/res/drawable-xhdpi/scrollbar_handle_mtrl_alpha.9.png
similarity index 100%
rename from res/drawable-xhdpi-v21/scrollbar_handle_mtrl_alpha.9.png
rename to res/drawable-xhdpi/scrollbar_handle_mtrl_alpha.9.png
diff --git a/res/drawable-xxhdpi-v21/scrollbar_handle_mtrl_alpha.9.png b/res/drawable-xxhdpi/scrollbar_handle_mtrl_alpha.9.png
similarity index 100%
rename from res/drawable-xxhdpi-v21/scrollbar_handle_mtrl_alpha.9.png
rename to res/drawable-xxhdpi/scrollbar_handle_mtrl_alpha.9.png
diff --git a/res/drawable/dismiss_bg.xml b/res/drawable/dismiss_bg.xml
index 1477d695d..090d95e22 100644
--- a/res/drawable/dismiss_bg.xml
+++ b/res/drawable/dismiss_bg.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (c) 2015 IRCCloud, Ltd.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +15,7 @@
   ~ limitations under the License.
   -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/dismiss_blue" />
-</selector>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:drawable="@drawable/dismiss_blue"/>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable-v21/ic_action_reply_tinted.xml b/res/drawable/ic_action_reply_tinted.xml
similarity index 100%
rename from res/drawable-v21/ic_action_reply_tinted.xml
rename to res/drawable/ic_action_reply_tinted.xml
diff --git a/res/drawable-v21/notification_action_bg.xml b/res/drawable/notification_action_bg.xml
similarity index 100%
rename from res/drawable-v21/notification_action_bg.xml
rename to res/drawable/notification_action_bg.xml
diff --git a/res/drawable/row_failed_bg.xml b/res/drawable/row_failed_bg.xml
index ebe390c10..7f8348fbb 100644
--- a/res/drawable/row_failed_bg.xml
+++ b/res/drawable/row_failed_bg.xml
@@ -15,9 +15,7 @@
   ~ limitations under the License.
   -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/status_fail_bg" android:state_pressed="true"/>
-    <item android:drawable="@drawable/status_fail_bg" android:state_selected="true"/>
-    <item android:drawable="@drawable/status_fail_bg" android:state_focused="true"/>
-    <item android:drawable="@drawable/network_fail_bg"/>
-</selector>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:drawable="@drawable/row_failed_bgcolor"/>
+</ripple>
\ No newline at end of file
diff --git a/res/drawable-v21/row_failed_bgcolor.xml b/res/drawable/row_failed_bgcolor.xml
similarity index 100%
rename from res/drawable-v21/row_failed_bgcolor.xml
rename to res/drawable/row_failed_bgcolor.xml
diff --git a/res/layout-v19/dialog_textprompt.xml b/res/layout-v19/dialog_textprompt.xml
deleted file mode 100644
index 7c148c4db..000000000
--- a/res/layout-v19/dialog_textprompt.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2015 IRCCloud, Ltd.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:orientation="vertical">
-
-    <androidx.emoji.widget.EmojiTextView
-        android:id="@+id/prompt"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:textColor="?messageTextColor"
-        />
-
-    <com.irccloud.android.IRCEditText
-        android:id="@+id/textInput"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="?editTextTheme"
-        android:inputType="text"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:ems="10">
-
-        <requestFocus />
-    </com.irccloud.android.IRCEditText>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v21/notification_expanded.xml b/res/layout-v21/notification_expanded.xml
deleted file mode 100644
index acd1758a1..000000000
--- a/res/layout-v21/notification_expanded.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 IRCCloud, Ltd.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:gravity="top" >
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:scaleType="centerInside"
-            android:layout_margin="12dp" />
-
-        <ImageView android:id="@+id/small_icon"
-                   android:layout_width="16dp"
-                   android:layout_height="16dp"
-                   android:padding="3dp"
-                   android:layout_gravity="end|bottom"
-                   android:scaleType="centerInside"
-                   android:src="@drawable/ic_stat_notify"
-                   android:background="@drawable/notification_icon_bg"
-                   android:layout_marginEnd="8dp"
-                   android:layout_marginBottom="8dp"/>
-    </FrameLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="8dp"
-        android:gravity="left|top"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical"
-        android:layout_marginTop="6dp">
-
-        <LinearLayout android:layout_width="match_parent"
-                      android:orientation="horizontal"
-                      android:gravity="top"
-                      android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/title"
-                style="@android:style/TextAppearance.Material.Notification.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:singleLine="true"
-                android:fadingEdge="horizontal" />
-
-            <DateTimeView
-                android:id="@+id/time"
-                style="@android:style/TextAppearance.Material.Notification.Time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:textSize="12sp" />
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/text"
-            style="@android:style/TextAppearance.Material.Notification"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="10" />
-
-		<TextView
-            android:id="@+id/more"
-            style="@android:style/TextAppearance.Material.Notification"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1" />
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:id="@+id/action_divider"
-            android:background="#29000000"
-            android:visibility="gone"
-            android:layout_marginTop="4dp" />
-
-        <LinearLayout
-            android:id="@+id/actions"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginBottom="4dp"
-            android:visibility="gone"
-            android:background="@null">
-            <Button
-                android:id="@+id/action_reply"
-                style="@android:style/Widget.Material.Light.Button.Borderless.Small"
-                android:tint="#0f0"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:layout_weight="1"
-                android:layout_margin="0dp"
-                android:gravity="start|center_vertical"
-                android:drawablePadding="8dp"
-                android:paddingStart="8dp"
-                android:textSize="13sp"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:drawableLeft="@drawable/ic_action_reply_tinted"
-                android:text="Quick Reply"
-                android:textColor="#8a000000"
-                android:paddingEnd="8dp"
-                android:background="@drawable/notification_action_bg" />
-        </LinearLayout>
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/dialog_textprompt.xml b/res/layout/dialog_textprompt.xml
index e6d868d46..7c148c4db 100644
--- a/res/layout/dialog_textprompt.xml
+++ b/res/layout/dialog_textprompt.xml
@@ -23,7 +23,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:orientation="vertical">
 
-    <TextView
+    <androidx.emoji.widget.EmojiTextView
         android:id="@+id/prompt"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -36,8 +36,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="?editTextTheme"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
         android:inputType="text"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
         android:ems="10">
 
         <requestFocus />
diff --git a/res/layout/notification_expanded.xml b/res/layout/notification_expanded.xml
index 0ff7eb8cd..acd1758a1 100644
--- a/res/layout/notification_expanded.xml
+++ b/res/layout/notification_expanded.xml
@@ -20,22 +20,37 @@
     android:layout_height="wrap_content"
     android:gravity="top" >
 
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="@android:dimen/notification_large_icon_width"
-        android:layout_height="@android:dimen/notification_large_icon_height"
-        android:background="#18323b"
-        android:scaleType="center"
-        android:src="@drawable/ic_stat_notify" />
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:scaleType="centerInside"
+            android:layout_margin="12dp" />
+
+        <ImageView android:id="@+id/small_icon"
+                   android:layout_width="16dp"
+                   android:layout_height="16dp"
+                   android:padding="3dp"
+                   android:layout_gravity="end|bottom"
+                   android:scaleType="centerInside"
+                   android:src="@drawable/ic_stat_notify"
+                   android:background="@drawable/notification_icon_bg"
+                   android:layout_marginEnd="8dp"
+                   android:layout_marginBottom="8dp"/>
+    </FrameLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
         android:layout_marginRight="8dp"
         android:gravity="left|top"
         android:layout_gravity="center_vertical"
-        android:orientation="vertical" >
+        android:orientation="vertical"
+        android:layout_marginTop="6dp">
 
         <LinearLayout android:layout_width="match_parent"
                       android:orientation="horizontal"
@@ -44,17 +59,16 @@
 
             <TextView
                 android:id="@+id/title"
-                style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+                style="@android:style/TextAppearance.Material.Notification.Title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:layout_marginTop="2dp"
                 android:singleLine="true"
                 android:fadingEdge="horizontal" />
 
             <DateTimeView
                 android:id="@+id/time"
-                style="@android:style/TextAppearance.StatusBar.EventContent"
+                style="@android:style/TextAppearance.Material.Notification.Time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
@@ -63,56 +77,55 @@
 
         <TextView
             android:id="@+id/text"
-            style="@android:style/TextAppearance.StatusBar.EventContent"
+            style="@android:style/TextAppearance.Material.Notification"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-4dp"
             android:ellipsize="end"
             android:maxLines="10" />
 
-        <TextView
+		<TextView
             android:id="@+id/more"
-            style="@android:style/TextAppearance.StatusBar.EventContent"
+            style="@android:style/TextAppearance.Material.Notification"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:visibility="gone"
             android:maxLines="1" />
 
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="1dip"
-            android:layout_marginTop="4dp"
             android:id="@+id/action_divider"
-            android:background="?android:attr/dividerHorizontal"
-            android:visibility="gone" />
+            android:background="#29000000"
+            android:visibility="gone"
+            android:layout_marginTop="4dp" />
 
         <LinearLayout
             android:id="@+id/actions"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:layout_marginBottom="4dp"
-            android:showDividers="middle"
-            android:divider="?android:attr/listDivider"
             android:visibility="gone"
-            android:dividerPadding="12dp">
+            android:background="@null">
             <Button
-                style="?android:attr/borderlessButtonStyle"
                 android:id="@+id/action_reply"
+                style="@android:style/Widget.Material.Light.Button.Borderless.Small"
+                android:tint="#0f0"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
                 android:layout_weight="1"
+                android:layout_margin="0dp"
                 android:gravity="start|center_vertical"
                 android:drawablePadding="8dp"
-                android:drawableLeft="@drawable/ic_action_reply"
-                android:paddingLeft="8dp"
-                android:textColor="#ccc"
-                android:textSize="14dp"
+                android:paddingStart="8dp"
+                android:textSize="13sp"
                 android:singleLine="true"
                 android:ellipsize="end"
+                android:drawableLeft="@drawable/ic_action_reply_tinted"
                 android:text="Quick Reply"
-                android:paddingRight="8dp" />
+                android:textColor="#8a000000"
+                android:paddingEnd="8dp"
+                android:background="@drawable/notification_action_bg" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/res/values-v21/dimens.xml b/res/values-v21/dimens.xml
deleted file mode 100644
index 31c00398d..000000000
--- a/res/values-v21/dimens.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2015 IRCCloud, Ltd.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-  <dimen name="scrollbar_inset">0dp</dimen>
-  <dimen name="scrollbar_size">4dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
deleted file mode 100644
index 71ae0eb7f..000000000
--- a/res/values-v21/styles.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
-  ~ Copyright (c) 2015 IRCCloud, Ltd.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <style name="LoginTheme" parent="Theme.AppCompat.Light">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@color/loginBackgroundColor</item>
-        <item name="android:navigationBarColor">#4480FA</item>
-        <item name="android:colorPrimaryDark">#0b2e60</item>
-        <item name="colorPrimaryDark">#0b2e60</item>
-        <item name="android:textColorHighlight">@color/light_blue</item>
-    </style>
-
-    <style name="LoginThemeSpinner" parent="LoginTheme">
-        <item name="colorAccent">#fff</item>
-        <item name="android:colorAccent">#fff</item>
-    </style>
-
-    <style name="ImageViewerTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:colorAccent">#fff</item>
-        <item name="colorAccent">#fff</item>
-    </style>
-
-    <style name="messageTxt">
-        <item name="android:imeOptions">flagNoExtractUi|actionSend</item>
-    </style>
-
-    <style name="Widget.Styled.ImageButton" parent="android:Widget.Material.Light.ImageButton">
-        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
-    </style>
-
-    <style name="ProgressBarLogin" parent="Widget.AppCompat.ProgressBar.Horizontal">
-        <item name="colorAccent">#fff</item>
-    </style>
-
-    <style name="ProgressBarMain" parent="Widget.AppCompat.ProgressBar.Horizontal">
-    </style>
-
-    <style name="LaunchTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:statusBarColor">@color/loginTopBackgroundColor</item>
-        <item name="android:navigationBarColor">@color/loginTopBackgroundColor</item>
-        <item name="android:windowBackground">@drawable/splash</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 44b04ab61..06a586496 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -24,8 +24,8 @@
     <dimen name="unread_bubble_size">24dp</dimen>
     <dimen name="top_bar_height">64dp</dimen>
     <dimen name="status_bar_height">25dp</dimen>
-    <dimen name="scrollbar_inset">2dp</dimen>
-    <dimen name="scrollbar_size">8dp</dimen>
+    <dimen name="scrollbar_inset">0dp</dimen>
+    <dimen name="scrollbar_size">4dp</dimen>
     <integer name="default_text_size">14</integer>
     <integer name="max_input_lines">4</integer>
     <dimen name="activity_horizontal_margin">16dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index abd864cc7..f92b9a7b7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,17 +16,22 @@
 
 <resources>
     <style name="LoginTheme" parent="Theme.AppCompat.Light">
-        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="android:progressBarStyleHorizontal">@style/ProgressBarLogin</item>
         <item name="android:windowBackground">@color/loginBackgroundColor</item>
+        <item name="android:navigationBarColor">#4480FA</item>
+        <item name="android:colorPrimaryDark">#0b2e60</item>
         <item name="colorPrimaryDark">#0b2e60</item>
         <item name="android:textColorHighlight">@color/light_blue</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:progressBarStyleHorizontal">@style/ProgressBarLogin</item>
     </style>
     <style name="LoginThemeSpinner" parent="LoginTheme">
         <item name="colorAccent">#fff</item>
+        <item name="android:colorAccent">#fff</item>
     </style>
     <style name="LaunchTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:statusBarColor">@color/loginTopBackgroundColor</item>
+        <item name="android:navigationBarColor">@color/loginTopBackgroundColor</item>
         <item name="android:windowBackground">@drawable/splash</item>
     </style>
     <style name="PrefsWindowTitleBackground">
@@ -40,6 +45,9 @@
         <item name="android:textColorHighlight">@color/light_blue</item>
     </style>
     <style name="ImageViewerTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:colorAccent">#fff</item>
         <item name="colorAccent">#fff</item>
         <item name="android:progressBarStyleHorizontal">@style/ProgressBarLogin</item>
         <item name="android:textColorHighlight">@color/light_blue</item>
@@ -48,7 +56,7 @@
         <item name="android:imeOptions">flagNoExtractUi|actionSend</item>
     </style>
     <style name="Widget.Styled.ImageButton" parent="android:Widget.Holo.Light.ImageButton">
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
     </style>
 
     <style name="ThemedActionBar" parent="@style/Widget.AppCompat.ActionBar">
@@ -87,6 +95,7 @@
 	</style>
 	
     <style name="ProgressBarLogin" parent="android:Widget.ProgressBar.Horizontal">
+        <item name="colorAccent">#fff</item>
         <item name="android:progressDrawable">@drawable/login_progress_horizontal_holo_dark</item>
         <item name="android:indeterminateDrawable">@drawable/login_progress_indeterminate_horizontal_holo_dark</item>
         <item name="android:minHeight">16dip</item>
diff --git a/res/xml-v19/preferences_display.xml b/res/xml-v19/preferences_display.xml
deleted file mode 100644
index fc756d514..000000000
--- a/res/xml-v19/preferences_display.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2015 IRCCloud, Ltd.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:robobunny="http://robobunny.com">
-
-	<PreferenceCategory android:title="Display">
-        <Preference
-            android:title="Theme"
-            android:key="theme"
-            />
-        <SwitchPreference
-            android:key="monospace"
-            android:defaultValue="false"
-            android:title="Monospace Font"/>
-        <SwitchPreference
-            android:key="preferSystemEmoji"
-            android:defaultValue="true"
-            android:title="Prefer Android Emoji Font"/>
-        <com.robobunny.SeekBarPreference
-            android:key="textSize"
-            android:title="Text Size"
-            android:defaultValue="@integer/default_text_size"
-            android:max="24"
-            robobunny:min="12"
-            robobunny:unitsLeft=""
-            robobunny:unitsRight=""/>
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/preferences_display.xml b/res/xml/preferences_display.xml
index 294b55e34..fc756d514 100644
--- a/res/xml/preferences_display.xml
+++ b/res/xml/preferences_display.xml
@@ -28,6 +28,10 @@
             android:key="monospace"
             android:defaultValue="false"
             android:title="Monospace Font"/>
+        <SwitchPreference
+            android:key="preferSystemEmoji"
+            android:defaultValue="true"
+            android:title="Prefer Android Emoji Font"/>
         <com.robobunny.SeekBarPreference
             android:key="textSize"
             android:title="Text Size"
diff --git a/src/com/irccloud/android/ActionEditText.java b/src/com/irccloud/android/ActionEditText.java
index f26f4c6ea..addec08c3 100644
--- a/src/com/irccloud/android/ActionEditText.java
+++ b/src/com/irccloud/android/ActionEditText.java
@@ -73,7 +73,7 @@ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
         } else {
             outAttrs.inputType &= ~EditorInfo.TYPE_TEXT_FLAG_CAP_SENTENCES;
         }
-        if(Build.VERSION.SDK_INT >= 19 && getEmojiEditTextHelper() != null)
+        if(getEmojiEditTextHelper() != null)
             ic = getEmojiEditTextHelper().onCreateInputConnection(ic, outAttrs);
 
         EditorInfoCompat.setContentMimeTypes(outAttrs, new String[]{"image/*"});
@@ -111,7 +111,7 @@ private void init() {
     }
 
     public void setTextWithEmoji(CharSequence s) {
-        if(Build.VERSION.SDK_INT >= 19 && EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
+        if(EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
             setText(EmojiCompat.get().process(s));
         else
             setText(s);
@@ -126,7 +126,7 @@ public void setKeyListener(android.text.method.KeyListener keyListener) {
     }
 
     private EmojiEditTextHelper getEmojiEditTextHelper() {
-        if (Build.VERSION.SDK_INT >= 19 && mEmojiEditTextHelper == null) {
+        if (mEmojiEditTextHelper == null) {
             mEmojiEditTextHelper = new EmojiEditTextHelper(this);
         }
         return mEmojiEditTextHelper;
diff --git a/src/com/irccloud/android/ColorFormatter.java b/src/com/irccloud/android/ColorFormatter.java
index 0c78069e8..9a60b237a 100644
--- a/src/com/irccloud/android/ColorFormatter.java
+++ b/src/com/irccloud/android/ColorFormatter.java
@@ -2244,18 +2244,6 @@ public class ColorFormatter {
     public static Pattern EMOJI = null;
 
     public static final HashMap<String, String> conversionMap = new HashMap<String, String>() {{
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            put("\uD83C\uDDEF\uD83C\uDDF5", "\uDBB9\uDCE5"); // JP
-            put("\uD83C\uDDF0\uD83C\uDDF7", "\uDBB9\uDCEE"); // KR
-            put("\uD83C\uDDE9\uD83C\uDDEA", "\uDBB9\uDCE8"); // DE
-            put("\uD83C\uDDE8\uD83C\uDDF3", "\uDBB9\uDCED"); // CN
-            put("\uD83C\uDDFA\uD83C\uDDF8", "\uDBB9\uDCE6"); // US
-            put("\uD83C\uDDEB\uD83C\uDDF7", "\uDBB9\uDCE7"); // FR
-            put("\uD83C\uDDEA\uD83C\uDDF8", "\uDBB9\uDCEB"); // ES
-            put("\uD83C\uDDEE\uD83C\uDDF9", "\uDBB9\uDCE9"); // IT
-            put("\uD83C\uDDF7\uD83C\uDDFA", "\uDBB9\uDCEC"); // RU
-            put("\uD83C\uDDEC\uD83C\uDDE7", "\uDBB9\uDCEA"); // GB
-        }
         put("\u0030\u20E3", "\uDBBA\uDC37"); // ZERO
         put("\u0031\u20E3", "\uDBBA\uDC2E"); // ONE
         put("\u0032\u20E3", "\uDBBA\uDC2F"); // TWO
@@ -2436,7 +2424,7 @@ public static Spanned html_to_spanned(String msg, boolean linkify, final Server
     }
 
     public static CharSequence strip(String msg) {
-        if(Build.VERSION.SDK_INT >= 19 && EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
+        if(EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
             return EmojiCompat.get().process(html_to_spanned(irc_to_html(TextUtils.htmlEncode(emojify(msg)))).toString());
         else
             return html_to_spanned(irc_to_html(TextUtils.htmlEncode(emojify(msg)))).toString();
@@ -2776,7 +2764,7 @@ else if (c == close)
             }
         }
 
-        if(Build.VERSION.SDK_INT >= 19 && EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
+        if(EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
             return (Spanned)EmojiCompat.get().process(output);
         else
             return output;
diff --git a/src/com/irccloud/android/ColorScheme.java b/src/com/irccloud/android/ColorScheme.java
index bcc79aed4..924ba0b25 100644
--- a/src/com/irccloud/android/ColorScheme.java
+++ b/src/com/irccloud/android/ColorScheme.java
@@ -76,7 +76,7 @@ public static int getTheme(String theme, boolean actionbar) {
     public static boolean getSystemDarkMode() {
         if(Build.VERSION.SDK_INT < 29) {
             PowerManager pm = (PowerManager)IRCCloudApplication.getInstance().getApplicationContext().getSystemService(Context.POWER_SERVICE);
-            return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && pm.isPowerSaveMode();
+            return pm.isPowerSaveMode();
         } else {
             int currentNightMode = IRCCloudApplication.getInstance().getApplicationContext().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
             return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
@@ -316,8 +316,7 @@ public void setThemeFromContext(Context ctx, String theme_name) {
         row_members_bg_drawable = resourceForAttribute(ctx, R.attr.row_members_bg_drawable);
         codeSpanForegroundColor = colorForAttribute(ctx, R.attr.codeSpanForegroundColor);
         codeSpanBackgroundColor = colorForAttribute(ctx, R.attr.codeSpanBackgroundColor);
-        if(Build.VERSION.SDK_INT >= 21)
-            statusBarColor = colorForAttribute(ctx, android.R.attr.statusBarColor);
+        statusBarColor = colorForAttribute(ctx, android.R.attr.statusBarColor);
         isDarkTheme = !theme.equals("dawn");
         selfTextColor = isDarkTheme?"ffffff":"142b43";
     }
diff --git a/src/com/irccloud/android/IRCCloudApplication.java b/src/com/irccloud/android/IRCCloudApplication.java
index a61565a21..8e62096bf 100644
--- a/src/com/irccloud/android/IRCCloudApplication.java
+++ b/src/com/irccloud/android/IRCCloudApplication.java
@@ -18,6 +18,7 @@
 
 import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Typeface;
@@ -33,7 +34,6 @@
 import androidx.core.provider.FontsContractCompat;
 import androidx.emoji.text.EmojiCompat;
 import androidx.emoji.text.FontRequestEmojiCompatConfig;
-import androidx.multidex.MultiDexApplication;
 
 import com.datatheorem.android.trustkit.TrustKit;
 import com.google.firebase.FirebaseApp;
@@ -49,7 +49,7 @@
 import java.util.TimerTask;
 
 @SuppressWarnings("unused")
-public class IRCCloudApplication extends MultiDexApplication {
+public class IRCCloudApplication extends Application {
     private static IRCCloudApplication instance = null;
 
     public static IRCCloudApplication getInstance() {
@@ -88,27 +88,26 @@ public void onCreate() {
             editor.apply();
         }
 
-        if(Build.VERSION.SDK_INT >= 19)
-            EmojiCompat.init(new FontRequestEmojiCompatConfig(getApplicationContext(), new FontRequest(
-                    "com.google.android.gms.fonts",
-                    "com.google.android.gms",
-                    "Noto Color Emoji Compat",
-                    R.array.com_google_android_gms_fonts_certs))
-                    .setReplaceAll(!prefs.getBoolean("preferSystemEmoji", true))
-                    .registerInitCallback(new EmojiCompat.InitCallback() {
-                        @Override
-                        public void onInitialized() {
-                            Log.i("IRCCloud", "EmojiCompat initialized");
-                            super.onInitialized();
-                            EventsList.getInstance().clearCaches();
-                            conn.notifyHandlers(NetworkConnection.EVENT_FONT_DOWNLOADED, null);
-                        }
-                        @Override
-                        public void onFailed(@Nullable Throwable throwable) {
-                            Log.e("IRCCloud", "EmojiCompat initialization failed: ", throwable);
-                            IRCCloudLog.LogException(throwable);
-                        }
-                    }));
+        EmojiCompat.init(new FontRequestEmojiCompatConfig(getApplicationContext(), new FontRequest(
+                "com.google.android.gms.fonts",
+                "com.google.android.gms",
+                "Noto Color Emoji Compat",
+                R.array.com_google_android_gms_fonts_certs))
+                .setReplaceAll(!prefs.getBoolean("preferSystemEmoji", true))
+                .registerInitCallback(new EmojiCompat.InitCallback() {
+                    @Override
+                    public void onInitialized() {
+                        Log.i("IRCCloud", "EmojiCompat initialized");
+                        super.onInitialized();
+                        EventsList.getInstance().clearCaches();
+                        conn.notifyHandlers(NetworkConnection.EVENT_FONT_DOWNLOADED, null);
+                    }
+                    @Override
+                    public void onFailed(@Nullable Throwable throwable) {
+                        Log.e("IRCCloud", "EmojiCompat initialization failed: ", throwable);
+                        IRCCloudLog.LogException(throwable);
+                    }
+                }));
         //EmojiCompat.init(new BundledEmojiCompatConfig(this).setReplaceAll(!prefs.getBoolean("preferSystemEmoji", true)));
         NetworkConnection.getInstance().registerForConnectivity();
 
diff --git a/src/com/irccloud/android/NetworkConnection.java b/src/com/irccloud/android/NetworkConnection.java
index 5212eb979..9f331fb72 100644
--- a/src/com/irccloud/android/NetworkConnection.java
+++ b/src/com/irccloud/android/NetworkConnection.java
@@ -271,38 +271,9 @@ public void onReceive(Context context, Intent intent) {
                 NetworkInfo ni = cm.getActiveNetworkInfo();
 
                 if (intent.hasExtra("networkInfo") && ((NetworkInfo) intent.getParcelableExtra("networkInfo")).isConnected()) {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        if (intent.getIntExtra("networkType", 0) == ConnectivityManager.TYPE_VPN) {
-                            if (state == STATE_CONNECTED || state == STATE_CONNECTING) {
-                                IRCCloudLog.Log(Log.INFO, TAG, "A VPN has connected, reconnecting websocket");
-                                cancel_idle_timer();
-                                reconnect_timestamp = 0;
-                                try {
-                                    state = STATE_DISCONNECTING;
-                                    client.disconnect();
-                                    state = STATE_DISCONNECTED;
-                                    notifyHandlers(EVENT_CONNECTIVITY, null);
-                                } catch (Exception e) {
-                                }
-                            }
-                        }
-                    } else {
-                        boolean hasVPN = false;
-                        try {
-                            for (NetworkInterface intf : Collections.list(NetworkInterface.getNetworkInterfaces())) {
-                                if (!intf.isUp() || intf.getInterfaceAddresses().size() == 0)
-                                    continue;
-
-                                if (intf.getName().startsWith("tun") || intf.getName().startsWith("ppp")) {
-                                    hasVPN = true;
-                                    break;
-                                }
-                            }
-                        } catch (Exception e) {
-                        }
-
-                        if (hasVPN && state == STATE_CONNECTED) {
-                            IRCCloudLog.Log(Log.INFO, TAG, "A network became available while a VPN is active, reconnecting");
+                    if (intent.getIntExtra("networkType", 0) == ConnectivityManager.TYPE_VPN) {
+                        if (state == STATE_CONNECTED || state == STATE_CONNECTING) {
+                            IRCCloudLog.Log(Log.INFO, TAG, "A VPN has connected, reconnecting websocket");
                             cancel_idle_timer();
                             reconnect_timestamp = 0;
                             try {
@@ -382,53 +353,51 @@ public NetworkConnection() {
         } catch (Exception e) {
         }
 
-        if(Build.VERSION.SDK_INT >= 21) {
-             connectivityCallback = new ConnectivityManager.NetworkCallback() {
-                @Override
-                public void onCapabilitiesChanged(Network network, NetworkCapabilities networkCapabilities) {
-                    super.onCapabilitiesChanged(network, networkCapabilities);
-
-                    /*if(networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) && networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
-                        if (state == STATE_CONNECTED || state == STATE_CONNECTING) {
-                            IRCCloudLog.Log(Log.INFO, TAG, "A VPN has connected, reconnecting websocket");
-                            cancel_idle_timer();
-                            reconnect_timestamp = 0;
-                            try {
-                                state = STATE_DISCONNECTING;
-                                client.disconnect();
-                                state = STATE_DISCONNECTED;
-                                notifyHandlers(EVENT_CONNECTIVITY, null);
-                            } catch (Exception e) {
-                            }
+         connectivityCallback = new ConnectivityManager.NetworkCallback() {
+            @Override
+            public void onCapabilitiesChanged(Network network, NetworkCapabilities networkCapabilities) {
+                super.onCapabilitiesChanged(network, networkCapabilities);
+
+                /*if(networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN) && networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
+                    if (state == STATE_CONNECTED || state == STATE_CONNECTING) {
+                        IRCCloudLog.Log(Log.INFO, TAG, "A VPN has connected, reconnecting websocket");
+                        cancel_idle_timer();
+                        reconnect_timestamp = 0;
+                        try {
+                            state = STATE_DISCONNECTING;
+                            client.disconnect();
+                            state = STATE_DISCONNECTED;
+                            notifyHandlers(EVENT_CONNECTIVITY, null);
+                        } catch (Exception e) {
                         }
-                    }*/
+                    }
+                }*/
 
-                    IRCCloudLog.Log(Log.INFO, TAG, "Connectivity changed, connected: " + networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET));
+                IRCCloudLog.Log(Log.INFO, TAG, "Connectivity changed, connected: " + networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET));
 
-                    if (networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && (state == STATE_DISCONNECTED || state == STATE_DISCONNECTING) && session != null && handlers.size() > 0 && !notifier) {
-                        IRCCloudLog.Log(Log.INFO, TAG, "Network became available, reconnecting");
-                        if (idleTimerTask != null)
-                            idleTimerTask.cancel();
-                        connect();
-                    }
+                if (networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && (state == STATE_DISCONNECTED || state == STATE_DISCONNECTING) && session != null && handlers.size() > 0 && !notifier) {
+                    IRCCloudLog.Log(Log.INFO, TAG, "Network became available, reconnecting");
+                    if (idleTimerTask != null)
+                        idleTimerTask.cancel();
+                    connect();
                 }
+            }
 
-                @Override
-                public void onLost(Network network) {
-                    super.onLost(network);
-                    IRCCloudLog.Log(Log.INFO, TAG, "Network lost, disconnecting");
-                    cancel_idle_timer();
-                    reconnect_timestamp = 0;
-                    try {
-                        state = STATE_DISCONNECTING;
-                        client.disconnect();
-                        state = STATE_DISCONNECTED;
-                        notifyHandlers(EVENT_CONNECTIVITY, null);
-                    } catch (Exception e) {
-                    }
+            @Override
+            public void onLost(Network network) {
+                super.onLost(network);
+                IRCCloudLog.Log(Log.INFO, TAG, "Network lost, disconnecting");
+                cancel_idle_timer();
+                reconnect_timestamp = 0;
+                try {
+                    state = STATE_DISCONNECTING;
+                    client.disconnect();
+                    state = STATE_DISCONNECTED;
+                    notifyHandlers(EVENT_CONNECTIVITY, null);
+                } catch (Exception e) {
                 }
-            };
-        }
+            }
+        };
 
         try {
             config = new JSONObject(PreferenceManager.getDefaultSharedPreferences(IRCCloudApplication.getInstance().getApplicationContext()).getString("config", "{}"));
@@ -772,8 +741,7 @@ public void set_pastebin_cookie() {
                 CookieManager cm = CookieManager.getInstance();
                 Uri u = Uri.parse(config.getString("pastebin_uri_template"));
                 cm.setCookie(u.getScheme() + "://" + u.getHost() + "/", "session=" + session);
-                if (Build.VERSION.SDK_INT >= 21)
-                    cm.flush();
+                cm.flush();
                 sm.sync();
                 cm.setAcceptCookie(true);
             }
diff --git a/src/com/irccloud/android/activity/BaseActivity.java b/src/com/irccloud/android/activity/BaseActivity.java
index 9d8a0bbd4..b4c055d88 100644
--- a/src/com/irccloud/android/activity/BaseActivity.java
+++ b/src/com/irccloud/android/activity/BaseActivity.java
@@ -122,14 +122,12 @@ else if(theme.equals("dawn"))
             EventsList.getInstance().clearCaches();
             AvatarsList.getInstance().clear();
         }
-        if (Build.VERSION.SDK_INT >= 21) {
-            Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
-            if(cloud != null) {
-                setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, ColorScheme.getInstance().navBarColor));
-            }
-            getWindow().setStatusBarColor(ColorScheme.getInstance().statusBarColor);
-            getWindow().setNavigationBarColor(getResources().getColor(android.R.color.black));
+        Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
+        if(cloud != null) {
+            setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, ColorScheme.getInstance().navBarColor));
         }
+        getWindow().setStatusBarColor(ColorScheme.getInstance().statusBarColor);
+        getWindow().setNavigationBarColor(getResources().getColor(android.R.color.black));
         if(ColorScheme.getInstance().windowBackgroundDrawable != 0)
             getWindow().setBackgroundDrawableResource(ColorScheme.getInstance().windowBackgroundDrawable);
         if(Build.VERSION.SDK_INT >= 23) {
@@ -162,11 +160,9 @@ else if(theme.equals("dawn"))
             mMultiWindowActivity = null;
         }
 
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            IntentFilter intentFilter = new IntentFilter();
-            intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
-            registerReceiver(powerSaverListener, intentFilter);
-        }
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
+        registerReceiver(powerSaverListener, intentFilter);
     }
 
     @Override
@@ -175,8 +171,7 @@ protected void onDestroy() {
         if (conn != null) {
             conn.removeHandler(this);
         }
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-            unregisterReceiver(powerSaverListener);
+        unregisterReceiver(powerSaverListener);
     }
 
     public boolean isMultiWindow() {
diff --git a/src/com/irccloud/android/activity/EditConnectionActivity.java b/src/com/irccloud/android/activity/EditConnectionActivity.java
index 6fa045956..27be657fa 100644
--- a/src/com/irccloud/android/activity/EditConnectionActivity.java
+++ b/src/com/irccloud/android/activity/EditConnectionActivity.java
@@ -54,18 +54,12 @@ public void onCreate(Bundle savedInstanceState) {
 
         TextView t = findViewById(R.id.action_cancel);
         Drawable d;
-        if(Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
-            d = VectorDrawableCompat.create(getResources(), R.drawable.ic_action_cancel, null).mutate();
-        else
-            d = getResources().getDrawable(R.drawable.ic_action_cancel, null).mutate();
+        d = getResources().getDrawable(R.drawable.ic_action_cancel, null).mutate();
         d.setColorFilter(ColorScheme.getInstance().navBarHeadingColor, PorterDuff.Mode.SRC_ATOP);
         t.setCompoundDrawablesWithIntrinsicBounds(d, null, null, null);
 
         t = findViewById(R.id.action_done);
-        if(Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
-            d = VectorDrawableCompat.create(getResources(), R.drawable.ic_action_save, null).mutate();
-        else
-            d = getResources().getDrawable(R.drawable.ic_action_save, null).mutate();
+        d = getResources().getDrawable(R.drawable.ic_action_save, null).mutate();
         d.setColorFilter(ColorScheme.getInstance().navBarHeadingColor, PorterDuff.Mode.SRC_ATOP);
         t.setCompoundDrawablesWithIntrinsicBounds(d, null, null, null);
 
diff --git a/src/com/irccloud/android/activity/ImageViewerActivity.java b/src/com/irccloud/android/activity/ImageViewerActivity.java
index c6b80818c..fdda7286e 100644
--- a/src/com/irccloud/android/activity/ImageViewerActivity.java
+++ b/src/com/irccloud/android/activity/ImageViewerActivity.java
@@ -105,21 +105,15 @@ public void run() {
                     if (toolbar.getVisibility() == View.VISIBLE) {
                         if (mHideTimerTask != null)
                             mHideTimerTask.cancel();
-                        if (Build.VERSION.SDK_INT > 16) {
-                            toolbar.animate().alpha(0).translationY(-toolbar.getHeight()).withEndAction(new Runnable() {
-                                @Override
-                                public void run() {
-                                    toolbar.setVisibility(View.GONE);
-                                }
-                            });
-                        } else {
-                            toolbar.setVisibility(View.GONE);
-                        }
+                        toolbar.animate().alpha(0).translationY(-toolbar.getHeight()).withEndAction(new Runnable() {
+                            @Override
+                            public void run() {
+                                toolbar.setVisibility(View.GONE);
+                            }
+                        });
                     } else {
-                        if (Build.VERSION.SDK_INT > 16) {
-                            toolbar.setAlpha(0);
-                            toolbar.animate().alpha(1).translationY(0);
-                        }
+                        toolbar.setAlpha(0);
+                        toolbar.animate().alpha(1).translationY(0);
                         toolbar.setVisibility(View.VISIBLE);
                         hide_actionbar();
                     }
@@ -152,18 +146,14 @@ protected void onCreate(Bundle savedInstanceState) {
             setSupportActionBar(toolbar);
         } catch (Throwable t) {
         }
-        if (Build.VERSION.SDK_INT < 21) {
-            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
-        } else if(Build.VERSION.SDK_INT >= 21) {
-            Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
-            if(cloud != null) {
-                setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, getResources().getColor(android.R.color.black)));
-            }
-            getWindow().setStatusBarColor(getResources().getColor(android.R.color.black));
-            getWindow().setNavigationBarColor(getResources().getColor(android.R.color.black));
-            if(Build.VERSION.SDK_INT >= 23) {
-                getWindow().getDecorView().setSystemUiVisibility(getWindow().getDecorView().getSystemUiVisibility() &~ View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-            }
+        Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
+        if(cloud != null) {
+            setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, getResources().getColor(android.R.color.black)));
+        }
+        getWindow().setStatusBarColor(getResources().getColor(android.R.color.black));
+        getWindow().setNavigationBarColor(getResources().getColor(android.R.color.black));
+        if(Build.VERSION.SDK_INT >= 23) {
+            getWindow().getDecorView().setSystemUiVisibility(getWindow().getDecorView().getSystemUiVisibility() &~ View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
         }
         getSupportActionBar().setTitle("Image Viewer");
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -273,21 +263,15 @@ public void onClick(View view) {
                 if (toolbar.getVisibility() == View.VISIBLE) {
                     if (mHideTimerTask != null)
                         mHideTimerTask.cancel();
-                    if (Build.VERSION.SDK_INT > 16) {
-                        toolbar.animate().alpha(0).translationY(-toolbar.getHeight()).withEndAction(new Runnable() {
-                            @Override
-                            public void run() {
-                                toolbar.setVisibility(View.GONE);
-                            }
-                        });
-                    } else {
-                        toolbar.setVisibility(View.GONE);
-                    }
+                    toolbar.animate().alpha(0).translationY(-toolbar.getHeight()).withEndAction(new Runnable() {
+                        @Override
+                        public void run() {
+                            toolbar.setVisibility(View.GONE);
+                        }
+                    });
                 } else {
-                    if (Build.VERSION.SDK_INT > 16) {
-                        toolbar.setAlpha(0);
-                        toolbar.animate().alpha(1).translationY(0);
-                    }
+                    toolbar.setAlpha(0);
+                    toolbar.animate().alpha(1).translationY(0);
                     toolbar.setVisibility(View.VISIBLE);
                     hide_actionbar();
                 }
@@ -494,16 +478,12 @@ public void run() {
                     ImageViewerActivity.this.runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
-                            if (Build.VERSION.SDK_INT > 16) {
-                                toolbar.animate().alpha(0).translationY(-toolbar.getHeight()).withEndAction(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        toolbar.setVisibility(View.GONE);
-                                    }
-                                });
-                            } else {
-                                toolbar.setVisibility(View.GONE);
-                            }
+                            toolbar.animate().alpha(0).translationY(-toolbar.getHeight()).withEndAction(new Runnable() {
+                                @Override
+                                public void run() {
+                                    toolbar.setVisibility(View.GONE);
+                                }
+                            });
                         }
                     });
                 }
diff --git a/src/com/irccloud/android/activity/LoginActivity.java b/src/com/irccloud/android/activity/LoginActivity.java
index 9552b329f..1f7720e3e 100644
--- a/src/com/irccloud/android/activity/LoginActivity.java
+++ b/src/com/irccloud/android/activity/LoginActivity.java
@@ -119,10 +119,8 @@ public class LoginActivity extends FragmentActivity implements GoogleApiClient.C
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (Build.VERSION.SDK_INT >= 21) {
-            Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
-            setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, 0xff0b2e60));
-        }
+        Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
+        setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, 0xff0b2e60));
 
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
diff --git a/src/com/irccloud/android/activity/MainActivity.java b/src/com/irccloud/android/activity/MainActivity.java
index 63ecaa2f5..e2b6d47fe 100644
--- a/src/com/irccloud/android/activity/MainActivity.java
+++ b/src/com/irccloud/android/activity/MainActivity.java
@@ -299,7 +299,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 v.setBackgroundColor(colorScheme.bufferBackgroundColor);
             }
 
-            if(Build.VERSION.SDK_INT >= 19 && EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
+            if(EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
                 v.setText(EmojiCompat.get().process(getItem(position)));
 
             //This will prevent GridView from stealing focus from the EditText by bypassing the check on line 1397 of GridView.java in the Android Source
@@ -755,10 +755,7 @@ public void onClick(View v) {
         if(actionBar != null)
             actionBar.setCustomView(v);
 
-        if(Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
-            upDrawable = VectorDrawableCompat.create(getResources(), R.drawable.ic_action_navigation_menu, null).mutate();
-        else
-            upDrawable = getResources().getDrawable(R.drawable.ic_action_navigation_menu, null).mutate();
+        upDrawable = getResources().getDrawable(R.drawable.ic_action_navigation_menu, null).mutate();
         upDrawable.setColorFilter(normalFilter);
         upDrawableFilter = normalFilter;
         drawerLayout.setDrawerListener(mDrawerListener);
@@ -4281,7 +4278,7 @@ private void insertPhoto() {
         AlertDialog.Builder builder;
         AlertDialog dialog;
         builder = new AlertDialog.Builder(this);
-        String[] items = (Build.VERSION.SDK_INT < 19 || !NetworkConnection.getInstance().uploadsAvailable()) ? new String[]{"Take a Photo", "Choose Existing", "Post a Text Snippet", "Text Snippets"} : new String[]{"Take a Photo", "Record a Video", "Choose Existing Photo", "Choose Existing Document", "Post a Text Snippet", "Text Snippets"};
+        String[] items = (!NetworkConnection.getInstance().uploadsAvailable()) ? new String[]{"Take a Photo", "Choose Existing", "Post a Text Snippet", "Text Snippets"} : new String[]{"Take a Photo", "Record a Video", "Choose Existing Photo", "Choose Existing Document", "Post a Text Snippet", "Text Snippets"};
         if(NetworkConnection.getInstance().uploadsAvailable()) {
             items = Arrays.copyOf(items, items.length + 1);
             items[items.length - 1] = "File Uploads";
@@ -6786,7 +6783,7 @@ else if (lower.endsWith(".3gpp"))
                 i.putExtra("bid", mBuffer.getBid());
                 i.setData(Uri.parse("bid://" + mBuffer.getBid()));
                 notification.setContentIntent(PendingIntent.getActivity(IRCCloudApplication.getInstance().getApplicationContext(), 0, i, PendingIntent.FLAG_UPDATE_CURRENT));
-                notification.addAction(Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP?R.drawable.ic_action_cancel_upload:R.drawable.ic_action_cancel, "Cancel", PendingIntent.getBroadcast(activity, 0, new Intent(activity.getPackageName() + ".cancel_upload"), PendingIntent.FLAG_UPDATE_CURRENT));
+                notification.addAction(R.drawable.ic_action_cancel, "Cancel", PendingIntent.getBroadcast(activity, 0, new Intent(activity.getPackageName() + ".cancel_upload"), PendingIntent.FLAG_UPDATE_CURRENT));
 
 
                 if (activity.mediaPermissionsGranted())
diff --git a/src/com/irccloud/android/activity/PastebinViewerActivity.java b/src/com/irccloud/android/activity/PastebinViewerActivity.java
index 5ebf4b9b4..8bceffeb8 100644
--- a/src/com/irccloud/android/activity/PastebinViewerActivity.java
+++ b/src/com/irccloud/android/activity/PastebinViewerActivity.java
@@ -394,21 +394,13 @@ public void onClick(DialogInterface dialogInterface, int i) {
             finish();
             return true;
         } else if (item.getItemId() == R.id.action_copy) {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
-                android.text.ClipboardManager clipboard = (android.text.ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-                if(url.contains("?"))
-                    clipboard.setText(url.substring(0, url.indexOf("?")));
-                else
-                    clipboard.setText(url);
-            } else {
-                @SuppressLint("ServiceCast") android.content.ClipboardManager clipboard = (android.content.ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-                android.content.ClipData clip;
-                if(url.contains("?"))
-                    clip = android.content.ClipData.newRawUri("IRCCloud Snippet URL", Uri.parse(url.substring(0, url.indexOf("?"))));
-                else
-                    clip = android.content.ClipData.newRawUri("IRCCloud Snippet URL", Uri.parse(url));
-                clipboard.setPrimaryClip(clip);
-            }
+            @SuppressLint("ServiceCast") android.content.ClipboardManager clipboard = (android.content.ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+            android.content.ClipData clip;
+            if(url.contains("?"))
+                clip = android.content.ClipData.newRawUri("IRCCloud Snippet URL", Uri.parse(url.substring(0, url.indexOf("?"))));
+            else
+                clip = android.content.ClipData.newRawUri("IRCCloud Snippet URL", Uri.parse(url));
+            clipboard.setPrimaryClip(clip);
             Toast.makeText(PastebinViewerActivity.this, "Link copied to clipboard", Toast.LENGTH_SHORT).show();
         } else if(item.getItemId() == R.id.action_share) {
             if (getIntent() != null && getIntent().getDataString() != null) {
diff --git a/src/com/irccloud/android/activity/PreferencesActivity.java b/src/com/irccloud/android/activity/PreferencesActivity.java
index 66eedb5c6..0993d34ac 100644
--- a/src/com/irccloud/android/activity/PreferencesActivity.java
+++ b/src/com/irccloud/android/activity/PreferencesActivity.java
@@ -931,8 +931,7 @@ public boolean onPreferenceClick(Preference preference) {
                 builder.addDefaultShareMenuItem();
                 CustomTabsIntent intent = builder.build();
                 intent.intent.setData(Uri.parse(url));
-                if (Build.VERSION.SDK_INT >= 22)
-                    intent.intent.putExtra(Intent.EXTRA_REFERRER, Uri.parse(Intent.URI_ANDROID_APP_SCHEME + "//" + getPackageName()));
+                intent.intent.putExtra(Intent.EXTRA_REFERRER, Uri.parse(Intent.URI_ANDROID_APP_SCHEME + "//" + getPackageName()));
                 if (intent.startAnimationBundle != null) {
                     startActivity(intent.intent, intent.startAnimationBundle);
                 } else {
diff --git a/src/com/irccloud/android/activity/QuickReplyActivity.java b/src/com/irccloud/android/activity/QuickReplyActivity.java
index 9d88b82bd..7af23c082 100644
--- a/src/com/irccloud/android/activity/QuickReplyActivity.java
+++ b/src/com/irccloud/android/activity/QuickReplyActivity.java
@@ -184,12 +184,10 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTheme(ColorScheme.getDialogTheme(ColorScheme.getUserTheme()));
         ColorScheme.getInstance().setThemeFromContext(this, ColorScheme.getUserTheme());
-        if (Build.VERSION.SDK_INT >= 21) {
-            Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
-            setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, ColorScheme.getInstance().navBarColor));
-            getWindow().setStatusBarColor(ColorScheme.getInstance().statusBarColor);
-            getWindow().setNavigationBarColor(getResources().getColor(android.R.color.black));
-        }
+        Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
+        setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, ColorScheme.getInstance().navBarColor));
+        getWindow().setStatusBarColor(ColorScheme.getInstance().statusBarColor);
+        getWindow().setNavigationBarColor(getResources().getColor(android.R.color.black));
         setContentView(R.layout.activity_quick_reply);
 
         if(getIntent().hasExtra("cid") && getIntent().hasExtra("bid")) {
diff --git a/src/com/irccloud/android/activity/ShareChooserActivity.java b/src/com/irccloud/android/activity/ShareChooserActivity.java
index ab2ef2a82..69dadafb7 100644
--- a/src/com/irccloud/android/activity/ShareChooserActivity.java
+++ b/src/com/irccloud/android/activity/ShareChooserActivity.java
@@ -62,12 +62,10 @@ protected void onCreate(Bundle savedInstanceState) {
         countdownTimer = new Timer("share-chooser-countdown-timer");
         setTheme(ColorScheme.getDialogTheme(ColorScheme.getUserTheme()));
         ColorScheme.getInstance().setThemeFromContext(this, ColorScheme.getUserTheme());
-        if (Build.VERSION.SDK_INT >= 21) {
-            Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
-            setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, ColorScheme.getInstance().navBarColor));
-            getWindow().setStatusBarColor(ColorScheme.getInstance().statusBarColor);
-            getWindow().setNavigationBarColor(getResources().getColor(android.R.color.black));
-        }
+        Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
+        setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, ColorScheme.getInstance().navBarColor));
+        getWindow().setStatusBarColor(ColorScheme.getInstance().statusBarColor);
+        getWindow().setNavigationBarColor(getResources().getColor(android.R.color.black));
         getWindow().requestFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_share_chooser);
         connecting = findViewById(R.id.connecting);
diff --git a/src/com/irccloud/android/activity/VideoPlayerActivity.java b/src/com/irccloud/android/activity/VideoPlayerActivity.java
index d5b27c299..8fe75bd6e 100644
--- a/src/com/irccloud/android/activity/VideoPlayerActivity.java
+++ b/src/com/irccloud/android/activity/VideoPlayerActivity.java
@@ -78,12 +78,7 @@ public class VideoPlayerActivity extends BaseActivity implements ShareActionProv
         @Override
         public void run() {
             if(video != null && video.isPlaying()) {
-                if (Build.VERSION.SDK_INT > 16) {
-                    getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-                } else {
-                    toolbar.setVisibility(View.GONE);
-                    controls.setVisibility(View.GONE);
-                }
+                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
             }
         }
     };
@@ -151,39 +146,33 @@ protected void onCreate(Bundle savedInstanceState) {
             setSupportActionBar(toolbar);
         } catch (Throwable t) {
         }
-        if (Build.VERSION.SDK_INT < 21) {
-            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
-        } else if(Build.VERSION.SDK_INT >= 21) {
-            Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
-            if(cloud != null) {
-                setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, getResources().getColor(android.R.color.black)));
-            }
-            getWindow().setStatusBarColor(getResources().getColor(android.R.color.black));
-            getWindow().setNavigationBarColor(getResources().getColor(android.R.color.black));
-            if(Build.VERSION.SDK_INT >= 23) {
-                getWindow().getDecorView().setSystemUiVisibility(getWindow().getDecorView().getSystemUiVisibility() &~ View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-            }
+        Bitmap cloud = BitmapFactory.decodeResource(getResources(), R.drawable.splash_logo);
+        if(cloud != null) {
+            setTaskDescription(new ActivityManager.TaskDescription(getResources().getString(R.string.app_name), cloud, getResources().getColor(android.R.color.black)));
+        }
+        getWindow().setStatusBarColor(getResources().getColor(android.R.color.black));
+        getWindow().setNavigationBarColor(getResources().getColor(android.R.color.black));
+        if(Build.VERSION.SDK_INT >= 23) {
+            getWindow().getDecorView().setSystemUiVisibility(getWindow().getDecorView().getSystemUiVisibility() &~ View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
         }
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        if(Build.VERSION.SDK_INT > 16) {
-            getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
-                @Override
-                public void onSystemUiVisibilityChange(int visibility) {
-                    if ((visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
-                        toolbar.setAlpha(0);
-                        toolbar.animate().alpha(1);
-                        controls.setAlpha(0);
-                        controls.animate().alpha(1);
-                        hide_actionbar();
-                    } else {
-                        toolbar.setAlpha(1);
-                        toolbar.animate().alpha(0);
-                        controls.setAlpha(1);
-                        controls.animate().alpha(0);
-                    }
+        getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
+            @Override
+            public void onSystemUiVisibilityChange(int visibility) {
+                if ((visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
+                    toolbar.setAlpha(0);
+                    toolbar.animate().alpha(1);
+                    controls.setAlpha(0);
+                    controls.animate().alpha(1);
+                    hide_actionbar();
+                } else {
+                    toolbar.setAlpha(1);
+                    toolbar.animate().alpha(0);
+                    controls.setAlpha(1);
+                    controls.animate().alpha(0);
                 }
-            });
-        }
+            }
+        });
 
         controls = findViewById(R.id.controls);
         mProgress = findViewById(R.id.progress);
@@ -269,22 +258,11 @@ public void onStopTrackingTouch(SeekBar seekBar) {
         video.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
-                if (Build.VERSION.SDK_INT > 16) {
-                    if((getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
-                        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
-                    } else {
-                        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-                        hide_actionbar();
-                    }
+                if((getWindow().getDecorView().getSystemUiVisibility() & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
+                    getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION);
                 } else {
-                    if (toolbar.getVisibility() == View.VISIBLE) {
-                        toolbar.setVisibility(View.GONE);
-                        controls.setVisibility(View.GONE);
-                    } else {
-                        toolbar.setVisibility(View.VISIBLE);
-                        controls.setVisibility(View.VISIBLE);
-                        hide_actionbar();
-                    }
+                    getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+                    hide_actionbar();
                 }
                 return false;
             }
@@ -309,12 +287,7 @@ public void onCompletion(MediaPlayer mediaPlayer) {
                 video.pause();
                 video.seekTo(video.getDuration());
                 handler.removeCallbacks(mHideRunnable);
-                if (Build.VERSION.SDK_INT > 16) {
-                    getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-                } else {
-                    toolbar.setVisibility(View.VISIBLE);
-                    controls.setVisibility(View.VISIBLE);
-                }
+                getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
             }
         });
         video.setOnErrorListener(new MediaPlayer.OnErrorListener() {
diff --git a/src/com/irccloud/android/data/collection/NotificationsList.java b/src/com/irccloud/android/data/collection/NotificationsList.java
index b6074c829..57b758064 100644
--- a/src/com/irccloud/android/data/collection/NotificationsList.java
+++ b/src/com/irccloud/android/data/collection/NotificationsList.java
@@ -489,7 +489,7 @@ private void showOtherNotifications() {
                         action = null;
                     }
                     if(title != null && text != null)
-                        NotificationManagerCompat.from(IRCCloudApplication.getInstance().getApplicationContext()).notify((int) (n.getEid() / 1000), buildNotification(ticker, n.getCid(), n.getBid(), new long[]{n.getEid()}, title, text, 1, null, n.getNetwork(), null, action, AvatarsList.getInstance().getAvatar(n.getCid(), n.getNick(), null).getBitmap(false, (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 64, IRCCloudApplication.getInstance().getApplicationContext().getResources().getDisplayMetrics()), false, Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP), AvatarsList.getInstance().getAvatar(n.getCid(), n.getNick(), null).getBitmap(false, 400, false, false), null));
+                        NotificationManagerCompat.from(IRCCloudApplication.getInstance().getApplicationContext()).notify((int) (n.getEid() / 1000), buildNotification(ticker, n.getCid(), n.getBid(), new long[]{n.getEid()}, title, text, 1, null, n.getNetwork(), null, action, AvatarsList.getInstance().getAvatar(n.getCid(), n.getNick(), null).getBitmap(false, (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 64, IRCCloudApplication.getInstance().getApplicationContext().getResources().getDisplayMetrics()), false, true), AvatarsList.getInstance().getAvatar(n.getCid(), n.getNick(), null).getBitmap(false, 400, false, false), null));
                 }
             }
 
@@ -969,7 +969,7 @@ public void onImageFetched(Bitmap image) {
                 }
 
                 if(!downloading && avatar == null) {
-                    avatar = AvatarsList.getInstance().getAvatar(n.getCid(), ((n.getNick() != null)? n.getNick() :getServerNick(n.getCid())), null).getBitmap(false, (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 64, IRCCloudApplication.getInstance().getApplicationContext().getResources().getDisplayMetrics()), false, Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP);
+                    avatar = AvatarsList.getInstance().getAvatar(n.getCid(), ((n.getNick() != null)? n.getNick() :getServerNick(n.getCid())), null).getBitmap(false, (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 64, IRCCloudApplication.getInstance().getApplicationContext().getResources().getDisplayMetrics()), false, true);
                 }
 
                 if(avatar != null)
diff --git a/src/com/irccloud/android/data/model/Buffer.java b/src/com/irccloud/android/data/model/Buffer.java
index aa53fb920..34135c52b 100644
--- a/src/com/irccloud/android/data/model/Buffer.java
+++ b/src/com/irccloud/android/data/model/Buffer.java
@@ -181,7 +181,7 @@ public String getName() {
 
     @Bindable
     public CharSequence getEmojiCompatName() {
-        if(Build.VERSION.SDK_INT >= 19 && EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
+        if(EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
             return EmojiCompat.get().process(getDisplayName());
         else
             return getDisplayName();
diff --git a/src/com/irccloud/android/data/model/Server.java b/src/com/irccloud/android/data/model/Server.java
index fe0b49aee..ceb517847 100644
--- a/src/com/irccloud/android/data/model/Server.java
+++ b/src/com/irccloud/android/data/model/Server.java
@@ -129,7 +129,7 @@ public String getName() {
 
     @Bindable
     public CharSequence getEmojiCompatName() {
-        if(Build.VERSION.SDK_INT >= 19 && EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
+        if(EmojiCompat.get().getLoadState() == EmojiCompat.LOAD_STATE_SUCCEEDED)
             return EmojiCompat.get().process(name);
         else
             return name;