diff --git a/Habitica/res/drawable-hdpi/add_daily.png b/Habitica/res/drawable-hdpi/add_daily.png
index 634e94044..827707188 100644
Binary files a/Habitica/res/drawable-hdpi/add_daily.png and b/Habitica/res/drawable-hdpi/add_daily.png differ
diff --git a/Habitica/res/drawable-hdpi/add_habit.png b/Habitica/res/drawable-hdpi/add_habit.png
index 9f9c7e51f..575ace093 100644
Binary files a/Habitica/res/drawable-hdpi/add_habit.png and b/Habitica/res/drawable-hdpi/add_habit.png differ
diff --git a/Habitica/res/drawable-hdpi/add_rewards.png b/Habitica/res/drawable-hdpi/add_rewards.png
index d0ebfd919..98e497f00 100644
Binary files a/Habitica/res/drawable-hdpi/add_rewards.png and b/Habitica/res/drawable-hdpi/add_rewards.png differ
diff --git a/Habitica/res/drawable-hdpi/add_todo.png b/Habitica/res/drawable-hdpi/add_todo.png
index 5d3ad7baa..0f309e182 100644
Binary files a/Habitica/res/drawable-hdpi/add_todo.png and b/Habitica/res/drawable-hdpi/add_todo.png differ
diff --git a/Habitica/res/drawable-mdpi/add_daily.png b/Habitica/res/drawable-mdpi/add_daily.png
index 768973c1c..51e2ed5cd 100644
Binary files a/Habitica/res/drawable-mdpi/add_daily.png and b/Habitica/res/drawable-mdpi/add_daily.png differ
diff --git a/Habitica/res/drawable-mdpi/add_habit.png b/Habitica/res/drawable-mdpi/add_habit.png
index da6ab2b2c..54bd1dc25 100644
Binary files a/Habitica/res/drawable-mdpi/add_habit.png and b/Habitica/res/drawable-mdpi/add_habit.png differ
diff --git a/Habitica/res/drawable-mdpi/add_rewards.png b/Habitica/res/drawable-mdpi/add_rewards.png
index faad5bcad..6d26f7a63 100644
Binary files a/Habitica/res/drawable-mdpi/add_rewards.png and b/Habitica/res/drawable-mdpi/add_rewards.png differ
diff --git a/Habitica/res/drawable-mdpi/add_todo.png b/Habitica/res/drawable-mdpi/add_todo.png
index d468bb980..f7fbc2f05 100644
Binary files a/Habitica/res/drawable-mdpi/add_todo.png and b/Habitica/res/drawable-mdpi/add_todo.png differ
diff --git a/Habitica/res/drawable-xhdpi/add_daily.png b/Habitica/res/drawable-xhdpi/add_daily.png
index 16cc1773d..f4f873e41 100644
Binary files a/Habitica/res/drawable-xhdpi/add_daily.png and b/Habitica/res/drawable-xhdpi/add_daily.png differ
diff --git a/Habitica/res/drawable-xhdpi/add_habit.png b/Habitica/res/drawable-xhdpi/add_habit.png
index cce99f379..f4959d029 100644
Binary files a/Habitica/res/drawable-xhdpi/add_habit.png and b/Habitica/res/drawable-xhdpi/add_habit.png differ
diff --git a/Habitica/res/drawable-xhdpi/add_rewards.png b/Habitica/res/drawable-xhdpi/add_rewards.png
index 12deece92..08b316c7a 100644
Binary files a/Habitica/res/drawable-xhdpi/add_rewards.png and b/Habitica/res/drawable-xhdpi/add_rewards.png differ
diff --git a/Habitica/res/drawable-xhdpi/add_todo.png b/Habitica/res/drawable-xhdpi/add_todo.png
index 2aa5f19bf..6e4e4d411 100644
Binary files a/Habitica/res/drawable-xhdpi/add_todo.png and b/Habitica/res/drawable-xhdpi/add_todo.png differ
diff --git a/Habitica/res/drawable-xxhdpi/add_daily.png b/Habitica/res/drawable-xxhdpi/add_daily.png
index d77159c52..8f4bfdc86 100644
Binary files a/Habitica/res/drawable-xxhdpi/add_daily.png and b/Habitica/res/drawable-xxhdpi/add_daily.png differ
diff --git a/Habitica/res/drawable-xxhdpi/add_habit.png b/Habitica/res/drawable-xxhdpi/add_habit.png
index 2211590e8..7e2ea8cb4 100644
Binary files a/Habitica/res/drawable-xxhdpi/add_habit.png and b/Habitica/res/drawable-xxhdpi/add_habit.png differ
diff --git a/Habitica/res/drawable-xxhdpi/add_rewards.png b/Habitica/res/drawable-xxhdpi/add_rewards.png
index 0916d6d86..c85a15f65 100644
Binary files a/Habitica/res/drawable-xxhdpi/add_rewards.png and b/Habitica/res/drawable-xxhdpi/add_rewards.png differ
diff --git a/Habitica/res/drawable-xxhdpi/add_todo.png b/Habitica/res/drawable-xxhdpi/add_todo.png
index 8f073f444..57294482f 100644
Binary files a/Habitica/res/drawable-xxhdpi/add_todo.png and b/Habitica/res/drawable-xxhdpi/add_todo.png differ
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index f2a2d565b..8190e1788 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -82,7 +82,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
-                android:layout_marginBottom="-5dp"
                 />
             <com.roughike.bottombar.BottomBar
                 android:id="@+id/bottom_navigation"
