diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index be974feca..b6b3cd25b 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="113"
+    android:versionCode="114"
     android:versionName="0.0.33.1"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/res/drawable-hdpi/minus.png b/Habitica/res/drawable-hdpi/minus.png
new file mode 100644
index 000000000..eeb18c4ed
Binary files /dev/null and b/Habitica/res/drawable-hdpi/minus.png differ
diff --git a/Habitica/res/drawable-hdpi/plus.png b/Habitica/res/drawable-hdpi/plus.png
new file mode 100644
index 000000000..323ab83b5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/plus.png differ
diff --git a/Habitica/res/drawable-mdpi/minus.png b/Habitica/res/drawable-mdpi/minus.png
new file mode 100644
index 000000000..15e038eca
Binary files /dev/null and b/Habitica/res/drawable-mdpi/minus.png differ
diff --git a/Habitica/res/drawable-mdpi/plus.png b/Habitica/res/drawable-mdpi/plus.png
new file mode 100644
index 000000000..252184097
Binary files /dev/null and b/Habitica/res/drawable-mdpi/plus.png differ
diff --git a/Habitica/res/drawable-xhdpi/minus.png b/Habitica/res/drawable-xhdpi/minus.png
new file mode 100644
index 000000000..605b04f25
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/minus.png differ
diff --git a/Habitica/res/drawable-xhdpi/plus.png b/Habitica/res/drawable-xhdpi/plus.png
new file mode 100644
index 000000000..97f906df2
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/plus.png differ
diff --git a/Habitica/res/drawable-xxhdpi/minus.png b/Habitica/res/drawable-xxhdpi/minus.png
new file mode 100644
index 000000000..457044c09
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/minus.png differ
diff --git a/Habitica/res/drawable-xxhdpi/plus.png b/Habitica/res/drawable-xxhdpi/plus.png
new file mode 100644
index 000000000..204d336f5
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/plus.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/minus.png b/Habitica/res/drawable-xxxhdpi/minus.png
new file mode 100644
index 000000000..0421caf60
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/minus.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/plus.png b/Habitica/res/drawable-xxxhdpi/plus.png
new file mode 100644
index 000000000..6b2770d45
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/plus.png differ
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index e243c1973..7d64cef15 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -63,9 +63,9 @@
             <android.support.design.widget.TabLayout
                 android:id="@+id/detail_tabs"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
+                android:layout_height="54dp"
                 android:layout_gravity="bottom"
-                android:background="?attr/colorPrimary"
+                android:background="@color/brand_200"
                 android:elevation="0dp"
                 android:fillViewport="false"
 
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index 7e86c534b..a7605bd7b 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -24,8 +24,8 @@
             android:layout_width="@dimen/avatar_header_width"
             android:layout_height="@dimen/avatar_header_height"
             android:layout_gravity="center_vertical"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginRight="32dp"
             app:showBackground="true"
             app:showMount="true"
             app:showPet="true" />
@@ -38,21 +38,31 @@
 
             <include
                 android:id="@+id/hpBar"
-                layout="@layout/value_bar" />
+                layout="@layout/value_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/header_bar_spacing" />
 
             <include
                 android:id="@+id/xpBar"
-                layout="@layout/value_bar" />
+                layout="@layout/value_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/header_bar_spacing"  />
 
             <include
                 android:id="@+id/mpBar"
-                layout="@layout/value_bar" />
+                layout="@layout/value_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
         </LinearLayout>
     </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingTop="6dp"
+        android:paddingBottom="6dp">
     <TextView
         android:id="@+id/lvl_tv"
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index 54b22287f..40e917565 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -26,9 +26,10 @@
                 android:orientation="vertical"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingEnd="16dp"
+                android:paddingLeft="@dimen/task_text_padding"
+                android:paddingStart="@dimen/task_text_padding"
+                android:paddingRight="@dimen/task_text_padding"
+                android:paddingEnd="@dimen/task_text_padding"
                 android:paddingBottom="@dimen/task_top_bottom_padding"
                 android:paddingTop="@dimen/task_top_bottom_padding"
                 android:id="@+id/linearLayout"
