diff --git a/Habitica/res/drawable-hdpi/back_arrow_disabled.png b/Habitica/res/drawable-hdpi/back_arrow_disabled.png
new file mode 100644
index 000000000..6c91d2bbb
Binary files /dev/null and b/Habitica/res/drawable-hdpi/back_arrow_disabled.png differ
diff --git a/Habitica/res/drawable-hdpi/back_arrow_enabled.png b/Habitica/res/drawable-hdpi/back_arrow_enabled.png
new file mode 100644
index 000000000..2566cd2e6
Binary files /dev/null and b/Habitica/res/drawable-hdpi/back_arrow_enabled.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_blank_face.png b/Habitica/res/drawable-hdpi/creator_blank_face.png
new file mode 100644
index 000000000..a4fdf0a86
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_blank_face.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_black.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_black.png
new file mode 100644
index 000000000..769bd0a72
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_black.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_blue.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_blue.png
new file mode 100644
index 000000000..b1341fb0a
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_blue.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_green.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_green.png
new file mode 100644
index 000000000..90da0c03d
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_green.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_pink.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_pink.png
new file mode 100644
index 000000000..3addee53e
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_pink.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_white.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_white.png
new file mode 100644
index 000000000..a76a41ebe
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_white.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_broad_shirt_yellow.png b/Habitica/res/drawable-hdpi/creator_broad_shirt_yellow.png
new file mode 100644
index 000000000..4d437cd43
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_broad_shirt_yellow.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_1_black.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_black.png
new file mode 100644
index 000000000..054beda0b
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_black.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_1_blond.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_blond.png
new file mode 100644
index 000000000..61d29de1f
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_blond.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_1_brown.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_brown.png
new file mode 100644
index 000000000..65f0b1147
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_brown.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_1_red.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_red.png
new file mode 100644
index 000000000..1dc0fc4ce
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_red.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_1_white.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_white.png
new file mode 100644
index 000000000..cf36c0f9b
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_1_white.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_red.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_red.png
new file mode 100644
index 000000000..fbb3cb955
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_red.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_3_red.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_red.png
new file mode 100644
index 000000000..c3facca91
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hair_bangs_3_red.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_hills_bg.png b/Habitica/res/drawable-hdpi/creator_hills_bg.png
new file mode 100644
index 000000000..922d5a0ee
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_hills_bg.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_purple_bg.png b/Habitica/res/drawable-hdpi/creator_purple_bg.png
new file mode 100644
index 000000000..b7d6e9fba
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_purple_bg.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_black.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_black.png
new file mode 100644
index 000000000..13b104eaa
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_black.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_blue.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_blue.png
new file mode 100644
index 000000000..7eba31aca
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_blue.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_green.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_green.png
new file mode 100644
index 000000000..3e26538ab
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_green.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_pink.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_pink.png
new file mode 100644
index 000000000..86390c0fa
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_pink.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_white.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_white.png
new file mode 100644
index 000000000..18fd2404b
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_white.png differ
diff --git a/Habitica/res/drawable-hdpi/creator_slim_shirt_yellow.png b/Habitica/res/drawable-hdpi/creator_slim_shirt_yellow.png
new file mode 100644
index 000000000..a2b1d465f
Binary files /dev/null and b/Habitica/res/drawable-hdpi/creator_slim_shirt_yellow.png differ
diff --git a/Habitica/res/drawable-hdpi/forward_arrow_enabled.png b/Habitica/res/drawable-hdpi/forward_arrow_enabled.png
new file mode 100644
index 000000000..b8c758525
Binary files /dev/null and b/Habitica/res/drawable-hdpi/forward_arrow_enabled.png differ
diff --git a/Habitica/res/drawable-hdpi/ic_action_launch.png b/Habitica/res/drawable-hdpi/ic_action_launch.png
deleted file mode 100644
index 2982f6845..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_action_launch.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_action_twitter.png b/Habitica/res/drawable-hdpi/ic_action_twitter.png
deleted file mode 100644
index ad420ce51..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_action_twitter.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/icon_body.png b/Habitica/res/drawable-hdpi/icon_body.png
new file mode 100644
index 000000000..3d232abd3
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_body.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_extras.png b/Habitica/res/drawable-hdpi/icon_extras.png
new file mode 100644
index 000000000..10a3183e6
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_extras.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_hair.png b/Habitica/res/drawable-hdpi/icon_hair.png
new file mode 100644
index 000000000..0ba99efa9
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_hair.png differ
diff --git a/Habitica/res/drawable-hdpi/icon_skin.png b/Habitica/res/drawable-hdpi/icon_skin.png
new file mode 100644
index 000000000..350b486b4
Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_skin.png differ
diff --git a/Habitica/res/drawable-hdpi/name_plate.9.png b/Habitica/res/drawable-hdpi/name_plate.9.png
new file mode 100644
index 000000000..6af978ddd
Binary files /dev/null and b/Habitica/res/drawable-hdpi/name_plate.9.png differ
diff --git a/Habitica/res/drawable-hdpi/welcome_diamond_background.png b/Habitica/res/drawable-hdpi/welcome_diamond_background.png
new file mode 100644
index 000000000..7b97f4740
Binary files /dev/null and b/Habitica/res/drawable-hdpi/welcome_diamond_background.png differ
diff --git a/Habitica/res/drawable-mdpi/back_arrow_disabled.png b/Habitica/res/drawable-mdpi/back_arrow_disabled.png
new file mode 100644
index 000000000..20dba418b
Binary files /dev/null and b/Habitica/res/drawable-mdpi/back_arrow_disabled.png differ
diff --git a/Habitica/res/drawable-mdpi/back_arrow_enabled.png b/Habitica/res/drawable-mdpi/back_arrow_enabled.png
new file mode 100644
index 000000000..9155c3aa4
Binary files /dev/null and b/Habitica/res/drawable-mdpi/back_arrow_enabled.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_blank_face.png b/Habitica/res/drawable-mdpi/creator_blank_face.png
new file mode 100644
index 000000000..815aa579b
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_blank_face.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_black.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_black.png
new file mode 100644
index 000000000..049797f01
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_black.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_blue.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_blue.png
new file mode 100644
index 000000000..e404f6c18
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_blue.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_green.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_green.png
new file mode 100644
index 000000000..db35d5ba7
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_green.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_pink.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_pink.png
new file mode 100644
index 000000000..b1a6f1fa4
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_pink.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_white.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_white.png
new file mode 100644
index 000000000..07d12340e
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_white.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_broad_shirt_yellow.png b/Habitica/res/drawable-mdpi/creator_broad_shirt_yellow.png
new file mode 100644
index 000000000..4ee24c93a
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_broad_shirt_yellow.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_1_black.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_black.png
new file mode 100644
index 000000000..6b3a04c54
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_black.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_1_blond.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_blond.png
new file mode 100644
index 000000000..a5b42fc5b
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_blond.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_1_brown.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_brown.png
new file mode 100644
index 000000000..941a00326
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_brown.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_1_red.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_red.png
new file mode 100644
index 000000000..9170447fb
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_red.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_1_white.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_white.png
new file mode 100644
index 000000000..c494998a5
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_1_white.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_2_black.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_black.png
new file mode 100644
index 000000000..d4df96fa0
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_black.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_2_red.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_red.png
new file mode 100644
index 000000000..14cc35d85
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_2_red.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hair_bangs_3_red.png b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_red.png
new file mode 100644
index 000000000..4b8c87eba
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hair_bangs_3_red.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_hills_bg.png b/Habitica/res/drawable-mdpi/creator_hills_bg.png
new file mode 100644
index 000000000..49d16f4c1
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_hills_bg.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_purple_bg.png b/Habitica/res/drawable-mdpi/creator_purple_bg.png
new file mode 100644
index 000000000..edb1e64b9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_purple_bg.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_black.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_black.png
new file mode 100644
index 000000000..7265f0523
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_black.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_blue.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_blue.png
new file mode 100644
index 000000000..97d616f52
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_blue.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_green.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_green.png
new file mode 100644
index 000000000..75cefc908
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_green.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_pink.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_pink.png
new file mode 100644
index 000000000..72600a033
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_pink.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_white.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_white.png
new file mode 100644
index 000000000..f6a4c9f69
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_white.png differ
diff --git a/Habitica/res/drawable-mdpi/creator_slim_shirt_yellow.png b/Habitica/res/drawable-mdpi/creator_slim_shirt_yellow.png
new file mode 100644
index 000000000..b3b5ff145
Binary files /dev/null and b/Habitica/res/drawable-mdpi/creator_slim_shirt_yellow.png differ
diff --git a/Habitica/res/drawable-mdpi/forward_arrow_enabled.png b/Habitica/res/drawable-mdpi/forward_arrow_enabled.png
new file mode 100644
index 000000000..587d25c99
Binary files /dev/null and b/Habitica/res/drawable-mdpi/forward_arrow_enabled.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_action_launch.png b/Habitica/res/drawable-mdpi/ic_action_launch.png
deleted file mode 100644
index 84612f7cc..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_action_launch.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_action_twitter.png b/Habitica/res/drawable-mdpi/ic_action_twitter.png
deleted file mode 100644
index c58461b73..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_action_twitter.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/icon_body.png b/Habitica/res/drawable-mdpi/icon_body.png
new file mode 100644
index 000000000..80e7f3bc8
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_body.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_extras.png b/Habitica/res/drawable-mdpi/icon_extras.png
new file mode 100644
index 000000000..e896c03ec
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_extras.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_hair.png b/Habitica/res/drawable-mdpi/icon_hair.png
new file mode 100644
index 000000000..81e3951a1
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_hair.png differ
diff --git a/Habitica/res/drawable-mdpi/icon_skin.png b/Habitica/res/drawable-mdpi/icon_skin.png
new file mode 100644
index 000000000..c006648bf
Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_skin.png differ
diff --git a/Habitica/res/drawable-mdpi/name_plate.9.png b/Habitica/res/drawable-mdpi/name_plate.9.png
new file mode 100644
index 000000000..3285b4a3e
Binary files /dev/null and b/Habitica/res/drawable-mdpi/name_plate.9.png differ
diff --git a/Habitica/res/drawable-mdpi/welcome_diamond_background.png b/Habitica/res/drawable-mdpi/welcome_diamond_background.png
new file mode 100644
index 000000000..e34db79a2
Binary files /dev/null and b/Habitica/res/drawable-mdpi/welcome_diamond_background.png differ
diff --git a/Habitica/res/drawable-xhdpi/back_arrow_disabled.png b/Habitica/res/drawable-xhdpi/back_arrow_disabled.png
new file mode 100644
index 000000000..d58cfb160
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/back_arrow_disabled.png differ
diff --git a/Habitica/res/drawable-xhdpi/back_arrow_enabled.png b/Habitica/res/drawable-xhdpi/back_arrow_enabled.png
new file mode 100644
index 000000000..9648c24b7
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/back_arrow_enabled.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_blank_face.png b/Habitica/res/drawable-xhdpi/creator_blank_face.png
new file mode 100644
index 000000000..7f832c145
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_blank_face.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_black.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_black.png
new file mode 100644
index 000000000..63991308d
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_black.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_blue.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_blue.png
new file mode 100644
index 000000000..bfa5681bc
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_blue.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_green.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_green.png
new file mode 100644
index 000000000..cd0bee006
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_green.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_pink.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_pink.png
new file mode 100644
index 000000000..88d99f9f4
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_pink.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_white.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_white.png
new file mode 100644
index 000000000..9a32f77a1
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_white.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_broad_shirt_yellow.png b/Habitica/res/drawable-xhdpi/creator_broad_shirt_yellow.png
new file mode 100644
index 000000000..ab0799f44
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_broad_shirt_yellow.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_black.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_black.png
new file mode 100644
index 000000000..3a3233653
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_black.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_blond.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_blond.png
new file mode 100644
index 000000000..9bb59b517
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_blond.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_brown.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_brown.png
new file mode 100644
index 000000000..f0db35150
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_brown.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_red.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_red.png
new file mode 100644
index 000000000..ef54b64c5
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_red.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_white.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_white.png
new file mode 100644
index 000000000..afad8e9c0
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_1_white.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_red.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_red.png
new file mode 100644
index 000000000..489eb3b72
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_2_red.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_red.png b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_red.png
new file mode 100644
index 000000000..4a386d1a8
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hair_bangs_3_red.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_hills_bg.png b/Habitica/res/drawable-xhdpi/creator_hills_bg.png
new file mode 100644
index 000000000..2c9bf1dd2
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_hills_bg.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_purple_bg.png b/Habitica/res/drawable-xhdpi/creator_purple_bg.png
new file mode 100644
index 000000000..64cc695e9
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_purple_bg.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_black.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_black.png
new file mode 100644
index 000000000..3cafb41cf
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_black.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_blue.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_blue.png
new file mode 100644
index 000000000..308676dfb
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_blue.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_green.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_green.png
new file mode 100644
index 000000000..a7b608916
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_green.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_pink.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_pink.png
new file mode 100644
index 000000000..87d3ff053
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_pink.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_white.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_white.png
new file mode 100644
index 000000000..96a2577f2
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_white.png differ
diff --git a/Habitica/res/drawable-xhdpi/creator_slim_shirt_yellow.png b/Habitica/res/drawable-xhdpi/creator_slim_shirt_yellow.png
new file mode 100644
index 000000000..2b87c1564
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/creator_slim_shirt_yellow.png differ
diff --git a/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png b/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png
new file mode 100644
index 000000000..bb333b164
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_action_launch.png b/Habitica/res/drawable-xhdpi/ic_action_launch.png
deleted file mode 100644
index 724566426..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_action_launch.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_action_twitter.png b/Habitica/res/drawable-xhdpi/ic_action_twitter.png
deleted file mode 100644
index 592568b72..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_action_twitter.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/icon_body.png b/Habitica/res/drawable-xhdpi/icon_body.png
new file mode 100644
index 000000000..d50f8367a
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_body.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_extras.png b/Habitica/res/drawable-xhdpi/icon_extras.png
new file mode 100644
index 000000000..b74fb2011
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_extras.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_hair.png b/Habitica/res/drawable-xhdpi/icon_hair.png
new file mode 100644
index 000000000..ee9e5a803
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_hair.png differ
diff --git a/Habitica/res/drawable-xhdpi/icon_skin.png b/Habitica/res/drawable-xhdpi/icon_skin.png
new file mode 100644
index 000000000..ef265b050
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_skin.png differ
diff --git a/Habitica/res/drawable-xhdpi/name_plate.9.png b/Habitica/res/drawable-xhdpi/name_plate.9.png
new file mode 100644
index 000000000..becb0127c
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/name_plate.9.png differ
diff --git a/Habitica/res/drawable-xhdpi/welcome_diamond_background.png b/Habitica/res/drawable-xhdpi/welcome_diamond_background.png
new file mode 100644
index 000000000..fd40583b9
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/welcome_diamond_background.png differ
diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png b/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png
new file mode 100644
index 000000000..6639e24ed
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png differ
diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png b/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png
new file mode 100644
index 000000000..1ea24a005
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_blank_face.png b/Habitica/res/drawable-xxhdpi/creator_blank_face.png
new file mode 100644
index 000000000..119cfc9cc
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_blank_face.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_black.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_black.png
new file mode 100644
index 000000000..b09633df9
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_black.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_blue.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_blue.png
new file mode 100644
index 000000000..03b7af107
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_blue.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_green.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_green.png
new file mode 100644
index 000000000..a44d51b23
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_green.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_pink.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_pink.png
new file mode 100644
index 000000000..c3ae30623
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_pink.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_white.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_white.png
new file mode 100644
index 000000000..a532178b5
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_white.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_broad_shirt_yellow.png b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_yellow.png
new file mode 100644
index 000000000..e8121c9c3
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_broad_shirt_yellow.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_black.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_black.png
new file mode 100644
index 000000000..f66ec2409
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_black.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_blond.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_blond.png
new file mode 100644
index 000000000..c4af7be17
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_blond.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_brown.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_brown.png
new file mode 100644
index 000000000..84db7727e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_brown.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_red.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_red.png
new file mode 100644
index 000000000..60608365e
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_red.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_white.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_white.png
new file mode 100644
index 000000000..9382cd9b2
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_1_white.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_red.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_red.png
new file mode 100644
index 000000000..627e0b11a
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_2_red.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_red.png b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_red.png
new file mode 100644
index 000000000..fb89cffb2
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hair_bangs_3_red.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_hills_bg.png b/Habitica/res/drawable-xxhdpi/creator_hills_bg.png
new file mode 100644
index 000000000..84dac7828
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_hills_bg.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_purple_bg.png b/Habitica/res/drawable-xxhdpi/creator_purple_bg.png
new file mode 100644
index 000000000..51d998d22
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_purple_bg.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_black.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_black.png
new file mode 100644
index 000000000..e5c3909f1
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_black.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_blue.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_blue.png
new file mode 100644
index 000000000..63b585dda
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_blue.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_green.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_green.png
new file mode 100644
index 000000000..ab68d8e0f
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_green.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_pink.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_pink.png
new file mode 100644
index 000000000..14a83a3f4
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_pink.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_white.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_white.png
new file mode 100644
index 000000000..ee33c19c5
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_white.png differ
diff --git a/Habitica/res/drawable-xxhdpi/creator_slim_shirt_yellow.png b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_yellow.png
new file mode 100644
index 000000000..aa10fe0a0
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/creator_slim_shirt_yellow.png differ
diff --git a/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png b/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png
new file mode 100644
index 000000000..fb48245b3
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_action_launch.png b/Habitica/res/drawable-xxhdpi/ic_action_launch.png
deleted file mode 100644
index e9793e758..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_action_launch.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_body.png b/Habitica/res/drawable-xxhdpi/icon_body.png
new file mode 100644
index 000000000..01565581c
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_body.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_extras.png b/Habitica/res/drawable-xxhdpi/icon_extras.png
new file mode 100644
index 000000000..01df06cdc
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_extras.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_hair.png b/Habitica/res/drawable-xxhdpi/icon_hair.png
new file mode 100644
index 000000000..0f940dc4d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_hair.png differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_skin.png b/Habitica/res/drawable-xxhdpi/icon_skin.png
new file mode 100644
index 000000000..f4fd80c53
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_skin.png differ
diff --git a/Habitica/res/drawable-xxhdpi/name_plate.9.png b/Habitica/res/drawable-xxhdpi/name_plate.9.png
new file mode 100644
index 000000000..2cdc060ee
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/name_plate.9.png differ
diff --git a/Habitica/res/drawable-xxhdpi/welcome_diamond_background.png b/Habitica/res/drawable-xxhdpi/welcome_diamond_background.png
new file mode 100644
index 000000000..00078f3fe
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/welcome_diamond_background.png differ
diff --git a/Habitica/res/layout/activity_setup.xml b/Habitica/res/layout/activity_setup.xml
index a04102569..c4f6ebbc4 100644
--- a/Habitica/res/layout/activity_setup.xml
+++ b/Habitica/res/layout/activity_setup.xml
@@ -1,52 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent">
+                android:layout_width="match_parent" android:layout_height="match_parent">
 
     <android.support.v4.view.ViewPager
