diff --git a/Shared/Assets.xcassets/Graphics/AverageGraphic.imageset/AverageGraphic.png b/Shared/Assets.xcassets/Graphics/AverageGraphic.imageset/AverageGraphic.png
deleted file mode 100644
index e17b2d2..0000000
Binary files a/Shared/Assets.xcassets/Graphics/AverageGraphic.imageset/AverageGraphic.png and /dev/null differ
diff --git a/Shared/Assets.xcassets/Graphics/AverageGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/AverageGraphic.imageset/Contents.json
deleted file mode 100644
index e806476..0000000
--- a/Shared/Assets.xcassets/Graphics/AverageGraphic.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "AverageGraphic.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Shared/Assets.xcassets/Graphics/BadGraphic.imageset/BadGraphic.png b/Shared/Assets.xcassets/Graphics/BadGraphic.imageset/BadGraphic.png
deleted file mode 100644
index 78c8f7a..0000000
Binary files a/Shared/Assets.xcassets/Graphics/BadGraphic.imageset/BadGraphic.png and /dev/null differ
diff --git a/Shared/Assets.xcassets/Graphics/BadGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/BadGraphic.imageset/Contents.json
deleted file mode 100644
index faecdfe..0000000
--- a/Shared/Assets.xcassets/Graphics/BadGraphic.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "BadGraphic.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Shared/Assets.xcassets/Graphics/Contents.json b/Shared/Assets.xcassets/Graphics/Contents.json
deleted file mode 100644
index 73c0059..0000000
--- a/Shared/Assets.xcassets/Graphics/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Shared/Assets.xcassets/Graphics/GoodGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/GoodGraphic.imageset/Contents.json
deleted file mode 100644
index 6ca5ed9..0000000
--- a/Shared/Assets.xcassets/Graphics/GoodGraphic.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "GoodGraphic.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Shared/Assets.xcassets/Graphics/GoodGraphic.imageset/GoodGraphic.png b/Shared/Assets.xcassets/Graphics/GoodGraphic.imageset/GoodGraphic.png
deleted file mode 100644
index 7966bf5..0000000
Binary files a/Shared/Assets.xcassets/Graphics/GoodGraphic.imageset/GoodGraphic.png and /dev/null differ
diff --git a/Shared/Assets.xcassets/Graphics/GreatGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/GreatGraphic.imageset/Contents.json
deleted file mode 100644
index ef72680..0000000
--- a/Shared/Assets.xcassets/Graphics/GreatGraphic.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "GreatGraphic.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Shared/Assets.xcassets/Graphics/GreatGraphic.imageset/GreatGraphic.png b/Shared/Assets.xcassets/Graphics/GreatGraphic.imageset/GreatGraphic.png
deleted file mode 100644
index 928b1e2..0000000
Binary files a/Shared/Assets.xcassets/Graphics/GreatGraphic.imageset/GreatGraphic.png and /dev/null differ
diff --git a/Shared/Assets.xcassets/Graphics/HorribleGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/HorribleGraphic.imageset/Contents.json
deleted file mode 100644
index be59341..0000000
--- a/Shared/Assets.xcassets/Graphics/HorribleGraphic.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "HorribleGraphic.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Shared/Assets.xcassets/Graphics/HorribleGraphic.imageset/HorribleGraphic.png b/Shared/Assets.xcassets/Graphics/HorribleGraphic.imageset/HorribleGraphic.png
deleted file mode 100644
index 72d1da5..0000000
Binary files a/Shared/Assets.xcassets/Graphics/HorribleGraphic.imageset/HorribleGraphic.png and /dev/null differ
diff --git a/Shared/Assets.xcassets/Graphics/MissingGraphic.imageset/Contents.json b/Shared/Assets.xcassets/Graphics/MissingGraphic.imageset/Contents.json
deleted file mode 100644
index 8c0053c..0000000
--- a/Shared/Assets.xcassets/Graphics/MissingGraphic.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "MissingGraphic.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Shared/Assets.xcassets/Graphics/MissingGraphic.imageset/MissingGraphic.png b/Shared/Assets.xcassets/Graphics/MissingGraphic.imageset/MissingGraphic.png
deleted file mode 100644
index 6945715..0000000
Binary files a/Shared/Assets.xcassets/Graphics/MissingGraphic.imageset/MissingGraphic.png and /dev/null differ
diff --git a/Shared/Assets.xcassets/default_image/average.imageset/Contents.json b/Shared/Assets.xcassets/default_image/average.imageset/Contents.json
index c3534e4..8427da7 100644
--- a/Shared/Assets.xcassets/default_image/average.imageset/Contents.json
+++ b/Shared/Assets.xcassets/default_image/average.imageset/Contents.json
@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "meh-regular.png",
+      "filename" : "average.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "average@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "average@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Shared/Assets.xcassets/default_image/average.imageset/average.png b/Shared/Assets.xcassets/default_image/average.imageset/average.png
new file mode 100644
index 0000000..3be0f95
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/average.imageset/average.png differ
diff --git a/Shared/Assets.xcassets/default_image/average.imageset/average@2x.png b/Shared/Assets.xcassets/default_image/average.imageset/average@2x.png
new file mode 100644
index 0000000..8b33397
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/average.imageset/average@2x.png differ
diff --git a/Shared/Assets.xcassets/default_image/average.imageset/average@3x.png b/Shared/Assets.xcassets/default_image/average.imageset/average@3x.png
new file mode 100644
index 0000000..aa96e77
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/average.imageset/average@3x.png differ
diff --git a/Shared/Assets.xcassets/default_image/average.imageset/meh-regular.png b/Shared/Assets.xcassets/default_image/average.imageset/meh-regular.png
deleted file mode 100644
index 614c214..0000000
Binary files a/Shared/Assets.xcassets/default_image/average.imageset/meh-regular.png and /dev/null differ
diff --git a/Shared/Assets.xcassets/default_image/bad.imageset/Contents.json b/Shared/Assets.xcassets/default_image/bad.imageset/Contents.json
index 351d91f..1a8a37c 100644
--- a/Shared/Assets.xcassets/default_image/bad.imageset/Contents.json
+++ b/Shared/Assets.xcassets/default_image/bad.imageset/Contents.json
@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "frown-regular 2.png",
+      "filename" : "bad.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "bad@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "bad@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Shared/Assets.xcassets/default_image/bad.imageset/bad.png b/Shared/Assets.xcassets/default_image/bad.imageset/bad.png
new file mode 100644
index 0000000..fd959e4
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/bad.imageset/bad.png differ
diff --git a/Shared/Assets.xcassets/default_image/bad.imageset/bad@2x.png b/Shared/Assets.xcassets/default_image/bad.imageset/bad@2x.png
new file mode 100644
index 0000000..1364aa9
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/bad.imageset/bad@2x.png differ
diff --git a/Shared/Assets.xcassets/default_image/bad.imageset/bad@3x.png b/Shared/Assets.xcassets/default_image/bad.imageset/bad@3x.png
new file mode 100644
index 0000000..7918665
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/bad.imageset/bad@3x.png differ
diff --git a/Shared/Assets.xcassets/default_image/bad.imageset/frown-regular 2.png b/Shared/Assets.xcassets/default_image/bad.imageset/frown-regular 2.png
deleted file mode 100644
index b123d99..0000000
Binary files a/Shared/Assets.xcassets/default_image/bad.imageset/frown-regular 2.png and /dev/null differ
diff --git a/Shared/Assets.xcassets/default_image/good.imageset/Contents.json b/Shared/Assets.xcassets/default_image/good.imageset/Contents.json
index 6bed8a8..098aff8 100644
--- a/Shared/Assets.xcassets/default_image/good.imageset/Contents.json
+++ b/Shared/Assets.xcassets/default_image/good.imageset/Contents.json
@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "grin-regular.png",
+      "filename" : "good.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "good@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "good@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Shared/Assets.xcassets/default_image/good.imageset/good.png b/Shared/Assets.xcassets/default_image/good.imageset/good.png
new file mode 100644
index 0000000..181cc39
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/good.imageset/good.png differ
diff --git a/Shared/Assets.xcassets/default_image/good.imageset/good@2x.png b/Shared/Assets.xcassets/default_image/good.imageset/good@2x.png
new file mode 100644
index 0000000..1ce2c4e
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/good.imageset/good@2x.png differ
diff --git a/Shared/Assets.xcassets/default_image/good.imageset/good@3x.png b/Shared/Assets.xcassets/default_image/good.imageset/good@3x.png
new file mode 100644
index 0000000..dc997d1
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/good.imageset/good@3x.png differ
diff --git a/Shared/Assets.xcassets/default_image/good.imageset/grin-regular.png b/Shared/Assets.xcassets/default_image/good.imageset/grin-regular.png
deleted file mode 100644
index de7d15e..0000000
Binary files a/Shared/Assets.xcassets/default_image/good.imageset/grin-regular.png and /dev/null differ
diff --git a/Shared/Assets.xcassets/default_image/horrible.imageset/Contents.json b/Shared/Assets.xcassets/default_image/horrible.imageset/Contents.json
index 14e62e5..82a5dd8 100644
--- a/Shared/Assets.xcassets/default_image/horrible.imageset/Contents.json
+++ b/Shared/Assets.xcassets/default_image/horrible.imageset/Contents.json
@@ -1,15 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "sad-tear-regular.png",
+      "filename" : "horrible.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "horrible@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "horrible@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/Shared/Assets.xcassets/default_image/horrible.imageset/horrible.png b/Shared/Assets.xcassets/default_image/horrible.imageset/horrible.png
new file mode 100644
index 0000000..822d76d
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/horrible.imageset/horrible.png differ
diff --git a/Shared/Assets.xcassets/default_image/horrible.imageset/horrible@2x.png b/Shared/Assets.xcassets/default_image/horrible.imageset/horrible@2x.png
new file mode 100644
index 0000000..d14ede0
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/horrible.imageset/horrible@2x.png differ
diff --git a/Shared/Assets.xcassets/default_image/horrible.imageset/horrible@3x.png b/Shared/Assets.xcassets/default_image/horrible.imageset/horrible@3x.png
new file mode 100644
index 0000000..46832f6
Binary files /dev/null and b/Shared/Assets.xcassets/default_image/horrible.imageset/horrible@3x.png differ
diff --git a/Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png b/Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png
deleted file mode 100644
index 68eae26..0000000
Binary files a/Shared/Assets.xcassets/default_image/horrible.imageset/sad-tear-regular.png and /dev/null differ