@@ -74,7 +75,7 @@
         </LinearLayout>
         <View
                 android:id="@+id/rightBorderView"
-                android:layout_width="5dp"
+                android:layout_width="@dimen/task_right_border_width"
                 android:layout_height="match_parent"
                 android:gravity="center" />
     </LinearLayout>
diff --git a/Habitica/res/layout/habit_item_card.xml b/Habitica/res/layout/habit_item_card.xml
index 74095d34c..fbc85f880 100644
--- a/Habitica/res/layout/habit_item_card.xml
+++ b/Habitica/res/layout/habit_item_card.xml
@@ -21,11 +21,17 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:id="@+id/btnPlusBackground"/>
+                    <ImageView
+                            android:id="@+id/btnPlusIconView"
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:src="@drawable/plus"
+                            android:scaleType="center"
+                            android:layout_gravity="center" />
                     <Button
                         android:id="@+id/btnPlus"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:text="+"
                         android:background="@drawable/selection_highlight"
                         style="@style/HabitButton" />
                 </FrameLayout>
@@ -38,11 +44,17 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:id="@+id/btnMinusBackground"/>
+                    <ImageView
+                            android:id="@+id/btnMinusIconView"
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:src="@drawable/minus"
+                            android:scaleType="center"
+                            android:layout_gravity="center" />
                     <Button
                         android:id="@+id/btnMinus"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:text="-"
                         android:background="@drawable/selection_highlight"
                         style="@style/HabitButton"/>
                 </FrameLayout>
@@ -52,9 +64,10 @@
                     android:layout_weight="1"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
-                    android:paddingEnd="16dp"
+                    android:paddingLeft="@dimen/task_text_padding"
+                    android:paddingStart="@dimen/task_text_padding"
+                    android:paddingRight="@dimen/task_text_padding"
+                    android:paddingEnd="@dimen/task_text_padding"
                     android:paddingBottom="@dimen/task_top_bottom_padding"
                     android:paddingTop="@dimen/task_top_bottom_padding">
                     <net.pherth.android.emoji_library.EmojiTextView
@@ -72,7 +85,7 @@
                 </LinearLayout>
                 <View
                     android:id="@+id/rightBorderView"
-                    android:layout_width="5dp"
+                    android:layout_width="@dimen/task_right_border_width"
                     android:layout_height="match_parent"
                     android:gravity="center" />
 </LinearLayout>
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index a1449417d..dfc639b3e 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -20,7 +20,9 @@
                         android:layout_weight="1"
                         android:paddingBottom="@dimen/task_top_bottom_padding"
                         android:paddingTop="@dimen/task_top_bottom_padding"
-                        android:paddingLeft='16dp'
+                        android:paddingLeft="@dimen/task_text_padding"
+                        android:paddingStart="@dimen/task_text_padding"
+                        android:paddingEnd="@dimen/reward_spacing"
                         android:paddingRight="@dimen/reward_spacing"
                         android:layout_gravity="center_vertical">
 
diff --git a/Habitica/res/layout/todo_item_card.xml b/Habitica/res/layout/todo_item_card.xml
index 12b375068..b4a78038d 100644
--- a/Habitica/res/layout/todo_item_card.xml
+++ b/Habitica/res/layout/todo_item_card.xml
@@ -27,9 +27,10 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingEnd="16dp"
+                android:paddingLeft="@dimen/task_text_padding"
+                android:paddingStart="@dimen/task_text_padding"
+                android:paddingRight="@dimen/task_text_padding"
+                android:paddingEnd="@dimen/task_text_padding"
                 android:paddingBottom="@dimen/task_top_bottom_padding"
                 android:paddingTop="@dimen/task_top_bottom_padding"
                 android:layout_weight="1">