-        android:id="@+id/view_pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/bottomBar" />
+            android:id="@+id/view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottomBar" />
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/skip_button"
-        android:id="@+id/skipButton"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
-
-    <LinearLayout
-        android:id="@+id/bottomBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
-        android:background="@android:color/white"
-        android:padding="6dp">
+    <RelativeLayout
+            android:id="@+id/bottomBar"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
+            android:background="@color/brand_300"
+            android:paddingLeft="21dp"
+            android:paddingRight="21dp"
+            android:gravity="center_vertical">
 
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/previous_button"
-            android:id="@+id/previousButton"
-            android:visibility="gone"/>
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/previousButton"
+                android:drawableLeft="@drawable/back_arrow_disabled"
+                android:background="@color/transparent"
+                android:drawablePadding="12dp"
+                android:textColor="@color/white"
+                android:layout_alignParentLeft="true"/>
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/next_button"
-            android:id="@+id/nextButton" />
-    </LinearLayout>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/next_button"
+                android:id="@+id/nextButton"
+                android:drawablePadding="12dp"
+                android:textColor="@color/white"
+                android:drawableRight="@drawable/forward_arrow_enabled"
+                android:background="@color/transparent"
+                android:layout_alignParentRight="true"/>
+
+        <com.viewpagerindicator.IconPageIndicator
+                android:id="@+id/view_pager_indicator"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_toLeftOf="@id/nextButton"
+                android:layout_toRightOf="@id/previousButton"
+                />
+
+    </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index e013c328b..e96657d89 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -158,28 +158,28 @@
                 android:layout_marginTop="24dp"
                 >
 
