diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/Contents.json b/AvH Plan/Assets.xcassets/AppIcon.appiconset/Contents.json
index fc014c0..56ade93 100644
--- a/AvH Plan/Assets.xcassets/AppIcon.appiconset/Contents.json	
+++ b/AvH Plan/Assets.xcassets/AppIcon.appiconset/Contents.json	
@@ -3,109 +3,109 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "avh20x2-1.png",
+      "filename" : "avh_40.png",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "avh20x3.png",
+      "filename" : "avh_60.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "avh29x2.png",
+      "filename" : "avh_58.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "avh29x3.png",
+      "filename" : "avh_87.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "avh40x2-1.png",
+      "filename" : "avh_80.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "avh40x3.png",
+      "filename" : "avh_120.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "avh60x2.png",
+      "filename" : "avh_120-1.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "avh60x3.png",
+      "filename" : "avh_180.png",
       "scale" : "3x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "avh20x1.png",
+      "filename" : "avh_20.png",
       "scale" : "1x"
     },
     {
       "size" : "20x20",
       "idiom" : "ipad",
-      "filename" : "avh20x2.png",
+      "filename" : "avh_40-1.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "avh29x1.png",
+      "filename" : "avh_29.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "ipad",
-      "filename" : "avh29x2-1.png",
+      "filename" : "avh_58-1.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "avh40x1.png",
+      "filename" : "avh_40-2.png",
       "scale" : "1x"
     },
     {
       "size" : "40x40",
       "idiom" : "ipad",
-      "filename" : "avh40x2.png",
+      "filename" : "avh_80-1.png",
       "scale" : "2x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "avh76x1.png",
+      "filename" : "avh_76.png",
       "scale" : "1x"
     },
     {
       "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "avh76x2.png",
+      "filename" : "avh_152.png",
       "scale" : "2x"
     },
     {
       "size" : "83.5x83.5",
       "idiom" : "ipad",
-      "filename" : "avh83,5x2.png",
+      "filename" : "avh_167.png",
       "scale" : "2x"
     },
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "app_icon_ios.png",
+      "filename" : "avh_1024.png",
       "scale" : "1x"
     }
   ],
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/app_icon_ios.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/app_icon_ios.png
deleted file mode 100644
index 775d52a..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/app_icon_ios.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x1.png
deleted file mode 100644
index f09b6ed..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x1.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x2-1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x2-1.png
deleted file mode 100644
index 2da628e..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x2-1.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x2.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x2.png
deleted file mode 100644
index 2da628e..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x2.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x3.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x3.png
deleted file mode 100644
index 521a9e3..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh20x3.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x1.png
deleted file mode 100644
index c6fe8c3..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x1.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x2-1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x2-1.png
deleted file mode 100644
index a32625a..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x2-1.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x2.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x2.png
deleted file mode 100644
index a32625a..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x2.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x3.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x3.png
deleted file mode 100644
index 94dad27..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh29x3.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x1.png
deleted file mode 100644
index 2da628e..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x1.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x2-1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x2-1.png
deleted file mode 100644
index 1e76fab..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x2-1.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x2.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x2.png
deleted file mode 100644
index 1e76fab..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x2.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x3.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x3.png
deleted file mode 100644
index 3a8ab38..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh40x3.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh60x2.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh60x2.png
deleted file mode 100644
index 3a8ab38..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh60x2.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh60x3.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh60x3.png
deleted file mode 100644
index 77823d3..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh60x3.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh76x1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh76x1.png
deleted file mode 100644
index cc23b84..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh76x1.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh76x2.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh76x2.png
deleted file mode 100644
index 9d5defb..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh76x2.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh83,5x2.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh83,5x2.png
deleted file mode 100644
index 693604e..0000000
Binary files a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh83,5x2.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_1024.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_1024.png
new file mode 100644
index 0000000..180bc43
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_1024.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_120-1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_120-1.png
new file mode 100644
index 0000000..3e5a611
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_120-1.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_120.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_120.png
new file mode 100644
index 0000000..3e5a611
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_120.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_152.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_152.png
new file mode 100644
index 0000000..1a8b4c3
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_152.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_167.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_167.png
new file mode 100644
index 0000000..33bed78
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_167.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_180.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_180.png
new file mode 100644
index 0000000..3cdc26b
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_180.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_20.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_20.png
new file mode 100644
index 0000000..00b8246
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_20.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_29.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_29.png
new file mode 100644
index 0000000..96c300d
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_29.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_40-1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_40-1.png
new file mode 100644
index 0000000..c6bbf95
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_40-1.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_40-2.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_40-2.png
new file mode 100644
index 0000000..c6bbf95
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_40-2.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_40.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_40.png
new file mode 100644
index 0000000..c6bbf95
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_40.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_58-1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_58-1.png
new file mode 100644
index 0000000..065ecbb
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_58-1.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_58.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_58.png
new file mode 100644
index 0000000..065ecbb
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_58.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_60.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_60.png
new file mode 100644
index 0000000..7bad139
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_60.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_76.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_76.png
new file mode 100644
index 0000000..abb41ea
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_76.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_80-1.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_80-1.png
new file mode 100644
index 0000000..a1009b3
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_80-1.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_80.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_80.png
new file mode 100644
index 0000000..a1009b3
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_80.png differ
diff --git a/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_87.png b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_87.png
new file mode 100644
index 0000000..6420673
Binary files /dev/null and b/AvH Plan/Assets.xcassets/AppIcon.appiconset/avh_87.png differ
diff --git a/AvH Plan/Assets.xcassets/checkmark.imageset/Contents.json b/AvH Plan/Assets.xcassets/checkmark.imageset/Contents.json
index a2b0b46..958a308 100644
--- a/AvH Plan/Assets.xcassets/checkmark.imageset/Contents.json	
+++ b/AvH Plan/Assets.xcassets/checkmark.imageset/Contents.json	
@@ -2,18 +2,49 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "checkmark-1x.png",
       "scale" : "1x"
     },
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ]
+    },
     {
       "idiom" : "universal",
       "filename" : "checkmark-2x.png",
       "scale" : "2x"
     },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_tick_l_2x.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "2x"
