diff --git a/Habitica/res/drawable-hdpi/icon_dailies_unselected.png b/Habitica/res/drawable-hdpi/icon_dailies_unselected.png
deleted file mode 100644
index 2fcacb24c..000000000
Binary files a/Habitica/res/drawable-hdpi/icon_dailies_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/icon_habits_unselected.png b/Habitica/res/drawable-hdpi/icon_habits_unselected.png
deleted file mode 100644
index f50fc5db8..000000000
Binary files a/Habitica/res/drawable-hdpi/icon_habits_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/icon_rewards_unselected.png b/Habitica/res/drawable-hdpi/icon_rewards_unselected.png
deleted file mode 100644
index 93aa9bf0e..000000000
Binary files a/Habitica/res/drawable-hdpi/icon_rewards_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/icon_todos_unselected.png b/Habitica/res/drawable-hdpi/icon_todos_unselected.png
deleted file mode 100644
index cd24b2842..000000000
Binary files a/Habitica/res/drawable-hdpi/icon_todos_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/icon_dailies_unselected.png b/Habitica/res/drawable-mdpi/icon_dailies_unselected.png
deleted file mode 100644
index df74eccfd..000000000
Binary files a/Habitica/res/drawable-mdpi/icon_dailies_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/icon_habits_unselected.png b/Habitica/res/drawable-mdpi/icon_habits_unselected.png
deleted file mode 100644
index 45dd7efdf..000000000
Binary files a/Habitica/res/drawable-mdpi/icon_habits_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/icon_rewards_unselected.png b/Habitica/res/drawable-mdpi/icon_rewards_unselected.png
deleted file mode 100644
index f4bc18f92..000000000
Binary files a/Habitica/res/drawable-mdpi/icon_rewards_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/icon_todos_unselected.png b/Habitica/res/drawable-mdpi/icon_todos_unselected.png
deleted file mode 100644
index adc6ba393..000000000
Binary files a/Habitica/res/drawable-mdpi/icon_todos_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/icon_dailies_unselected.png b/Habitica/res/drawable-xhdpi/icon_dailies_unselected.png
deleted file mode 100644
index 5c6f74d27..000000000
Binary files a/Habitica/res/drawable-xhdpi/icon_dailies_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/icon_habits_unselected.png b/Habitica/res/drawable-xhdpi/icon_habits_unselected.png
deleted file mode 100644
index 01bc6c894..000000000
Binary files a/Habitica/res/drawable-xhdpi/icon_habits_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/icon_rewards_unselected.png b/Habitica/res/drawable-xhdpi/icon_rewards_unselected.png
deleted file mode 100644
index 8adbb7795..000000000
Binary files a/Habitica/res/drawable-xhdpi/icon_rewards_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/icon_todos_unselected.png b/Habitica/res/drawable-xhdpi/icon_todos_unselected.png
deleted file mode 100644
index a846b575b..000000000
Binary files a/Habitica/res/drawable-xhdpi/icon_todos_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_dailies_unselected.png b/Habitica/res/drawable-xxhdpi/icon_dailies_unselected.png
deleted file mode 100644
index 0a713fe51..000000000
Binary files a/Habitica/res/drawable-xxhdpi/icon_dailies_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_habits_unselected.png b/Habitica/res/drawable-xxhdpi/icon_habits_unselected.png
deleted file mode 100644
index b723de8c7..000000000
Binary files a/Habitica/res/drawable-xxhdpi/icon_habits_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_rewards_unselected.png b/Habitica/res/drawable-xxhdpi/icon_rewards_unselected.png
deleted file mode 100644
index e42ae320a..000000000
Binary files a/Habitica/res/drawable-xxhdpi/icon_rewards_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_todos_unselected.png b/Habitica/res/drawable-xxhdpi/icon_todos_unselected.png
deleted file mode 100644
index 7b5638f22..000000000
Binary files a/Habitica/res/drawable-xxhdpi/icon_todos_unselected.png and /dev/null differ
diff --git a/Habitica/res/drawable/icon_dailies.xml b/Habitica/res/drawable/icon_dailies.xml
deleted file mode 100644
index c99a0d1db..000000000
--- a/Habitica/res/drawable/icon_dailies.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_dailies_selected" android:state_selected="true" />
-    <item android:drawable="@drawable/icon_dailies_unselected" android:state_selected="false" />
-</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/icon_habits.xml b/Habitica/res/drawable/icon_habits.xml
deleted file mode 100644
index 437388fbe..000000000
--- a/Habitica/res/drawable/icon_habits.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_habits_selected" android:state_selected="true" />
-    <item android:drawable="@drawable/icon_habits_unselected" android:state_selected="false" />
-</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/icon_rewards.xml b/Habitica/res/drawable/icon_rewards.xml
deleted file mode 100644
index 36739cc71..000000000
--- a/Habitica/res/drawable/icon_rewards.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_rewards_selected" android:state_selected="true" />
-    <item android:drawable="@drawable/icon_rewards_unselected" android:state_selected="false" />
-</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/icon_todos.xml b/Habitica/res/drawable/icon_todos.xml
deleted file mode 100644
index dd9b06ee0..000000000
--- a/Habitica/res/drawable/icon_todos.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_todos_selected" android:state_selected="true" />
-    <item android:drawable="@drawable/icon_todos_unselected" android:state_selected="false" />
-</selector>
\ No newline at end of file
diff --git a/Habitica/res/menu/bottom_navigation_tasks.xml b/Habitica/res/menu/bottom_navigation_tasks.xml
deleted file mode 100644
index 8ef31764a..000000000
--- a/Habitica/res/menu/bottom_navigation_tasks.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-            android:id="@+id/action_habits"
-            android:enabled="true"
-            android:icon="@drawable/icon_habits"
-            android:title="@string/habits"
-            app:showAsAction="always" />
-    <item
-            android:id="@+id/action_dailies"
-            android:enabled="true"
-            android:icon="@drawable/icon_dailies"
-            android:title="@string/dailies"
-            app:showAsAction="always" />
-    <item
-            android:id="@+id/action_todos"
-            android:enabled="true"
-            android:icon="@drawable/icon_todos"
-            android:title="@string/todos"
-            app:showAsAction="always" />
-    <item
-            android:id="@+id/action_rewards"
-            android:enabled="true"
-            android:icon="@drawable/icon_rewards"
-            android:title="@string/rewards"
-            app:showAsAction="always"/>
-</menu>
\ No newline at end of file
diff --git a/Habitica/res/xml/main_menu_tasks.xml b/Habitica/res/xml/main_menu_tasks.xml
index 5a705d42a..1b58769d0 100644
--- a/Habitica/res/xml/main_menu_tasks.xml
+++ b/Habitica/res/xml/main_menu_tasks.xml
@@ -2,18 +2,18 @@
 <tabs>
     <tab
             id="@+id/tab_habits"