-            <com.habitrpg.android.habitica.ui.SubscriptionOptionView
+            <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
                     android:id="@+id/subscription1month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/month"
                     app:gemCapText="@string/subscribe1month.gemcap"/>
 
-            <com.habitrpg.android.habitica.ui.SubscriptionOptionView
+            <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
                     android:id="@+id/subscription3month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/three_months"
                     app:gemCapText="@string/subscribe3month.gemcap"
                     app:hourGlassCount="1" />
-            <com.habitrpg.android.habitica.ui.SubscriptionOptionView
+            <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
                     android:id="@+id/subscription6month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:recurringText="@string/six_months"
                     app:gemCapText="@string/subscribe6month.gemcap"
                     app:hourGlassCount="2" />
-            <com.habitrpg.android.habitica.ui.SubscriptionOptionView
+            <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
                     android:id="@+id/subscription12month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -187,7 +187,7 @@
                     app:gemCapText="@string/subscribe12month.gemcap"
                     app:hourGlassCount="4" >
 
-            </com.habitrpg.android.habitica.ui.SubscriptionOptionView>
+            </com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView>
 
             <Button
                     android:text="@string/subscribe"
@@ -200,7 +200,7 @@
         </LinearLayout>
 
 
-        <com.habitrpg.android.habitica.ui.SubscriptionDetailsView
+        <com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/subscriptionDetails"
diff --git a/Habitica/res/layout/fragment_welcome.xml b/Habitica/res/layout/fragment_welcome.xml
new file mode 100644
index 000000000..2a149594d
--- /dev/null
+++ b/Habitica/res/layout/fragment_welcome.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@color/light_gray_bg"
+              android:gravity="center_vertical">
+    <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        <ImageView
+                android:id="@+id/exp_icon"
+                android:src="@drawable/ic_header_exp"
+                android:layout_centerHorizontal="true"
+                style="@style/welcome_floating_icon"
+                />
+        <ImageView
+                android:id="@+id/heart_icon"
+                style="@style/welcome_floating_icon"
+                android:layout_toLeftOf="@id/exp_icon"
+                android:src="@drawable/ic_header_heart"
+                android:layout_marginTop="35dp"
+                android:layout_marginRight="8dp"/>
+        <ImageView
+                android:id="@+id/magic_icon"
+                style="@style/welcome_floating_icon"
+                android:layout_toRightOf="@id/exp_icon"
+                android:src="@drawable/ic_header_magic"
+                android:layout_marginTop="35dp"
+                android:layout_marginLeft="8dp"/>
+        <ImageView
+                style="@style/welcome_floating_icon"
+                android:src="@drawable/ic_header_gold"
+                android:layout_below="@id/heart_icon"
+                android:layout_toLeftOf="@id/exp_icon"
+                android:layout_marginRight="33dp"
+                android:layout_marginTop="8dp"
+                />
+        <ImageView
+                style="@style/welcome_floating_icon"
+                android:src="@drawable/ic_header_gem"
+                android:layout_below="@id/magic_icon"
+                android:layout_toRightOf="@id/exp_icon"
+                android:layout_marginLeft="33dp"
+                android:layout_marginTop="8dp"
+                />
+        <ImageView
+                android:layout_width="80dp"
+                android:layout_height="105dp"
+                android:layout_centerHorizontal="true"
+                android:layout_below="@id/exp_icon"
+                android:src="@drawable/npc_justin_only"
+                android:layout_marginTop="18dp"/>
+    </RelativeLayout>
+    <com.habitrpg.android.habitica.ui.SpeechBubbleView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:namePlate="Justin"
+            app:text="@string/welcome_text"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="24dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/speechbubble.xml b/Habitica/res/layout/speechbubble.xml
new file mode 100644
index 000000000..f93973f7a
--- /dev/null
+++ b/Habitica/res/layout/speechbubble.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="@color/transparent">
+    <ImageView
+            android:id="@+id/npc_image_view"
+            android:layout_width="80dp"
+            android:layout_height="105dp"
+            tools:src="@drawable/npc_justin_only"
+            android:layout_gravity="right"
+            android:layout_marginRight="30dp"/>
+
+    <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:background="@color/white"
+            android:paddingLeft="21dp"
+            android:paddingTop="16dp"
+            android:paddingRight="21dp"
+            android:paddingBottom="14dp"
+            android:layout_marginTop="74dp"
+            tools:text="@string/welcome_text"/>
+    <TextView
+            android:id="@+id/name_plate"
+            android:layout_width="wrap_content"
+            android:layout_height="28dp"
+            tools:text="Justin"
+            android:background="@drawable/name_plate"
+            android:gravity="center_vertical"
+            android:textColor="@color/white"
+            android:layout_marginLeft="21dp"
+            android:layout_marginTop="60dp"
+            android:textStyle="bold" />
+</FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index e6c448064..30576d82d 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -20,4 +20,9 @@
         <attr name="gemCapText" format="string" />
         <attr name="hourGlassCount" format="integer" />
     </declare-styleable>
