diff --git a/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate b/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate
index 021f197..e21ef6a 100644
Binary files a/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate and b/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/1024.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/1024.jpg
deleted file mode 100644
index 072bc96..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/1024.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/120-1.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/120-1.jpg
deleted file mode 100644
index 4f038a2..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/120-1.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/120-1.png b/Sora/Assets.xcassets/AppIcon.appiconset/120-1.png
new file mode 100644
index 0000000..6b97fef
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/120-1.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/120.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/120.jpg
deleted file mode 100644
index 4f038a2..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/120.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/120.png b/Sora/Assets.xcassets/AppIcon.appiconset/120.png
new file mode 100644
index 0000000..6b97fef
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/120.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/152.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/152.jpg
deleted file mode 100644
index 0076f0c..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/152.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/152.png b/Sora/Assets.xcassets/AppIcon.appiconset/152.png
new file mode 100644
index 0000000..9ee93d1
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/152.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/167.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/167.jpg
deleted file mode 100644
index f6ab53c..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/167.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/167.png b/Sora/Assets.xcassets/AppIcon.appiconset/167.png
new file mode 100644
index 0000000..9f900ff
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/167.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/180.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/180.jpg
deleted file mode 100644
index 748db74..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/180.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/180.png b/Sora/Assets.xcassets/AppIcon.appiconset/180.png
new file mode 100644
index 0000000..cbd41fa
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/180.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/20.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/20.jpg
deleted file mode 100644
index 6ead676..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/20.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/20.png b/Sora/Assets.xcassets/AppIcon.appiconset/20.png
new file mode 100644
index 0000000..da81d00
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/20.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/29.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/29.jpg
deleted file mode 100644
index 841f216..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/29.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/29.png b/Sora/Assets.xcassets/AppIcon.appiconset/29.png
new file mode 100644
index 0000000..175262b
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/29.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/40-1.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/40-1.jpg
deleted file mode 100644
index 22e2a31..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/40-1.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/40-1.png b/Sora/Assets.xcassets/AppIcon.appiconset/40-1.png
new file mode 100644
index 0000000..e9a76d4
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/40-1.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/40-2.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/40-2.jpg
deleted file mode 100644
index 22e2a31..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/40-2.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/40-2.png b/Sora/Assets.xcassets/AppIcon.appiconset/40-2.png
new file mode 100644
index 0000000..e9a76d4
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/40-2.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/40.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/40.jpg
deleted file mode 100644
index 22e2a31..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/40.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/40.png b/Sora/Assets.xcassets/AppIcon.appiconset/40.png
new file mode 100644
index 0000000..e9a76d4
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/40.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/58-1.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/58-1.jpg
deleted file mode 100644
index 2dc5162..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/58-1.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/58-1.png b/Sora/Assets.xcassets/AppIcon.appiconset/58-1.png
new file mode 100644
index 0000000..1fcf9d6
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/58-1.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/58.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/58.jpg
deleted file mode 100644
index 2dc5162..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/58.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/58.png b/Sora/Assets.xcassets/AppIcon.appiconset/58.png
new file mode 100644
index 0000000..1fcf9d6
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/58.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/60.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/60.jpg
deleted file mode 100644
index 4aa6852..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/60.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/60.png b/Sora/Assets.xcassets/AppIcon.appiconset/60.png
new file mode 100644
index 0000000..583acd9
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/60.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/76.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/76.jpg
deleted file mode 100644
index 4fc0966..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/76.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/76.png b/Sora/Assets.xcassets/AppIcon.appiconset/76.png
new file mode 100644
index 0000000..72d8eda
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/76.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/80-1.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/80-1.jpg
deleted file mode 100644
index 2a85707..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/80-1.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/80-1.png b/Sora/Assets.xcassets/AppIcon.appiconset/80-1.png
new file mode 100644
index 0000000..579fcd9
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/80-1.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/80.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/80.jpg
deleted file mode 100644
index 2a85707..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/80.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/80.png b/Sora/Assets.xcassets/AppIcon.appiconset/80.png
new file mode 100644
index 0000000..579fcd9
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/80.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/87.jpg b/Sora/Assets.xcassets/AppIcon.appiconset/87.jpg
deleted file mode 100644
index 5396eeb..0000000
Binary files a/Sora/Assets.xcassets/AppIcon.appiconset/87.jpg and /dev/null differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/87.png b/Sora/Assets.xcassets/AppIcon.appiconset/87.png
new file mode 100644
index 0000000..fcb5b93
Binary files /dev/null and b/Sora/Assets.xcassets/AppIcon.appiconset/87.png differ
diff --git a/Sora/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sora/Assets.xcassets/AppIcon.appiconset/Contents.json
index 661a179..1fa06d6 100644
--- a/Sora/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Sora/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,103 +1,103 @@
 {
   "images" : [
     {
-      "filename" : "40.jpg",
+      "filename" : "40-2.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "60.jpg",
+      "filename" : "60.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
-      "filename" : "58.jpg",
+      "filename" : "58.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "87.jpg",
+      "filename" : "87.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
-      "filename" : "80-1.jpg",
+      "filename" : "80.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "120-1.jpg",
+      "filename" : "120-1.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "120.jpg",
+      "filename" : "120.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "180.jpg",
+      "filename" : "180.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
-      "filename" : "20.jpg",
+      "filename" : "20.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
-      "filename" : "40-1.jpg",
+      "filename" : "40-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "29.jpg",
+      "filename" : "29.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
-      "filename" : "58-1.jpg",
+      "filename" : "58-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "40-2.jpg",
+      "filename" : "40.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
-      "filename" : "80.jpg",
+      "filename" : "80-1.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "76.jpg",
+      "filename" : "76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
-      "filename" : "152.jpg",
+      "filename" : "152.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
-      "filename" : "167.jpg",
+      "filename" : "167.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"