diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
index 619645a70..f1cfba4a8 100644
--- a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,261 +1,14 @@
-{"images":[
-
 {
-"size":"1024x1024",
-"idiom":"ios-marketing",
-"filename":"appicon_1024.png",
-"scale":"1x"
-},
-
-
-
-{
-"size":"20x20",
-"idiom":"iphone",
-"filename":"appicon_40.png",
-"scale":"2x"
-},
-{
-"size":"20x20",
-"idiom":"iphone",
-"filename":"appicon_60.png",
-"scale":"3x"
-},
-
-{
-"size":"29x29",
-"idiom":"iphone",
-"filename":"appicon_29.png",
-"scale":"1x"
-},
-{
-"size":"29x29",
-"idiom":"iphone",
-"filename":"appicon_58.png",
-"scale":"2x"
-},
-{
-"size":"29x29",
-"idiom":"iphone",
-"filename":"appicon_87.png",
-"scale":"3x"
-},
-
-{
-"size":"40x40",
-"idiom":"iphone",
-"filename":"appicon_80.png",
-"scale":"2x"
-},
-{
-"size":"40x40",
-"idiom":"iphone",
-"filename":"appicon_120.png",
-"scale":"3x"
-},
-
-{
-"size":"57x57",
-"idiom":"iphone",
-"filename":"appicon_57.png",
-"scale":"1x"
-},
-{
-"size":"57x57",
-"idiom":"iphone",
-"filename":"appicon_114.png",
-"scale":"2x"
-},
-
-{
-"size":"60x60",
-"idiom":"iphone",
-"filename":"appicon_120.png",
-"scale":"2x"
-},
-{
-"size":"60x60",
-"idiom":"iphone",
-"filename":"appicon_180.png",
-"scale":"3x"
-},
-
-
-
-{
-"size":"20x20",
-"idiom":"ipad",
-"filename":"appicon_20.png",
-"scale":"1x"
-},
-{
-"size":"20x20",
-"idiom":"ipad",
-"filename":"appicon_40.png",
-"scale":"2x"
-},
-
-{
-"size":"29x29",
-"idiom":"ipad",
-"filename":"appicon_29.png",
-"scale":"1x"
-},
-{
-"size":"29x29",
-"idiom":"ipad",
-"filename":"appicon_58.png",
-"scale":"2x"
-},
-
-{
-"size":"40x40",
-"idiom":"ipad",
-"filename":"appicon_40.png",
-"scale":"1x"
-},
-{
-"size":"40x40",
-"idiom":"ipad",
-"filename":"appicon_80.png",
-"scale":"2x"
-},
-
-{
-"size":"50x50",
-"idiom":"ipad",
-"filename":"appicon_50.png",
-"scale":"1x"
-},
-{
-"size":"50x50",
-"idiom":"ipad",
-"filename":"appicon_100.png",
-"scale":"2x"
-},
-
-{
-"size":"72x72",
-"idiom":"ipad",
-"filename":"appicon_72.png",
-"scale":"1x"
-},
-{
-"size":"72x72",
-"idiom":"ipad",
-"filename":"appicon_144.png",
-"scale":"2x"
-},
-
-{
-"size":"76x76",
-"idiom":"ipad",
-"filename":"appicon_76.png",
-"scale":"1x"
-},
-{
-"size":"76x76",
-"idiom":"ipad",
-"filename":"appicon_152.png",
-"scale":"2x"
-},
-
-{
-"size":"83.5x83.5",
-"idiom":"ipad",
-"filename":"appicon_167.png",
-"scale":"2x"
-},
-
-
-
-
-{
-"size":"60x60",
-"idiom":"car",
-"filename":"appicon_120.png",
-"scale":"2x"
-},
-{
-"size":"60x60",
-"idiom":"car",
-"filename":"appicon_180.png",
-"scale":"3x"
-},
-
-
-
-
-{
-"size":"16x16",
-"idiom":"mac",
-"filename":"appicon_16.png",
-"scale":"1x"
-},
-{
-"size":"16x16",
-"idiom":"mac",
-"filename":"appicon_32.png",
-"scale":"2x"
-},
-
-{
-"size":"32x32",
-"idiom":"mac",
-"filename":"appicon_32.png",
-"scale":"1x"
-},
-{
-"size":"32x32",
-"idiom":"mac",
-"filename":"appicon_64.png",
-"scale":"2x"
-},
-
-{
-"size":"128x128",
-"idiom":"mac",
-"filename":"appicon_128.png",
-"scale":"1x"
-},
-{
-"size":"128x128",
-"idiom":"mac",
-"filename":"appicon_256.png",
-"scale":"2x"
-},
-
-{
-"size":"256x256",
-"idiom":"mac",
-"filename":"appicon_256.png",
-"scale":"1x"
-},
-{
-"size":"256x256",
-"idiom":"mac",
-"filename":"appicon_512.png",
-"scale":"2x"
-},
-
-{
-"size":"512x512",
-"idiom":"mac",
-"filename":"appicon_512.png",
-"scale":"1x"
-},
-{
-"size":"512x512",
-"idiom":"mac",
-"filename":"appicon_1024.png",
-"scale":"2x"
-}
-],
-
-
-
-"info":{
-"version":1,
-"author":"xcode"
-}
+  "images" : [
+    {
+      "filename" : "app_icon.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
 }
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/app_icon.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/app_icon.png
new file mode 100644
index 000000000..da51a1160
Binary files /dev/null and b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/app_icon.png differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_100.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_100.png
deleted file mode 100644
index 377ec70ec..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_100.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_1024.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_1024.png
deleted file mode 100644
index 8fddac51b..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_1024.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_114.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_114.png
deleted file mode 100644
index a4ff7050e..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_114.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_120.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_120.png
deleted file mode 100644
index 8314551fd..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_120.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_128.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_128.png
deleted file mode 100644
index deab61ebc..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_128.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_144.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_144.png
deleted file mode 100644
index e0c9cadab..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_144.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_152.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_152.png
deleted file mode 100644
index 1ed6d5632..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_152.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_16.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_16.png
deleted file mode 100644
index 1b0333b23..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_16.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_167.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_167.png
deleted file mode 100644
index caa17c3b6..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_167.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_180.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_180.png
deleted file mode 100644
index 340923c45..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_180.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_20.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_20.png
deleted file mode 100644
index c3ba9d982..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_20.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_256.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_256.png
deleted file mode 100644
index da7296b12..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_256.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_29.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_29.png
deleted file mode 100644
index 3440b416d..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_29.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_32.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_32.png
deleted file mode 100644
index 86202ab60..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_32.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_40.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_40.png
deleted file mode 100644
index 922f1e770..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_40.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_50.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_50.png
deleted file mode 100644
index 5115e165b..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_50.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_512.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_512.png
deleted file mode 100644
index 0228b16b2..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_512.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_57.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_57.png
deleted file mode 100644
index 3465a048e..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_57.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_58.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_58.png
deleted file mode 100644
index ce1fbc27f..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_58.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_60.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_60.png
deleted file mode 100644
index bccab7ca4..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_60.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_64.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_64.png
deleted file mode 100644
index dded2435e..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_64.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_72.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_72.png
deleted file mode 100644
index e5ffa9883..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_72.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_76.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_76.png
deleted file mode 100644
index 671a9aad4..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_76.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_80.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_80.png
deleted file mode 100644
index fe784a404..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_80.png and /dev/null differ
diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_87.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_87.png
deleted file mode 100644
index c24cfeffb..000000000
Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/appicon_87.png and /dev/null differ