+    <declare-styleable name="SpeechBubbleView">
+        <attr name="namePlate" format="string" />
+        <attr name="text" format="string" />
+        <attr name="npcDrawable" format="integer" />
+    </declare-styleable>
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index b138a23b1..0068f7e77 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -116,4 +116,5 @@
     <color name="white_75_alpha">#bfffffff</color>
     <color name="white_50_alpha">#7fffffff</color>
     <color name="white_15_alpha">#26ffffff</color>
+    <color name="light_gray_bg">#F6F4F8</color>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index e5c5c1ded..4299cd0a6 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -219,7 +219,7 @@
     <string name="skip_button">Skip</string>
     <string name="setup_welcome_description">Welcome to Habitica, where advancing in the game will improve your real life! As you accomplish real-world goals, you\'ll unlock equipment, pets, quests, and more.</string>
     <string name="setup_welcome_title">Welcome</string>
-    <string name="avatar_setup_description">First, you need an avatar in the game to represent you! The things you do in real life will affect your avatar\'s health, experience level, and gold.</string>
+    <string name="avatar_setup_description">So, how would you like to look? Don\'t worry, you can change this later.</string>
     <string name="task_setup_description">Splendid! Now let\'s set up your tasks so that you can start earning experience and gold.
 
 To start, which parts of your life do you want to improve?</string>