diff --git a/Habitica/res/layout/value_bar.xml b/Habitica/res/layout/value_bar.xml
index 0cfa8999e..2335a04e1 100644
--- a/Habitica/res/layout/value_bar.xml
+++ b/Habitica/res/layout/value_bar.xml
@@ -41,8 +41,8 @@
             android:id="@+id/ic_header"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/bar_padding"
-            android:layout_marginEnd="@dimen/bar_padding"
+            android:layout_marginRight="@dimen/bar_icon_padding"
+            android:layout_marginEnd="@dimen/bar_icon_padding"
             android:layout_alignTop="@+id/bar_full"
             android:layout_alignBottom="@id/bar_full"
             android:scaleType="center"
@@ -74,7 +74,8 @@
             android:layout_below="@id/bar_full"
             android:layout_toRightOf="@id/ic_header"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+                android:layout_marginTop="1dp">
             <TextView
                 android:id="@+id/TV_value"
                 android:layout_width="0dp"
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 0e0c6626f..8d7327927 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -31,7 +31,7 @@
 	<dimen name="btn_separator_margin">4dip</dimen>
 
 	<dimen name="list_preferred_item_height">48dp</dimen>
-	<dimen name="minus_plus_buttonsize">50dp</dimen>
+	<dimen name="minus_plus_buttonsize">65dp</dimen>
 	<dimen name="view_layout_margin">4dp</dimen>
 	<dimen name="row_size">58dp</dimen>
     <dimen name="btn_height_reward">50dp</dimen>
@@ -42,7 +42,7 @@
     <!-- Widget -->
     <dimen name="widget_bar_horizontal_margin">20dp</dimen>
 
-	<dimen name="button_width">60dp</dimen>
+	<dimen name="button_width">65dp</dimen>
 
 	<dimen name="hairline_height">0.5dp</dimen>
 	<dimen name="checklist_divider_width">14dp</dimen>
@@ -72,4 +72,9 @@
 	<dimen name="pet_image_height">99dp</dimen>
 	<dimen name="shop_width">162dp</dimen>
 	<dimen name="shop_height">138dp</dimen>
+	<dimen name="bar_icon_padding">10dp</dimen>
+	<dimen name="task_text_padding">16dp</dimen>
+	<dimen name="task_right_border_width">5dp</dimen>
+	<dimen name="header_bar_spacing">7dp</dimen>
+	<dimen name="habit_circle_background_size">40dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
index 464743355..8352fb2e9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
@@ -297,8 +297,13 @@ public class APIHelper implements Action1<Throwable> {
         } else if (throwableClass.equals(HttpException.class)) {
             HttpException error = (HttpException) throwable;
             ErrorResponse res = getErrorResponse(error);
-
             int status = error.code();
+
+            if (error.response().raw().request().url().toString().endsWith("/user/push-devices")) {
+                //workaround for an error that sometimes displays that the user already has this push device
+                return;
+            }
+
             if (status >= 400 && status < 500) {
                 if (res != null && res.message != null && !res.message.isEmpty()) {
                     showConnectionProblemDialog("", res.message);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
index 6fd69bbe4..a52fe97ca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
@@ -6,6 +6,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 
 import org.greenrobot.eventbus.EventBus;
 
+import android.graphics.Color;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
@@ -17,6 +18,8 @@ public class HabitViewHolder extends BaseTaskViewHolder {
 
     @BindView(R.id.btnPlusWrapper)
     FrameLayout btnPlusWrapper;
+    @BindView(R.id.btnPlusIconView)
+    View btnPlusIconView;
     @BindView(R.id.btnPlusBackground)
     View btnPlusBackground;
     @BindView(R.id.btnPlus)
@@ -24,6 +27,8 @@ public class HabitViewHolder extends BaseTaskViewHolder {
 
     @BindView(R.id.btnMinusWrapper)
     FrameLayout btnMinusWrapper;
+    @BindView(R.id.btnMinusIconView)
+    View btnMinusIconView;
     @BindView(R.id.btnMinusBackground)
     View btnMinusBackground;
     @BindView(R.id.btnMinus)