diff --git a/Habitica/res/layout/floating_menu_tasks.xml b/Habitica/res/layout/floating_menu_tasks.xml
index 83f6619af..c237864d0 100644
--- a/Habitica/res/layout/floating_menu_tasks.xml
+++ b/Habitica/res/layout/floating_menu_tasks.xml
@@ -1,90 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:fab="http://schemas.android.com/apk/res-auto"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/fab.menu"
-        app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+<com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/fab.menu"
+    app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom|right"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="16dp"
+    android:layout_marginRight="8dp"
+    fab:menu_fab_size="normal"
+    fab:menu_colorNormal="@color/brand_400"
+    fab:menu_colorPressed="@color/brand_500"
+    fab:menu_colorRipple="#FFFFFF"
+    fab:menu_animationDelayPerItem="50"
+    fab:menu_icon="@drawable/fab_add"
+    fab:menu_buttonSpacing="2dp"
+    fab:menu_labels_margin="4dp">
+
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.habit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginRight="8dp"
-        fab:menu_fab_size="normal"
-        fab:menu_labels_paddingTop="8dp"
-        fab:menu_labels_paddingRight="8dp"
-        fab:menu_labels_paddingBottom="8dp"
-        fab:menu_labels_paddingLeft="8dp"
 
-        fab:menu_colorNormal="@color/brand_400"
-        fab:menu_colorPressed="@color/brand_500"
-        fab:menu_colorRipple="#FFFFFF"
-        fab:menu_animationDelayPerItem="50"
-        fab:menu_icon="@drawable/fab_add"
-        fab:menu_buttonSpacing="4dp">
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.habit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
+        android:src="@drawable/add_habit"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_habit" />
 
-            fab:fab_colorNormal="@color/white"
-            fab:fab_colorPressed="@color/brand_500"
-            fab:fab_colorRipple="#FFFFFF"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.daily"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="4dp"
-            android:src="@drawable/add_habit"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_habit" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.daily"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
 
-            fab:fab_colorNormal="@color/white"
-            fab:fab_colorPressed="@color/brand_500"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_daily"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_daily" />
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="4dp"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.todo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
 
-            android:src="@drawable/add_daily"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_daily" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.todo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
 
-            fab:fab_colorNormal="@color/white"
-            fab:fab_colorPressed="@color/brand_500"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_todo"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_todo" />
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="4dp"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.reward"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
 
-            android:src="@drawable/add_todo"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_todo" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
 
-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.reward"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
 
-            fab:fab_colorNormal="@color/white"
-            fab:fab_colorPressed="@color/brand_500"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_rewards"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_reward" />
 
-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="4dp"
-
-            android:src="@drawable/add_rewards"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_reward" />
-
-    </com.github.clans.fab.FloatingActionMenu>
+</com.github.clans.fab.FloatingActionMenu>
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index b0d5fca6d..1d62124ee 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -2,7 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="@color/white">
 
     <LinearLayout
         android:id="@+id/gearElementsLayout"
@@ -16,7 +17,9 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_gravity="center_vertical"
-            android:padding="8dp" />
+            android:layout_margin="12dp"
+            android:scaleType="center"
+            tools:src="@drawable/custom_reward"/>
 
         <LinearLayout
             android:id="@+id/textReward"
@@ -27,7 +30,6 @@
             android:orientation="vertical"
             android:paddingBottom="@dimen/task_top_bottom_padding"
             android:paddingEnd="@dimen/reward_spacing"
-            android:paddingLeft="12dp"
             android:paddingRight="@dimen/reward_spacing"
             android:paddingStart="12dp"
             android:paddingTop="@dimen/task_top_bottom_padding">
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 8edc5e433..d147a705d 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
@@ -29,8 +29,10 @@ import com.habitrpg.android.habitica.events.TaskSaveEvent;
 import com.habitrpg.android.habitica.events.TaskTappedEvent;
 import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand;
 import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
-import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
 import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
@@ -38,21 +40,15 @@ import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder;
 import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.TutorialStep;
-import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 import com.roughike.bottombar.BottomBarTab;
 
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 import javax.inject.Inject;