@@ -541,4 +541,7 @@ To start, which parts of your life do you want to improve?</string>
     <string name="new_game">New\nGame</string>
     <string name="login_btn_fb">Login with Facebook</string>
     <string name="login_btn_google">Login with Google</string>
+    <string name="action_back">Back</string>
+    <string name="welcome_text">Oh, you must be new here. I’m Justin, I’ll be your guide in Habitica.\n\nTo start, you’ll need to create an avatar.</string>
+    <string name="randomize">Randomize</string>
 </resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 03963e79d..34b3aa03c 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -312,4 +312,20 @@
         <item name="android:paddingLeft">32dp</item>
         <item name="android:paddingRight">32dp</item>
     </style>
+
+    <style name="welcome_floating_icon">
+        <item name="android:layout_width">50dp</item>
+        <item name="android:layout_height">50dp</item>
+        <item name="android:background">@drawable/welcome_diamond_background</item>
+        <item name="android:padding">16dp</item>
+    </style>
+
+    <style name="DiamondButton">
+        <item name="android:layout_height">36dp</item>
+        <item name="android:background">@drawable/login_button</item>
+        <item name="android:paddingLeft">36dp</item>
+        <item name="android:paddingRight">36dp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
index acceec9cf..27fe75434 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -7,6 +7,8 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.activities.IntroActivity;
 import com.habitrpg.android.habitica.ui.activities.LoginActivity;