-            icon="@drawable/icon_habits"
+            icon="@drawable/icon_habits_selected"
             title="@string/habits" />
     <tab
             id="@+id/tab_dailies"
-            icon="@drawable/icon_dailies"
+            icon="@drawable/icon_dailies_selected"
             title="@string/dailies" />
     <tab
             id="@+id/tab_todos"
-            icon="@drawable/icon_todos"
+            icon="@drawable/icon_todos_selected"
             title="@string/todos" />
     <tab
             id="@+id/tab_rewards"
-            icon="@drawable/icon_rewards"
+            icon="@drawable/icon_rewards_selected"
             title="@string/rewards" />
 </tabs>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
index 8b7ad48de..62855cc9f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java
@@ -68,7 +68,9 @@ public class PreferencesFragment extends BasePreferencesFragment implements
     @Override
     public void onDestroy() {
         userRepository.close();
-        subscription.unsubscribe();
+        if (subscription != null) {
+            subscription.unsubscribe();
+        }
         super.onDestroy();
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
index facc83855..c7324a23f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
@@ -335,6 +335,7 @@ public class TasksFragment extends BaseMainFragment {
                 }
             }
         }, RxErrorHandler.handleEmptyError());
+        BottomBarTab tab = bottomNavigation.getTabWithId(R.id.tab_dailies);
     }
     // endregion