diff --git a/README.md b/README.md
index aebe1c6..48ad4f6 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,10 @@ A project for class "programming 2" at Baden-Wuerttemberg Cooperative State Univ
 
 ## Dependencies
 
-- [Apache Commons Lang](https://commons.apache.org/proper/commons-lang/)
 - [Apache Commons Validator](https://commons.apache.org/proper/commons-validator/)
 - [Apache Commons Codec](https://commons.apache.org/proper/commons-codec/download_codec.cgi)
+- [OpenCVS](http://sourceforge.net/projects/opencsv/)
+- [oxygen icons](https://github.com/rubenvb/oxygen-icons-svg)
 
 or simply:
 
diff --git a/src/de/t_battermann/dhbw/todolist/add.png b/src/de/t_battermann/dhbw/todolist/add.png
deleted file mode 100644
index 694303f..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/add.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/add.svg b/src/de/t_battermann/dhbw/todolist/add.svg
deleted file mode 100644
index 18d47a0..0000000
--- a/src/de/t_battermann/dhbw/todolist/add.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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
deleted file mode 100644
index 4183d49..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/attention.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/attention.svg b/src/de/t_battermann/dhbw/todolist/attention.svg
deleted file mode 100644
index 351ba29..0000000
--- a/src/de/t_battermann/dhbw/todolist/attention.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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/changeEmail.fxml b/src/de/t_battermann/dhbw/todolist/changeEmail.fxml
index afa3e24..4183a1e 100644
--- a/src/de/t_battermann/dhbw/todolist/changeEmail.fxml
+++ b/src/de/t_battermann/dhbw/todolist/changeEmail.fxml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.image.*?>
 <?import javafx.scene.text.*?>
 <?import javafx.geometry.*?>
 <?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<TitledPane animated="false" collapsible="false" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" text="Change eMail" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.45">
+<TitledPane animated="false" collapsible="false" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" text="Change eMail" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1">
    <content>
       <VBox>
          <children>
@@ -35,8 +36,22 @@
                      <HBox.margin>
                         <Insets right="5.0" />
                      </HBox.margin>
+                     <graphic>
+                        <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@images/dialog-ok-apply.png" />
+                           </image>
+                        </ImageView>
+                     </graphic>
                   </Button>
-                  <Button id="abort" minWidth="150.0" mnemonicParsing="false" text="Abort" />
+                  <Button id="abort" minWidth="150.0" mnemonicParsing="false" text="Abort">
+                     <graphic>
+                        <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@images/dialog-cancel.png" />
+                           </image>
+                        </ImageView>
+                     </graphic></Button>
                </children>
             </HBox>
             <Label id="status" text="Change your eMail address" />
diff --git a/src/de/t_battermann/dhbw/todolist/changePassword.fxml b/src/de/t_battermann/dhbw/todolist/changePassword.fxml
index 6c66943..e0c6f4b 100644
--- a/src/de/t_battermann/dhbw/todolist/changePassword.fxml
+++ b/src/de/t_battermann/dhbw/todolist/changePassword.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.image.*?>
 <?import javafx.scene.text.*?>
 <?import javafx.geometry.*?>
 <?import java.lang.*?>
@@ -38,8 +39,22 @@
                      <HBox.margin>
                         <Insets right="5.0" />
                      </HBox.margin>
+                     <graphic>
+                        <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@images/dialog-ok-apply.png" />
+                           </image>
+                        </ImageView>
+                     </graphic>
                   </Button>
-                  <Button id="abort" minWidth="150.0" mnemonicParsing="false" text="Abort" />
+                  <Button id="abort" minWidth="150.0" mnemonicParsing="false" text="Abort">
+                     <graphic>
+                        <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@images/dialog-cancel.png" />
+                           </image>
+                        </ImageView>
+                     </graphic></Button>
                </children>
             </HBox>
             <Label id="status" text="Change your password" />
diff --git a/src/de/t_battermann/dhbw/todolist/close.fxml b/src/de/t_battermann/dhbw/todolist/close.fxml
index 1c23d49..509452c 100644
--- a/src/de/t_battermann/dhbw/todolist/close.fxml
+++ b/src/de/t_battermann/dhbw/todolist/close.fxml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.image.*?>
 <?import javafx.geometry.*?>
 <?import javafx.scene.text.*?>
 <?import java.lang.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<TitledPane animated="false" collapsible="false" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" text="Close the program?" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.45">
+<TitledPane animated="false" collapsible="false" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" text="Close the program?" xmlns="http://javafx.com/javafx/8.0.45" xmlns:fx="http://javafx.com/fxml/1">
    <font>
       <Font name="System Bold" size="13.0" />
    </font>
@@ -17,13 +18,34 @@
                <VBox.margin>
                   <Insets bottom="10.0" />
                </VBox.margin>
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@images/dialog-cancel.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
             </Button>
             <Button id="save" minWidth="250.0" mnemonicParsing="false" text="Yes, but save the changes" textFill="#0cb228">
                <VBox.margin>
                   <Insets bottom="10.0" />
                </VBox.margin>
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@images/document-save.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
             </Button>
-            <Button id="close" minWidth="250.0" mnemonicParsing="false" text="Yes and discard the changes" textFill="#b20000" />
+            <Button id="close" minWidth="250.0" mnemonicParsing="false" text="Yes and discard the changes" textFill="#b20000">
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@images/window-close.png" />
+                     </image>
+                  </ImageView>
+               </graphic></Button>
          </children>
       </VBox>
    </content>
diff --git a/src/de/t_battermann/dhbw/todolist/deleteTodoItem.fxml b/src/de/t_battermann/dhbw/todolist/deleteTodoItem.fxml
index f968cdf..217ff55 100644
--- a/src/de/t_battermann/dhbw/todolist/deleteTodoItem.fxml
+++ b/src/de/t_battermann/dhbw/todolist/deleteTodoItem.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.image.*?>
 <?import javafx.scene.text.*?>
 <?import javafx.geometry.*?>
 <?import java.lang.*?>
@@ -14,8 +15,22 @@
                <HBox.margin>
                   <Insets right="5.0" />
                </HBox.margin>
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@images/dialog-ok-apply.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
             </Button>
-            <Button id="no" cancelButton="true" defaultButton="true" minWidth="100.0" mnemonicParsing="false" text="No" />
+            <Button id="no" cancelButton="true" defaultButton="true" minWidth="100.0" mnemonicParsing="false" text="No">
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@images/dialog-cancel.png" />
+                     </image>
+                  </ImageView>
+               </graphic></Button>
          </children>
       </HBox>
    </content>
diff --git a/src/de/t_battermann/dhbw/todolist/done.png b/src/de/t_battermann/dhbw/todolist/done.png
deleted file mode 100644
index feb6a04..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/done.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/done.svg b/src/de/t_battermann/dhbw/todolist/done.svg
deleted file mode 100644
index dfc973c..0000000
--- a/src/de/t_battermann/dhbw/todolist/done.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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
deleted file mode 100644
index 905eb5f..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/email.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/email.svg b/src/de/t_battermann/dhbw/todolist/email.svg
deleted file mode 100644
index 783286f..0000000
--- a/src/de/t_battermann/dhbw/todolist/email.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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/images/dialog-cancel.png b/src/de/t_battermann/dhbw/todolist/images/dialog-cancel.png
new file mode 100644
index 0000000..7c5f480
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/dialog-cancel.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/dialog-ok-apply.png b/src/de/t_battermann/dhbw/todolist/images/dialog-ok-apply.png
new file mode 100644
index 0000000..9c595b2
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/dialog-ok-apply.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/dialog-ok.png b/src/de/t_battermann/dhbw/todolist/images/dialog-ok.png
new file mode 100644
index 0000000..6605a84
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/dialog-ok.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/dialog-password.png b/src/de/t_battermann/dhbw/todolist/images/dialog-password.png
new file mode 100644
index 0000000..4cbcb8f
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/dialog-password.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/document-edit.png b/src/de/t_battermann/dhbw/todolist/images/document-edit.png
new file mode 100644
index 0000000..582065c
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/document-edit.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/document-new.png b/src/de/t_battermann/dhbw/todolist/images/document-new.png
new file mode 100644
index 0000000..b8d2e72
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/document-new.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/document-save-as.png b/src/de/t_battermann/dhbw/todolist/images/document-save-as.png
new file mode 100644
index 0000000..c8e3dad
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/document-save-as.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/document-save.png b/src/de/t_battermann/dhbw/todolist/images/document-save.png
new file mode 100644
index 0000000..2d4e9f3
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/document-save.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/edit-delete.png b/src/de/t_battermann/dhbw/todolist/images/edit-delete.png
new file mode 100644
index 0000000..1fcb85d
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/edit-delete.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/edit-rename.png b/src/de/t_battermann/dhbw/todolist/images/edit-rename.png
new file mode 100644
index 0000000..7131c93
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/edit-rename.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/list-add-user.png b/src/de/t_battermann/dhbw/todolist/images/list-add-user.png
new file mode 100644
index 0000000..08a218e
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/list-add-user.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/list-add.png b/src/de/t_battermann/dhbw/todolist/images/list-add.png
new file mode 100644
index 0000000..4fb128e
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/list-add.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/list-remove.png b/src/de/t_battermann/dhbw/todolist/images/list-remove.png
new file mode 100644
index 0000000..97a2d9d
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/list-remove.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/mail-send.png b/src/de/t_battermann/dhbw/todolist/images/mail-send.png
new file mode 100644
index 0000000..e1f38d4
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/mail-send.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/quickopen-file.png b/src/de/t_battermann/dhbw/todolist/images/quickopen-file.png
new file mode 100644
index 0000000..bd740d4
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/quickopen-file.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/rating.png b/src/de/t_battermann/dhbw/todolist/images/rating.png
new file mode 100644
index 0000000..7635850
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/rating.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/system-log-out.png b/src/de/t_battermann/dhbw/todolist/images/system-log-out.png
new file mode 100644
index 0000000..46f589e
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/system-log-out.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/transform-move.png b/src/de/t_battermann/dhbw/todolist/images/transform-move.png
new file mode 100644
index 0000000..4401d12
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/transform-move.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/images/window-close.png b/src/de/t_battermann/dhbw/todolist/images/window-close.png
new file mode 100644
index 0000000..8555b71
Binary files /dev/null and b/src/de/t_battermann/dhbw/todolist/images/window-close.png differ
diff --git a/src/de/t_battermann/dhbw/todolist/login.fxml b/src/de/t_battermann/dhbw/todolist/login.fxml
index 2b16ec0..04e97c8 100644
--- a/src/de/t_battermann/dhbw/todolist/login.fxml
+++ b/src/de/t_battermann/dhbw/todolist/login.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.image.*?>
 <?import javafx.scene.text.*?>
 <?import javafx.geometry.*?>
 <?import java.lang.*?>
@@ -34,6 +35,13 @@
                            <VBox.margin>
                               <Insets top="5.0" />
                            </VBox.margin>
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@images/dialog-password.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic>
                         </Button>
                         <Label id="labelHints" prefHeight="15.0" prefWidth="477.0" text="Please enter your credentials">
                            <VBox.margin>
@@ -76,10 +84,17 @@
                               <TextField id="registerEmailRepeat" GridPane.columnIndex="1" GridPane.rowIndex="4" />
                            </children>
                         </GridPane>
-                        <Button id="registerButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="482.0" text="Login" textAlignment="CENTER" VBox.vgrow="ALWAYS">
+                        <Button id="registerButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="482.0" text="Create user" textAlignment="CENTER" VBox.vgrow="ALWAYS">
                            <VBox.margin>
                               <Insets top="5.0" />
                            </VBox.margin>
+                           <graphic>
+                              <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                                 <image>
+                                    <Image url="@images/list-add-user.png" />
+                                 </image>
+                              </ImageView>
+                           </graphic>
                         </Button>
                         <Label id="labelHintsCreateNewUser" prefHeight="15.0" prefWidth="477.0" text="Create a new user">
                            <VBox.margin>
diff --git a/src/de/t_battermann/dhbw/todolist/main.fxml b/src/de/t_battermann/dhbw/todolist/main.fxml
index aab3c70..a3b8ad1 100644
--- a/src/de/t_battermann/dhbw/todolist/main.fxml
+++ b/src/de/t_battermann/dhbw/todolist/main.fxml
@@ -18,7 +18,7 @@
                <graphic>
                   <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                      <image>
-                        <Image url="@save.png" />
+                        <Image url="@images/document-save.png" />
                      </image>
                   </ImageView>
                </graphic></Button>
@@ -26,7 +26,7 @@
                <graphic>
                   <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                      <image>
-                        <Image url="@save.png" />
+                        <Image url="@images/document-save-as.png" />
                      </image>
                   </ImageView>
                </graphic></Button>
@@ -35,7 +35,7 @@
                <graphic>
                   <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                      <image>
-                        <Image url="@password.png" />
+                        <Image url="@images/dialog-password.png" />
                      </image>
                   </ImageView>
                </graphic></Button>
@@ -43,13 +43,27 @@
                <graphic>
                   <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                      <image>
-                        <Image url="@email.png" />
+                        <Image url="@images/mail-send.png" />
+                     </image>
+                  </ImageView>
+               </graphic></Button>
+          <Button id="menuLogout" mnemonicParsing="false" text="Log out">
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@images/system-log-out.png" />
                      </image>
                   </ImageView>
                </graphic></Button>
-          <Button id="menuLogout" mnemonicParsing="false" text="Log out" />
             <Separator orientation="VERTICAL" />
-            <Button id="menuClose" mnemonicParsing="false" text="Close" />
+            <Button id="menuClose" mnemonicParsing="false" text="Close">
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@images/window-close.png" />
+                     </image>
+                  </ImageView>
+               </graphic></Button>
         </items>
       </ToolBar>
       <SplitPane dividerPositions="0.333" prefHeight="160.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
@@ -64,7 +78,7 @@
                            <graphic>
                               <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
-                                    <Image url="@save.png" />
+                                    <Image url="@images/document-save.png" />
                                  </image>
                               </ImageView>
                            </graphic></Button>
@@ -76,7 +90,7 @@
                            <graphic>
                               <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
-                                    <Image url="@add.png" />
+                                    <Image url="@images/list-add.png" />
                                  </image>
                               </ImageView>
                            </graphic></Button>
@@ -84,7 +98,7 @@
                            <graphic>
                               <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
-                                    <Image url="@remove.png" />
+                                    <Image url="@images/list-remove.png" />
                                  </image>
                               </ImageView>
                            </graphic></Button>
@@ -92,7 +106,7 @@
                            <graphic>
                               <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
-                                    <Image url="@rename.png" />
+                                    <Image url="@images/document-edit.png" />
                                  </image>
                               </ImageView>
                            </graphic></Button>
@@ -108,7 +122,7 @@
                            <graphic>
                               <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
-                                    <Image url="@add.png" />
+                                    <Image url="@images/list-add.png" />
                                  </image>
                               </ImageView>
                            </graphic></Button>
@@ -116,7 +130,7 @@
                            <graphic>
                               <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
-                                    <Image url="@done.png" />
+                                    <Image url="@images/dialog-ok-apply.png" />
                                  </image>
                               </ImageView>
                            </graphic></ToggleButton>
@@ -124,7 +138,7 @@
                            <graphic>
                               <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
-                                    <Image url="@star.png" />
+                                    <Image url="@images/rating.png" />
                                  </image>
                               </ImageView>
                            </graphic></ToggleButton>
@@ -132,7 +146,7 @@
                            <graphic>
                               <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
-                                    <Image url="@move.png" />
+                                    <Image url="@images/transform-move.png" />
                                  </image>
                               </ImageView>
                            </graphic></Button>
@@ -140,7 +154,7 @@
                            <graphic>
                               <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
-                                    <Image url="@remove.png" />
+                                    <Image url="@images/list-remove.png" />
                                  </image>
                               </ImageView>
                            </graphic></Button>
@@ -149,7 +163,7 @@
                            <graphic>
                               <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                  <image>
-                                    <Image url="@toggle-done.png" />
+                                    <Image url="@images/dialog-ok.png" />
                                  </image>
                               </ImageView>
                            </graphic></ToggleButton>
@@ -191,7 +205,7 @@
                                        <graphic>
                                           <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
                                              <image>
-                                                <Image url="@save.png" />
+                                                <Image url="@images/document-save.png" />
                                              </image>
                                           </ImageView>
                                        </graphic></Button>
diff --git a/src/de/t_battermann/dhbw/todolist/move.png b/src/de/t_battermann/dhbw/todolist/move.png
deleted file mode 100644
index e6e1adc..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/move.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/move.svg b/src/de/t_battermann/dhbw/todolist/move.svg
deleted file mode 100644
index 22d1f0a..0000000
--- a/src/de/t_battermann/dhbw/todolist/move.svg
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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/moveTodoItem.fxml b/src/de/t_battermann/dhbw/todolist/moveTodoItem.fxml
index 73afd9c..78fd831 100644
--- a/src/de/t_battermann/dhbw/todolist/moveTodoItem.fxml
+++ b/src/de/t_battermann/dhbw/todolist/moveTodoItem.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.image.*?>
 <?import javafx.geometry.*?>
 <?import javafx.scene.text.*?>
 <?import java.lang.*?>
@@ -37,8 +38,22 @@
                      <HBox.margin>
                         <Insets right="5.0" />
                      </HBox.margin>
+                     <graphic>
+                        <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@images/dialog-ok-apply.png" />
+                           </image>
+                        </ImageView>
+                     </graphic>
                   </Button>
-                  <Button id="abort" minWidth="150.0" mnemonicParsing="false" text="Abort" />
+                  <Button id="abort" cancelButton="true" defaultButton="true" minWidth="150.0" mnemonicParsing="false" text="Abort">
+                     <graphic>
+                        <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@images/dialog-cancel.png" />
+                           </image>
+                        </ImageView>
+                     </graphic></Button>
                </children>
             </HBox>
          </children>
diff --git a/src/de/t_battermann/dhbw/todolist/openFile.fxml b/src/de/t_battermann/dhbw/todolist/openFile.fxml
index 53ac631..9660e32 100644
--- a/src/de/t_battermann/dhbw/todolist/openFile.fxml
+++ b/src/de/t_battermann/dhbw/todolist/openFile.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.image.*?>
 <?import javafx.scene.text.*?>
 <?import javafx.geometry.*?>
 <?import java.lang.*?>
@@ -17,7 +18,14 @@
                         <Insets right="5.0" />
                      </HBox.margin>
                   </TextField>
-                  <Button id="openFileButton" mnemonicParsing="false" prefHeight="26.0" prefWidth="127.0" text="Open file" />
+                  <Button id="openFileButton" mnemonicParsing="false" prefHeight="26.0" prefWidth="127.0" text="Open file">
+                     <graphic>
+                        <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@images/quickopen-file.png" />
+                           </image>
+                        </ImageView>
+                     </graphic></Button>
                </children>
             </HBox>
          </content>
@@ -29,7 +37,14 @@
         <content>
           <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="0.0" prefWidth="498.0">
                <children>
-                  <Button id="openFileNew" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="473.0" text="Create new file" AnchorPane.bottomAnchor="1.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="1.0" />
+                  <Button id="openFileNew" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" prefWidth="473.0" text="Create new file" AnchorPane.bottomAnchor="1.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="1.0">
+                     <graphic>
+                        <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                           <image>
+                              <Image url="@images/document-new.png" />
+                           </image>
+                        </ImageView>
+                     </graphic></Button>
                </children></AnchorPane>
         </content>
          <font>
diff --git a/src/de/t_battermann/dhbw/todolist/password.png b/src/de/t_battermann/dhbw/todolist/password.png
deleted file mode 100644
index b018bd6..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/password.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/password.svg b/src/de/t_battermann/dhbw/todolist/password.svg
deleted file mode 100644
index 0388bd6..0000000
--- a/src/de/t_battermann/dhbw/todolist/password.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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
deleted file mode 100644
index 697ce2d..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/remove.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/remove.svg b/src/de/t_battermann/dhbw/todolist/remove.svg
deleted file mode 100644
index 7f5cd8d..0000000
--- a/src/de/t_battermann/dhbw/todolist/remove.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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
deleted file mode 100644
index e63b80a..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/rename.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/rename.svg b/src/de/t_battermann/dhbw/todolist/rename.svg
deleted file mode 100644
index a5d4098..0000000
--- a/src/de/t_battermann/dhbw/todolist/rename.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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
deleted file mode 100644
index fc52d2b..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/save.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/save.svg b/src/de/t_battermann/dhbw/todolist/save.svg
deleted file mode 100644
index cca9d3a..0000000
--- a/src/de/t_battermann/dhbw/todolist/save.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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/saveAs.fxml b/src/de/t_battermann/dhbw/todolist/saveAs.fxml
index b4756d7..13f8e66 100644
--- a/src/de/t_battermann/dhbw/todolist/saveAs.fxml
+++ b/src/de/t_battermann/dhbw/todolist/saveAs.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.image.*?>
 <?import javafx.scene.text.*?>
 <?import javafx.geometry.*?>
 <?import java.lang.*?>
@@ -10,12 +11,19 @@
    <content>
       <HBox>
          <children>
-            <TextField id="filename">
+            <TextField id="filename" minWidth="250.0">
                <HBox.margin>
                   <Insets right="5.0" />
                </HBox.margin>
             </TextField>
-            <Button id="save" mnemonicParsing="false" text="Save" />
+            <Button id="save" mnemonicParsing="false" text="Save">
+               <graphic>
+                  <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@images/document-save.png" />
+                     </image>
+                  </ImageView>
+               </graphic></Button>
          </children>
       </HBox>
    </content>
diff --git a/src/de/t_battermann/dhbw/todolist/star.png b/src/de/t_battermann/dhbw/todolist/star.png
deleted file mode 100644
index 65c0a06..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/star.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/star.svg b/src/de/t_battermann/dhbw/todolist/star.svg
deleted file mode 100644
index cb276a0..0000000
--- a/src/de/t_battermann/dhbw/todolist/star.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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 24.999999 25"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="star.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="16.641834"
-     inkscape:cy="11.831311"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1918"
-     inkscape:window-height="1059"
-     inkscape:window-x="1920"
-     inkscape:window-y="0"
-     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></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1027.3622)">
-    <path
-       sodipodi:type="star"
-       style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4144"
-       sodipodi:sides="5"
-       sodipodi:cx="13.031249"
-       sodipodi:cy="1040.5498"
-       sodipodi:r1="12.620435"
-       sodipodi:r2="6.3102179"
-       sodipodi:arg1="1.0471976"
-       sodipodi:arg2="1.6755161"
-       inkscape:flatsided="false"
-       inkscape:rounded="0.01"
-       inkscape:randomized="0"
-       d="m 19.341466,1051.4794 c -0.07258,0.042 -6.886466,-4.6452 -6.969814,-4.6539 -0.08335,-0.01 -7.7228411,3.1592 -7.7851226,3.1031 -0.062281,-0.056 2.2898198,-7.9849 2.2723952,-8.0668 -0.017425,-0.082 -5.3911039,-6.3686 -5.3570162,-6.4452 0.034088,-0.077 8.301652,-0.2897 8.3742318,-0.3316 0.07258,-0.042 4.3909548,-7.0953 4.4743038,-7.0865 0.08335,0.01 2.840884,7.8058 2.903165,7.8619 0.06228,0.056 8.104864,1.9835 8.122288,2.0655 0.01743,0.082 -6.545889,5.1139 -6.579977,5.1905 -0.03409,0.077 0.618126,8.3211 0.545546,8.363 z"
-       inkscape:transform-center-x="0.0011682984"
-       inkscape:transform-center-y="-1.2072066"
-       transform="matrix(0.95551017,-0.10514038,0.10073185,0.99732812,-104.78737,4.719669)" />
-  </g>
-</svg>
diff --git a/src/de/t_battermann/dhbw/todolist/toggle-done.png b/src/de/t_battermann/dhbw/todolist/toggle-done.png
deleted file mode 100644
index ec62f74..0000000
Binary files a/src/de/t_battermann/dhbw/todolist/toggle-done.png and /dev/null differ
diff --git a/src/de/t_battermann/dhbw/todolist/toggle-done.svg b/src/de/t_battermann/dhbw/todolist/toggle-done.svg
deleted file mode 100644
index 4a27b0d..0000000
--- a/src/de/t_battermann/dhbw/todolist/toggle-done.svg
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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>