+import com.habitrpg.android.habitica.ui.activities.SetupActivity;
+import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.raizlabs.android.dbflow.config.FlowManager;
 import com.squareup.leakcanary.LeakCanary;
@@ -24,18 +26,25 @@ import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
 import android.content.res.Resources;
 import android.database.DatabaseErrorHandler;
 import android.database.sqlite.SQLiteDatabase;
+import android.graphics.drawable.Icon;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
 import android.support.multidex.MultiDexApplication;
 import android.util.Log;
 
 import java.io.File;
 import java.lang.reflect.Field;
+import java.util.Arrays;
 
 import javax.inject.Inject;
 
@@ -101,6 +110,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
     }
 
     public static boolean checkUserAuthentication(Context context, HostConfig hostConfig) {
+        startActivity(SetupActivity.class, context);
         if (hostConfig == null || hostConfig.getApi() == null || hostConfig.getApi().equals("") || hostConfig.getUser() == null || hostConfig.getUser().equals("")) {
             startActivity(IntroActivity.class, context);
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java
new file mode 100644
index 000000000..d648200a3
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java
@@ -0,0 +1,50 @@
+package com.habitrpg.android.habitica.ui;
+
+
+import com.habitrpg.android.habitica.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class SpeechBubbleView extends FrameLayout {
+
+    @BindView(R.id.name_plate)
+    TextView namePlate;
+
+    @BindView(R.id.textView)
+    TextView textView;
+
+    @BindView(R.id.npc_image_view)
+    ImageView npcImageView;
+
+    public SpeechBubbleView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        inflate(context, R.layout.speechbubble, this);
+        ButterKnife.bind(this);
+
+
+        TypedArray attributes = context.getTheme().obtainStyledAttributes(
+                attrs,
+                R.styleable.SpeechBubbleView,
+                0, 0);
+
+        namePlate.setText(attributes.getString(R.styleable.SpeechBubbleView_namePlate));
+        textView.setText(attributes.getString(R.styleable.SpeechBubbleView_text));
+
+        Drawable iconRes = attributes.getDrawable(R.styleable.SpeechBubbleView_npcDrawable);
+        if (iconRes != null) {
+            npcImageView.setImageDrawable(iconRes);
+        }
+    }
+
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
index 41b21154e..bb1d419f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
@@ -9,23 +9,32 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
 import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
+import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
+import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
+import com.viewpagerindicator.IconPageIndicator;
+import com.viewpagerindicator.IconPagerAdapter;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.support.v7.content.res.AppCompatResources;
 import android.support.v7.preference.PreferenceManager;
 import android.view.View;
+import android.view.Window;
 import android.widget.Button;
 
 import java.util.Calendar;
@@ -37,8 +46,9 @@ import java.util.Map;
 import javax.inject.Inject;
 
 import butterknife.BindView;
+import butterknife.OnClick;
 
-public class SetupActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener, HabitRPGUserCallback.OnUserReceived {
+public class SetupActivity extends BaseActivity implements ViewPager.OnPageChangeListener, HabitRPGUserCallback.OnUserReceived {
 
     @Inject
     public APIHelper apiHelper;
@@ -46,12 +56,12 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
     protected HostConfig hostConfig;
     @BindView(R.id.view_pager)
     ViewPager pager;
-    @BindView(R.id.skipButton)
-    Button skipButton;
     @BindView(R.id.nextButton)
     Button nextButton;
     @BindView(R.id.previousButton)
     Button previousButton;
+    @BindView(R.id.view_pager_indicator)
+    IconPageIndicator indicator;
     AvatarSetupFragment avatarSetupFragment;
     TaskSetupFragment taskSetupFragment;
     HabitRPGUser user;
@@ -67,9 +77,6 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
         super.onCreate(savedInstanceState);
         this.user = new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).querySingle();
 
-        this.skipButton.setOnClickListener(this);
-        this.nextButton.setOnClickListener(this);
-        this.previousButton.setOnClickListener(this);
         this.completedSetup = false;
 
         Map<String, Object> additionalData = new HashMap<>();
@@ -85,6 +92,11 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
                         });
             }
         }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.setStatusBarColor(getResources().getColor(R.color.light_gray_bg));
