diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Contents.json b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Contents.json
index 29910c6df..c04602c05 100644
--- a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Contents.json
+++ b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Contents.json
@@ -1,147 +1,9 @@
 {
   "images" : [
-    {
-      "filename" : "Icon-App-20x20@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29-1.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "57x57"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "57x57"
-    },
-    {
-      "filename" : "Icon-App-60x60@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-App-60x60@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-App-20x20.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@2x-2.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "50x50"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "50x50"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "72x72"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "72x72"
-    },
-    {
-      "filename" : "Icon-App-76x76.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Icon-App-76x76@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
     {
       "filename" : "Icon-App-iTunes.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "idiom" : "universal",
+      "platform" : "ios",
       "size" : "1024x1024"
     }
   ],
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20.png
deleted file mode 100644
index 8114c9836..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x-1.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x-1.png
deleted file mode 100644
index bec0614d0..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x-1.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index bec0614d0..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@3x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 745562322..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-20x20@3x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29-1.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29-1.png
deleted file mode 100644
index 362083632..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29-1.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29.png
deleted file mode 100644
index 362083632..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x-1.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x-1.png
deleted file mode 100644
index 8b471dec9..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x-1.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index 8b471dec9..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@3x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index e1c26f8dc..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-29x29@3x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40.png
deleted file mode 100644
index bec0614d0..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x-2.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x-2.png
deleted file mode 100644
index 5b9bce6e4..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x-2.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index c791c5e0a..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@3x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index 2659a24e9..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-40x40@3x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index 2659a24e9..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@3x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index 7a2877dc2..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-60x60@3x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76.png
deleted file mode 100644
index 876d7786a..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index 1501bd95a..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-76x76@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-83.5x83.5@2x.png b/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index 759dbbece..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon-Beta.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Contents.json b/Simplenote/Icons.xcassets/AppIcon.appiconset/Contents.json
index b970ad913..c04602c05 100644
--- a/Simplenote/Icons.xcassets/AppIcon.appiconset/Contents.json
+++ b/Simplenote/Icons.xcassets/AppIcon.appiconset/Contents.json
@@ -1,137 +1,9 @@
 {
   "images" : [
-    {
-      "filename" : "Icon-App-20x20@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-60x60@2x.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-App-60x60@3x.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "Icon-App-20x20.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-20x20@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "Icon-App-29x29-1.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-29x29@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "Icon-App-40x40.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "Icon-App-40x40@2x-1.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "50x50"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "50x50"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "72x72"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "72x72"
-    },
-    {
-      "filename" : "Icon-App-76x76.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Icon-App-76x76@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
     {
       "filename" : "Icon-App-iTunes.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
+      "idiom" : "universal",
+      "platform" : "ios",
       "size" : "1024x1024"
     }
   ],
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20.png
deleted file mode 100644
index a7aa03329..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x-1.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x-1.png
deleted file mode 100644
index b91fb2496..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x-1.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index b91fb2496..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 5ca72b1ee..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29-1.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29-1.png
deleted file mode 100644
index a50524dab..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29-1.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29.png
deleted file mode 100644
index a50524dab..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png
deleted file mode 100644
index 00db0210a..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index 00db0210a..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index 1a1f5521b..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40.png
deleted file mode 100644
index f7737b6ef..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png
deleted file mode 100644
index 68d79dd7e..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index 68d79dd7e..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index b5ff8684f..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index b5ff8684f..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index aef70c2fa..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76.png
deleted file mode 100644
index 6297cd1ea..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index d3133502a..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ
diff --git a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index ee50a72ab..000000000
Binary files a/Simplenote/Icons.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