diff --git a/src/de/t_battermann/dhbw/todolist/Controller.java b/src/de/t_battermann/dhbw/todolist/Controller.java
index db33cf7..2a8fd10 100644
--- a/src/de/t_battermann/dhbw/todolist/Controller.java
+++ b/src/de/t_battermann/dhbw/todolist/Controller.java
@@ -259,7 +259,7 @@ public class Controller {
 	private void showMainWindow() {
 		primaryStage.setTitle("TodoList :: " + currentUser.getUsername() +  " > Default");
 		try {
-			primaryStage.setScene(new Scene(FXMLLoader.load(getClass().getResource("main.fxml")),600,500));
+			primaryStage.setScene(new Scene(FXMLLoader.load(getClass().getResource("main.fxml")),950,650));
 		} catch (IOException e) {
 			ErrorPrinter.printError("showMainWindow > Failed to open window 'main'! Goodbye!");
 			e.printStackTrace();
diff --git a/src/de/t_battermann/dhbw/todolist/add.png b/src/de/t_battermann/dhbw/todolist/add.png
new file mode 100644
index 0000000..694303f
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/add.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/add.svg b/src/de/t_battermann/dhbw/todolist/add.svg
new file mode 100644
index 0000000..18d47a0
--- /dev/null
+++ b/src/de/t_battermann/dhbw/todolist/add.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   viewBox="0 0 25 25"
+   id="svg4186"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="add.svg">
+  <defs
+     id="defs4188" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="10.771093"
+     inkscape:cy="13.110649"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4734" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4191">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3622)">
+    <path
+       style="fill:#0096ff;fill-rule:evenodd;stroke:#000000;stroke-width:1.8518523;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
+       d="m 0.92592615,1036.6214 8.33333325,0 0,-8.3333 6.4814816,0 0,8.3333 8.333333,0 0,6.4815 -8.333333,0 0,8.3334 -6.4814816,0 0,-8.3334 -8.33333325,0 z"
+       id="path4738"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/de/t_battermann/dhbw/todolist/attention.png b/src/de/t_battermann/dhbw/todolist/attention.png
new file mode 100644
index 0000000..4183d49
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/attention.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/attention.svg b/src/de/t_battermann/dhbw/todolist/attention.svg
new file mode 100644
index 0000000..351ba29
--- /dev/null
+++ b/src/de/t_battermann/dhbw/todolist/attention.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   viewBox="0 0 25 25"
+   id="svg5963"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="attention.svg">
+  <defs
+     id="defs5965" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="11.206173"
+     inkscape:cy="11.141458"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid6511" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5968">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3622)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#e70000;stroke-width:1.08662176px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 0.55105198,1050.8121 11.95283602,-21.7326 11.952836,21.7326 -23.90567202,0"
+       id="path6513"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:17.5px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="9.0947018"
+       y="1047.8549"
+       id="text6515"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6517"
+         x="9.0947018"
+         y="1047.8549">!</tspan></text>
+  </g>
+</svg>
diff --git a/src/de/t_battermann/dhbw/todolist/done.png b/src/de/t_battermann/dhbw/todolist/done.png
new file mode 100644
index 0000000..feb6a04
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/done.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/done.svg b/src/de/t_battermann/dhbw/todolist/done.svg
new file mode 100644
index 0000000..dfc973c
--- /dev/null
+++ b/src/de/t_battermann/dhbw/todolist/done.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   viewBox="0 0 25 25"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="done.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="13.178123"
+     inkscape:cy="13.051759"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4138" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3622)">
+    <path
+       style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.98068881px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 10.098066,1049.3719 14.411611,-15.0153 -3.843096,-4.0041 -10.568515,11.0112 -5.7646442,-6.0061 -3.84309632,4.0041 z"
+       id="path4140"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/de/t_battermann/dhbw/todolist/email.png b/src/de/t_battermann/dhbw/todolist/email.png
new file mode 100644
index 0000000..905eb5f
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/email.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/email.svg b/src/de/t_battermann/dhbw/todolist/email.svg
new file mode 100644
index 0000000..783286f
--- /dev/null
+++ b/src/de/t_battermann/dhbw/todolist/email.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   viewBox="0 0 25 25"
+   id="svg6538"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="email.svg">
+  <defs
+     id="defs6540" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="20.385322"
+     inkscape:cy="15.92953"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7086" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6543">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3622)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 25,1032.3622 -24,0 0,15 24,0"
+       id="path7090"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2.5490153"
+       y="1043.5403"
+       id="text7124"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan7126"
+         x="2.5490153"
+         y="1043.5403"
+         style="font-size:13.75px">a@</tspan></text>
+  </g>
+</svg>
diff --git a/src/de/t_battermann/dhbw/todolist/main.fxml b/src/de/t_battermann/dhbw/todolist/main.fxml
index feb19e8..aab3c70 100644
--- a/src/de/t_battermann/dhbw/todolist/main.fxml
+++ b/src/de/t_battermann/dhbw/todolist/main.fxml
@@ -14,11 +14,39 @@
    <children>
       <ToolBar>
         <items>