+        }
     }
 
     @Override
@@ -118,32 +130,10 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
     private void setupViewpager() {
         android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
 
-        pager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
-            @Override
-            public Fragment getItem(int position) {
-                Fragment fragment;
-
-                if (position == 0) {
-                    avatarSetupFragment = new AvatarSetupFragment();
-                    avatarSetupFragment.activity = SetupActivity.this;
-                    avatarSetupFragment.setUser(user);
-                    avatarSetupFragment.width = pager.getWidth();
-                    fragment = avatarSetupFragment;
-                } else {
-                    taskSetupFragment = new TaskSetupFragment();
-                    fragment = taskSetupFragment;
-                }
-
-                return fragment;
-            }
-
-            @Override
-            public int getCount() {
-                return 2;
-            }
-        });
+        pager.setAdapter(new ViewPageAdapter(fragmentManager));
 
         pager.addOnPageChangeListener(this);
+        indicator.setViewPager(pager);
     }
 
     @Subscribe
@@ -154,34 +144,42 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
                 });
     }
 
-    @Override
-    public void onClick(View v) {
+    @OnClick(R.id.nextButton)
+    public void nextClicked(View v) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         SharedPreferences.Editor editor = sharedPreferences.edit();
         editor.putString("FirstDayOfTheWeek",
                 Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
         editor.apply();
-        if (v == this.nextButton) {
-            if (this.pager.getCurrentItem() == 1) {
-                List<Task> newTasks = this.taskSetupFragment.createSampleTasks();
-                this.completedSetup = true;
-                this.apiHelper.apiService.createTasks(newTasks)
-                        .compose(this.apiHelper.configureApiCallObserver())
-                        .subscribe(tasks -> {
-                            onUserReceived(user);
-                        }, throwable -> {
-                        });
-                //this.apiHelper.apiService.batchOperation(operations, new HabitRPGUserCallback(this));
-            }
-            this.pager.setCurrentItem(this.pager.getCurrentItem() + 1);
-        } else if (v == this.previousButton) {
-            this.pager.setCurrentItem(this.pager.getCurrentItem() - 1);
-        } else if (v == this.skipButton) {
-            Map<String, Object> additionalData = new HashMap<>();
-            additionalData.put("status", "skipped");
-            AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
-            this.startMainActivity();
+        if (isLastPage()) {
+            List<Task> newTasks = this.taskSetupFragment.createSampleTasks();
+            this.completedSetup = true;
+            this.apiHelper.apiService.createTasks(newTasks)
+                    .compose(this.apiHelper.configureApiCallObserver())
+                    .subscribe(tasks -> {
+                        onUserReceived(user);
+                    }, throwable -> {
+                    });
+            //this.apiHelper.apiService.batchOperation(operations, new HabitRPGUserCallback(this));
         }
+        this.pager.setCurrentItem(this.pager.getCurrentItem() + 1);
+    }
+
+    @OnClick(R.id.previousButton)
+    public void previousClicked() {
+        this.pager.setCurrentItem(this.pager.getCurrentItem() - 1);
+    }
+
+    private void setPreviousButtonEnabled(boolean enabled) {
+        Drawable leftDrawable;
+        if (enabled) {
+            previousButton.setText(R.string.action_back);
+            leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_enabled);
+        } else {
+            previousButton.setText(null);
+            leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_disabled);
+        }
+        previousButton.setCompoundDrawablesWithIntrinsicBounds(leftDrawable, null, null, null);
     }
 
     @Override