+    },
     {
       "idiom" : "universal",
       "filename" : "checkmark-3x.png",
       "scale" : "3x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "ic_tick_l_3x.png",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "scale" : "3x"
     }
   ],
   "info" : {
diff --git a/AvH Plan/Assets.xcassets/checkmark.imageset/checkmark-1x.png b/AvH Plan/Assets.xcassets/checkmark.imageset/checkmark-1x.png
deleted file mode 100644
index 6128c68..0000000
Binary files a/AvH Plan/Assets.xcassets/checkmark.imageset/checkmark-1x.png and /dev/null differ
diff --git a/AvH Plan/Assets.xcassets/checkmark.imageset/ic_tick_l_2x.png b/AvH Plan/Assets.xcassets/checkmark.imageset/ic_tick_l_2x.png
new file mode 100644
index 0000000..f3b29d6
Binary files /dev/null and b/AvH Plan/Assets.xcassets/checkmark.imageset/ic_tick_l_2x.png differ
diff --git a/AvH Plan/Assets.xcassets/checkmark.imageset/ic_tick_l_3x.png b/AvH Plan/Assets.xcassets/checkmark.imageset/ic_tick_l_3x.png
new file mode 100644
index 0000000..4b13175
Binary files /dev/null and b/AvH Plan/Assets.xcassets/checkmark.imageset/ic_tick_l_3x.png differ
diff --git a/AvH Plan/Base.lproj/Main.storyboard b/AvH Plan/Base.lproj/Main.storyboard
index f2466c2..ea7565f 100644
--- a/AvH Plan/Base.lproj/Main.storyboard	
+++ b/AvH Plan/Base.lproj/Main.storyboard	
@@ -266,7 +266,7 @@
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" title="Customize" id="in4-ZK-bqT">
-                        <barButtonItem key="rightBarButtonItem" title="Save" id="FhN-ih-qVW">
+                        <barButtonItem key="rightBarButtonItem" title="Done" id="FhN-ih-qVW">
                             <connections>
                                 <action selector="done:" destination="5GD-rn-jaq" id="41Z-mE-1g6"/>
                             </connections>
@@ -409,7 +409,7 @@
                                 <color key="barTintColor" name="colorToolbarPreferences"/>
                                 <items>
                                     <navigationItem title="Title" id="HYG-gj-KYl">
-                                        <barButtonItem key="rightBarButtonItem" title="Save" id="ZI8-Ec-yYU">
+                                        <barButtonItem key="rightBarButtonItem" title="Done" id="ZI8-Ec-yYU">
                                             <connections>
                                                 <action selector="done:" destination="xQo-mK-Kfi" id="DK7-6I-kUG"/>
                                             </connections>
diff --git a/AvH Plan/de.lproj/Main.strings b/AvH Plan/de.lproj/Main.strings
index 18af7c9..2d86ef7 100644
--- a/AvH Plan/de.lproj/Main.strings	
+++ b/AvH Plan/de.lproj/Main.strings	
@@ -57,7 +57,7 @@
 "VcC-PU-4w2.title" = "Einloggen";
 
 /* Class = "UIBarButtonItem"; title = "Save"; ObjectID = "ZI8-Ec-yYU"; */
-"ZI8-Ec-yYU.title" = "Speichern";
+"ZI8-Ec-yYU.title" = "Fertig";
 
 /* Class = "UILabel"; text = "Please click the button above to enter your username and password to verify that you're occupied at the Alexander-von-Humboldt-Gymnasium.\n\nThis login is only required once and your information will not be shared with anybody."; ObjectID = "ZIX-7y-psY"; */
 "ZIX-7y-psY.text" = "Bitte klicke die Schaltfläche oben und gib deinen Nutzernamen und dein Passwort ein, um zu zeigen, dass du am Alexander-von-Humboldt-Gymnasium beschäftigt bist.\n\nDieser Login ist nur einmalig und deine Informationen werden nicht mit anderen geteilt.\n\nFalls du dich erfolgreich eingeloggt hast, die Einrichtung aber nicht fortfährt, dann geh bitte zurück und versuche es noch mal.";
@@ -134,7 +134,7 @@
 
 "bj2-hB-vVb.title" = "Kursfarben";
 
-"FhN-ih-qVW.title" = "Speichern";
+"FhN-ih-qVW.title" = "Fertig";
 
 "in4-ZK-bqT.title" = "Anpassen";