diff --git a/Habitica/res/drawable/ic_check_white_18dp.xml b/Habitica/res/drawable/ic_check_white_18dp.xml
new file mode 100644
index 000000000..6b98d7012
--- /dev/null
+++ b/Habitica/res/drawable/ic_check_white_18dp.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="18dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="18dp">
+    <path android:fillColor="#FFFFFF" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/Habitica/res/drawable/setup_customization_flower_bg.xml b/Habitica/res/drawable/setup_customization_flower_bg.xml
new file mode 100644
index 000000000..b433c30de
--- /dev/null
+++ b/Habitica/res/drawable/setup_customization_flower_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <stroke android:color="@color/days_gray" android:width="2dp" />
+    <size android:height="50dp" android:width="50dp" />
+</shape>
diff --git a/Habitica/res/drawable/setup_customization_flower_bg_selected.xml b/Habitica/res/drawable/setup_customization_flower_bg_selected.xml
new file mode 100644
index 000000000..b923ad413
--- /dev/null
+++ b/Habitica/res/drawable/setup_customization_flower_bg_selected.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <stroke android:color="@color/brand_400" android:width="3dp" />
+    <size android:height="50dp" android:width="50dp" />
+</shape>
diff --git a/Habitica/res/values-h601dp/dimens.xml b/Habitica/res/values-h601dp/dimens.xml
index 4c491d85d..1a6197d54 100644
--- a/Habitica/res/values-h601dp/dimens.xml
+++ b/Habitica/res/values-h601dp/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="setup_vertical_spacing">20dp</dimen>
+    <dimen name="setup_vertical_spacing">28dp</dimen>
     <dimen name="customization_drawer_subcategory_height">130dp</dimen>
     <dimen name="customization_drawer_category_height">100dp</dimen>
     <dimen name="customization_drawer_caret_margin">91dp</dimen>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java
index c0380b3a3..486d4c3c8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java
@@ -64,7 +64,7 @@ public class TaskSetupAdapter extends RecyclerView.Adapter<TaskSetupAdapter.Task
 
         Context context;
 
-        public TaskViewHolder(View itemView) {
+        TaskViewHolder(View itemView) {
             super(itemView);
 
             ButterKnife.bind(this, itemView);
@@ -73,7 +73,7 @@ public class TaskSetupAdapter extends RecyclerView.Adapter<TaskSetupAdapter.Task
 
             itemView.setOnClickListener(this);
 
-            icon = ContextCompat.getDrawable(context, R.drawable.ic_check);
+            icon = ContextCompat.getDrawable(context, R.drawable.ic_check_white_18dp);
             icon.setColorFilter(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY);
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
index 003f8b5ef..881ab60b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
@@ -186,9 +186,9 @@ public class AvatarSetupFragment extends BaseFragment {
         activateButton(hairButton);
         this.activeCategory = "hair";
         this.subCategoryTabs.removeAllTabs();
-        this.subcategories = Arrays.asList("color", "bangs", "ponytail");
-        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_color));
+        this.subcategories = Arrays.asList("bangs", "color", "ponytail");
         this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_bangs));
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_color));
         this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_ponytail));
         loadCustomizations();
     }
@@ -225,6 +225,7 @@ public class AvatarSetupFragment extends BaseFragment {
         EventBus.getDefault().post(command);
     }
 
+    @Nullable
     private String chooseRandomKey(List<SetupCustomization> customizations, boolean weighFirstOption) {
         if (customizations.size() == 0) {
             return null;