-            <Button id="menuSave" mnemonicParsing="false" text="Save" />
-          <Button id="menuSaveAs" mnemonicParsing="false" text="Save as ..." />
+            <Button id="menuSave" mnemonicParsing="false" text="Save">
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@save.png" />
+                     </image>
+                  </ImageView>
+               </graphic></Button>
+          <Button id="menuSaveAs" mnemonicParsing="false" text="Save as ...">
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@save.png" />
+                     </image>
+                  </ImageView>
+               </graphic></Button>
             <Separator orientation="VERTICAL" />
-            <Button id="menuChangePassword" mnemonicParsing="false" text="Cange password" />
-            <Button id="menuChangeEmail" mnemonicParsing="false" text="Change eMail" />
+            <Button id="menuChangePassword" mnemonicParsing="false" text="Cange password">
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@password.png" />
+                     </image>
+                  </ImageView>
+               </graphic></Button>
+            <Button id="menuChangeEmail" mnemonicParsing="false" text="Change eMail">
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@email.png" />
+                     </image>
+                  </ImageView>
+               </graphic></Button>
           <Button id="menuLogout" mnemonicParsing="false" text="Log out" />
             <Separator orientation="VERTICAL" />
             <Button id="menuClose" mnemonicParsing="false" text="Close" />
@@ -32,14 +60,42 @@
                   <ToolBar id="todoListToolBar" visible="false">
                     <items>
                         <TextField id="todoListNewName" />
-                      <Button id="todoListNewNameSave" mnemonicParsing="false" text="Save" />
+                      <Button id="todoListNewNameSave" mnemonicParsing="false" text="Save">
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@save.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic></Button>
                     </items>
                   </ToolBar>
                   <ToolBar>
                     <items>
-                      <Button id="todoListNew" mnemonicParsing="false" text="New" />
-                        <Button id="todoListDelete" mnemonicParsing="false" text="Delete" />
-                        <Button id="todoListEdit" mnemonicParsing="false" text="Edit" />
+                      <Button id="todoListNew" mnemonicParsing="false" text="New">
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@add.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic></Button>
+                        <Button id="todoListDelete" mnemonicParsing="false" text="Delete">
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@remove.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic></Button>
+                        <Button id="todoListEdit" mnemonicParsing="false" text="Edit">
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@rename.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic></Button>
                     </items>
                   </ToolBar>
                </children>
@@ -48,13 +104,55 @@
                <children>
                   <ToolBar prefHeight="40.0" prefWidth="200.0">
                     <items>
-                      <Button id="todoNew" mnemonicParsing="false" text="New" />
-                        <ToggleButton id="todoToggleDone" mnemonicParsing="false" text="done" />
-                        <ToggleButton id="todoToggleStar" mnemonicParsing="false" text="star" />
-                        <Button id="todoMove" mnemonicParsing="false" text="move" />
-                        <Button id="todoDelete" mnemonicParsing="false" text="delete" />
+                      <Button id="todoNew" mnemonicParsing="false" text="New">
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@add.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic></Button>
+                        <ToggleButton id="todoToggleDone" mnemonicParsing="false" text="done">
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@done.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic></ToggleButton>
+                        <ToggleButton id="todoToggleStar" mnemonicParsing="false" text="star">
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@star.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic></ToggleButton>
+                        <Button id="todoMove" mnemonicParsing="false" text="move">
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@move.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic></Button>
+                        <Button id="todoDelete" mnemonicParsing="false" text="delete">
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@remove.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic></Button>
                         <Separator orientation="VERTICAL" />