@@ -192,11 +190,13 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
     @Override
     public void onPageSelected(int position) {
         if (position == 0) {
-            this.previousButton.setVisibility(View.GONE);
+            this.setPreviousButtonEnabled(false);
             this.nextButton.setText(this.getString(R.string.next_button));
-        } else if (position == 1) {
-            this.previousButton.setVisibility(View.VISIBLE);
+        } else if (isLastPage()) {
+            this.setPreviousButtonEnabled(true);
             this.nextButton.setText(this.getString(R.string.intro_finish_button));
+        } else {
+            this.setPreviousButtonEnabled(true);
         }
     }
 
@@ -231,4 +231,52 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
         startActivity(intent);
         finish();
     }
+
+    private class ViewPageAdapter extends FragmentPagerAdapter implements IconPagerAdapter {
+
+        public ViewPageAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            Fragment fragment = null;
+
+            switch (position) {
+                case 0: {
+                    fragment = new WelcomeFragment();
+                    break;
+                }
+                case 1: {
+                    avatarSetupFragment = new AvatarSetupFragment();
+                    avatarSetupFragment.activity = SetupActivity.this;
+                    avatarSetupFragment.setUser(user);
+                    avatarSetupFragment.width = pager.getWidth();
+                    fragment = avatarSetupFragment;
+                    break;
+                }
+                case 2: {
+                    taskSetupFragment = new TaskSetupFragment();
+                    fragment = taskSetupFragment;
+                    break;
+                }
+            }
+
+            return fragment;
+        }
+
+        @Override
+        public int getCount() {
+            return 3;
+        }
+
+        @Override
+        public int getIconResId(int index) {
+            return R.drawable.indicator_diamond;
+        }
+    }
+
+    private boolean isLastPage() {
+        return this.pager.getCurrentItem() == this.pager.getAdapter().getCount()-1;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
index 35aad2fd0..aef267e58 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
@@ -6,8 +6,8 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.UserSubscribedEvent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.habitrpg.android.habitica.ui.SubscriptionDetailsView;
-import com.habitrpg.android.habitica.ui.SubscriptionOptionView;
+import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView;
+import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView;
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
index edb244024..670d1b6c9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.fragments.preferences;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
 import com.habitrpg.android.habitica.helpers.QrCodeManager;
-import com.habitrpg.android.habitica.ui.SubscriptionDetailsView;
+import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
new file mode 100644
index 000000000..1c6f44d1e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
@@ -0,0 +1,30 @@
+package com.habitrpg.android.habitica.ui.fragments.setup;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import butterknife.ButterKnife;
+
+public class WelcomeFragment extends BaseFragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_welcome, container, false);
+
+        unbinder = ButterKnife.bind(this, v);
+
+        return v;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {}
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.java
similarity index 98%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.java
index 54d9c55d1..9abc0b243 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.java
@@ -1,4 +1,4 @@
-package com.habitrpg.android.habitica.ui;
+package com.habitrpg.android.habitica.ui.views.subscriptions;
 
 
 import com.habitrpg.android.habitica.BuildConfig;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.java
similarity index 98%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.java
index 63ec9d415..831d54036 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.java
@@ -1,4 +1,4 @@
-package com.habitrpg.android.habitica.ui;
+package com.habitrpg.android.habitica.ui.views.subscriptions;
 
 import com.habitrpg.android.habitica.R;