-                        <ToggleButton id="todosShowDone" mnemonicParsing="false" selected="true" text="show done" />
+                        <ToggleButton id="todosShowDone" mnemonicParsing="false" selected="true" text="show done">
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@toggle-done.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic></ToggleButton>
                     </items>
                   </ToolBar>
                   <SplitPane dividerPositions="0.6" orientation="VERTICAL" VBox.vgrow="ALWAYS">
@@ -89,7 +187,14 @@
                                           </HBox>
                                        </children>
                                     </GridPane>
-                                    <Button id="todoDetailSave" minWidth="150.0" mnemonicParsing="false" text="Save" VBox.vgrow="ALWAYS" />
+                                    <Button id="todoDetailSave" minWidth="150.0" mnemonicParsing="false" text="Save" VBox.vgrow="ALWAYS">
+                                       <graphic>
+                                          <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                             <image>
+                                                <Image url="@save.png" />
+                                             </image>
+                                          </ImageView>
+                                       </graphic></Button>
                                  </children>
                               </VBox>
                            </content>
diff --git a/src/de/t_battermann/dhbw/todolist/move.png b/src/de/t_battermann/dhbw/todolist/move.png
new file mode 100644
index 0000000..e6e1adc
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/move.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/move.svg b/src/de/t_battermann/dhbw/todolist/move.svg
new file mode 100644
index 0000000..22d1f0a
--- /dev/null
+++ b/src/de/t_battermann/dhbw/todolist/move.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   viewBox="0 0 25 25"
+   id="svg4212"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="move.svg">
+  <defs
+     id="defs4214" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="11.858917"
+     inkscape:cy="13.454912"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4760" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4217">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3622)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="0.074396707"
+       y="1035.6869"
+       id="text4762"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4764"
+         x="0.074396707"
+         y="1035.6869"
+         style="font-size:11.25px">A</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:11.25px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="17.77903"
+       y="1051.9812"
+       id="text4766"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4768"
+         x="17.77903"
+         y="1051.9812">B</tspan></text>
+    <path
+       style="fill:#ff9b00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.85938191px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 8.6873083,1036.9262 5.1562907,5.1562 -1.718763,1.7188 5.156291,0 0,-5.1563 -1.718764,1.7188 -5.156291,-5.1563 z"
+       id="path4770"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/de/t_battermann/dhbw/todolist/password.png b/src/de/t_battermann/dhbw/todolist/password.png
new file mode 100644
index 0000000..b018bd6
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/password.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/password.svg b/src/de/t_battermann/dhbw/todolist/password.svg
new file mode 100644
index 0000000..0388bd6
--- /dev/null
+++ b/src/de/t_battermann/dhbw/todolist/password.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   viewBox="0 0 25 25"
+   id="svg6538"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="password.svg">
+  <defs
+     id="defs6540" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="13.255191"
+     inkscape:cy="12.83042"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid7086" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6543">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3622)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 25,1032.3622 -24,0 0,15 24,0"
+       id="path7090"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path7092"
+       cx="7.75"
+       cy="1040.1122"
+       r="3" />
+    <circle
+       r="3"
+       cy="1040.1122"
+       cx="17.75"
+       id="circle7103"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/src/de/t_battermann/dhbw/todolist/remove.png b/src/de/t_battermann/dhbw/todolist/remove.png
new file mode 100644
index 0000000..697ce2d
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/remove.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/remove.svg b/src/de/t_battermann/dhbw/todolist/remove.svg
new file mode 100644
index 0000000..7f5cd8d
--- /dev/null
+++ b/src/de/t_battermann/dhbw/todolist/remove.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   viewBox="0 0 25 25"
+   id="svg4759"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="remove.svg">
+  <defs
+     id="defs4761" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="10.568688"
+     inkscape:cy="15.904997"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5307" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4764">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3622)">
+    <path
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.93070602;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.965353,1043.3968 23.069294,0 0,-7.0692 -23.069294,0 z"
+       id="path5309"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/de/t_battermann/dhbw/todolist/rename.png b/src/de/t_battermann/dhbw/todolist/rename.png
new file mode 100644
index 0000000..e63b80a
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/rename.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/rename.svg b/src/de/t_battermann/dhbw/todolist/rename.svg
new file mode 100644
index 0000000..a5d4098
--- /dev/null
+++ b/src/de/t_battermann/dhbw/todolist/rename.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   viewBox="0 0 25 25"
+   id="svg4791"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="rename.svg">
+  <defs
+     id="defs4793" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="9.9662969"
+     inkscape:cy="13.975451"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5339" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4796">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3621)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="0.22208051"
+       y="1045.3499"
+       id="text5341"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5343"
+         x="0.22208051"
+         y="1045.3499"
+         style="font-size:16.25px;letter-spacing:3.1099999px">AB</tspan></text>
+    <path
+       style="fill:#ff9b00;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1"
+       d="m 13,1046.3621 0,-14 -2,0 0,-1 5,0 0,1 -2,0 0,14 2,0 0,1 -5,0 0,-1 z"
+       id="path5347"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/de/t_battermann/dhbw/todolist/save.png b/src/de/t_battermann/dhbw/todolist/save.png
new file mode 100644
index 0000000..fc52d2b
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/save.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/save.svg b/src/de/t_battermann/dhbw/todolist/save.svg
new file mode 100644
index 0000000..cca9d3a
--- /dev/null
+++ b/src/de/t_battermann/dhbw/todolist/save.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   viewBox="0 0 25 25"
+   id="svg5368"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="save.svg">
+  <defs
+     id="defs5370" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="11.865594"
+     inkscape:cy="13.424199"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5916" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5373">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3622)">
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:0.78740156"
+       d="m 1,1028.3622 0,23 6,0 0,-5 11,0 0,5 6,0 0,-23 z"
+       id="path5922"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#00005c;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:0.71653545"
+       d="m 9,1051.3622 0,-3 7,0 0,3 z"
+       id="path5924"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
+       d="m 4,1030.3622 0,12 17,0 0,-12 -17,0"
+       id="path5926"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 7,1036.3622 11,0"
+       id="path5938"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 7,1039.3622 11,0"
+       id="path5940"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 7,1033.3622 11,0"
+       id="path5942"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/de/t_battermann/dhbw/todolist/toggle-done.png b/src/de/t_battermann/dhbw/todolist/toggle-done.png
new file mode 100644
index 0000000..ec62f74
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/toggle-done.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/toggle-done.svg b/src/de/t_battermann/dhbw/todolist/toggle-done.svg
new file mode 100644
index 0000000..4a27b0d
--- /dev/null
+++ b/src/de/t_battermann/dhbw/todolist/toggle-done.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   viewBox="0 0 25 25"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="toggle-done.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="4.3703521"
+     inkscape:cy="12.338567"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1918"
+     inkscape:window-height="1042"
+     inkscape:window-x="1920"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1027.3622)">
+    <g
+       id="layer1-7"
+       inkscape:label="Ebene 1"
+       transform="matrix(0.55973524,0,0,0.55973524,0.49954047,463.03275)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4140"
+         d="m 10.098066,1049.3719 14.411611,-15.0153 -3.843096,-4.0041 -10.568515,11.0112 -5.7646442,-6.0061 -3.84309632,4.0041 z"
+         style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.98068881px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <circle
+       style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1.52932596;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4241"
+       cx="7.9687495"
+       cy="1044.4382"
+       r="7.1328449" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.53027689;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3.4598986,1039.3827 9.6780904,9.6781"
+       id="path4243"
+       inkscape:connector-curvature="0" />
+    <g
+       id="layer1-2"
+       inkscape:label="Ebene 1"
+       transform="matrix(0.59999994,0,0,0.59999994,9.8660715,409.47173)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4140-6"
+         d="m 10.098066,1049.3719 14.411611,-15.0153 -3.843096,-4.0041 -10.568515,11.0112 -5.7646442,-6.0061 -3.84309632,4.0041 z"
+         style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.98068881px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>