diff --git a/app/src/main/res/drawable/ic_generate_password_white_24dp.xml b/app/src/main/res/drawable/ic_generate_password_white_24dp.xml
new file mode 100644
index 000000000..2894e0409
--- /dev/null
+++ b/app/src/main/res/drawable/ic_generate_password_white_24dp.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#ffffff"
+            android:pathData="M 7 2 L 7 7 L 12 7 L 10.238281 5.2382812 A 7.0000001 7.0000001 0 0 1 12 5 A
+7.0000001 7.0000001 0 0 1 18.701172 10 L 20.765625 10 A 9.0000001 9.0000001 0 0
+0 12 3 A 9.0000001 9.0000001 0 0 0 8.6640625 3.6640625 L 7 2 z M 8 8 A 4.0000001
+4.0000001 0 0 0 4 12 L 6 12 A 2 2 0 0 1 8 10 A 2 2 0 0 1 10 12 A 2 2 0 0 1 8 14
+L 8 16 A 4.0000001 4.0000001 0 0 0 11.869141 13 L 17 13 L 17 16 L 19 16 L 19 13
+L 21 13 L 21 11 L 11.867188 11 A 4.0000001 4.0000001 0 0 0 8 8 z M 3.234375 14 A
+9.0000001 9.0000001 0 0 0 12 21 A 9.0000001 9.0000001 0 0 0 15.335938 20.335938
+L 17 22 L 17 17 L 12 17 L 13.761719 18.761719 A 7.0000001 7.0000001 0 0 1 12 19
+A 7.0000001 7.0000001 0 0 1 5.2988281 14 L 3.234375 14 z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_new_field_white_24dp.xml b/app/src/main/res/drawable/ic_new_field_white_24dp.xml
new file mode 100644
index 000000000..fbbecc509
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new_field_white_24dp.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group>
+        <path
+            android:fillColor="#fffbfb"
+            android:pathData="M 18 3 L 18 6 L 15 6 L 15 8 L 18 8 L 18 11 L 20 11 L 20 8 L 23 8 L 23 6 L 20 6 L
+20 3 L 18 3 z M 4 6 C 2.8920005 6 2.0000002 6.8920005 2 8 L 2 18 C 1.9999998
+19.108 2.8920005 20 4 20 L 18 20 C 19.108 20 19.999999 19.108 20 18 L 20 13 L 18
+13 L 18 16.533203 C 17.999999 17.345736 17.345736 18 16.533203 18 L 5.4667969 18
+C 4.6542635 18 3.9999998 17.345736 4 16.533203 L 4 9.4667969 C 4.0000002
+8.6542635 4.6542635 8 5.4667969 8 L 13 8 L 13 6 L 4 6 z M 5 10 L 5 12 L 17 12 L
+17 10 L 5 10 z M 5 14 L 5 16 L 17 16 L 17 14 L 5 14 z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/menu/entry_edit.xml b/app/src/main/res/menu/entry_edit.xml
index f499cd314..68e046c90 100644
--- a/app/src/main/res/menu/entry_edit.xml
+++ b/app/src/main/res/menu/entry_edit.xml
@@ -20,12 +20,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_generate_password"
-        android:icon="@drawable/ic_key_white_24dp"
+        android:icon="@drawable/ic_generate_password_white_24dp"
         android:title="@string/entry_password_generator"
         android:orderInCategory="91"
         app:showAsAction="always" />
     <item android:id="@+id/menu_add_field"
-        android:icon="@drawable/ic_add_white_24dp"
+        android:icon="@drawable/ic_new_field_white_24dp"
         android:title="@string/entry_add_field"
         android:orderInCategory="92"
         app:showAsAction="always" />
diff --git a/art/ic_generate_password.svg b/art/ic_generate_password.svg
new file mode 100644
index 000000000..9d9cc7eda
--- /dev/null
+++ b/art/ic_generate_password.svg
@@ -0,0 +1,101 @@
+<?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="24"
+   height="24"
+   id="svg4830"
+   version="1.1"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:export-filename="/home/joker/Project/Scratcheck/TestExport.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="ic_generate_password.svg">
+  <defs
+     id="defs4832" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#acacac"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="22.661867"
+     inkscape:cy="6.4651667"
+     inkscape:current-layer="g4770"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="1920"
+     inkscape:window-y="74"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       position="0.99999471,22.999999"
+       orientation="22,0"
+       id="guide2987"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="0.99999471,0.99999888"
+       orientation="0,22"
+       id="guide2989"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="22.999995,0.99999888"
+       orientation="-22,0"
+       id="guide2991"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="22.999995,22.999999"
+       orientation="0,-22"
+       id="guide2993"
+       inkscape:locked="false" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid2989" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4835">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-8)">
+    <g
+       id="g4770"
+       transform="matrix(1.7777778,0,0,1.7777778,-205.48441,-31.997877)">
+      <g
+         id="Layer_1"
+         transform="matrix(-0.00397893,0,0,0.00397893,125.58386,23.674135)" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.25;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 120.08498,26.998806 a 2.25,2.25 0 0 0 -2.25,2.25 h 1.125 a 1.125,1.125 0 0 1 1.125,-1.125 1.125,1.125 0 0 1 1.125,1.125 1.125,1.125 0 0 1 -1.125,1.125 v 1.125 a 2.25,2.25 0 0 0 2.17639,-1.6875 h 2.88611 v 1.6875 h 1.125 v -1.6875 h 1.125 v -1.125 h -5.13721 a 2.25,2.25 0 0 0 -2.17529,-1.6875 z"
+         id="rect828"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 7 2 L 7 7 L 12 7 L 10.238281 5.2382812 A 7.0000001 7.0000001 0 0 1 12 5 A 7.0000001 7.0000001 0 0 1 18.701172 10 L 20.765625 10 A 9.0000001 9.0000001 0 0 0 12 3 A 9.0000001 9.0000001 0 0 0 8.6640625 3.6640625 L 7 2 z M 3.234375 14 A 9.0000001 9.0000001 0 0 0 12 21 A 9.0000001 9.0000001 0 0 0 15.335938 20.335938 L 17 22 L 17 17 L 12 17 L 13.761719 18.761719 A 7.0000001 7.0000001 0 0 1 12 19 A 7.0000001 7.0000001 0 0 1 5.2988281 14 L 3.234375 14 z "
+         transform="matrix(0.56249999,0,0,0.56249999,115.58498,22.498806)"
+         id="path852" />
+    </g>
+  </g>
+</svg>
diff --git a/art/ic_new_field.svg b/art/ic_new_field.svg
new file mode 100644
index 000000000..a4ec02592
--- /dev/null
+++ b/art/ic_new_field.svg
@@ -0,0 +1,96 @@
+<?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="24"
+   height="24"
+   id="svg4830"
+   version="1.1"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:export-filename="/home/joker/Project/Scratcheck/TestExport.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="ic_new_field.svg">
+  <defs
+     id="defs4832" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#acacac"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="5.9715813"
+     inkscape:cy="15.414365"
+     inkscape:current-layer="g4770"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="1920"
+     inkscape:window-y="74"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       position="0.99999471,22.999999"
+       orientation="22,0"
+       id="guide2987"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="0.99999471,0.99999888"
+       orientation="0,22"
+       id="guide2989"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="22.999995,0.99999888"
+       orientation="-22,0"
+       id="guide2991"
+       inkscape:locked="false" />
+    <sodipodi:guide
+       position="22.999995,22.999999"
+       orientation="0,-22"
+       id="guide2993"
+       inkscape:locked="false" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid2989" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4835">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,-8)">
+    <g
+       id="g4770"
+       transform="matrix(1.7777778,0,0,1.7777778,-205.48441,-31.997877)">
+      <g
+         id="Layer_1"
+         transform="matrix(-0.00397893,0,0,0.00397893,125.58386,23.674135)" />
+      <path
+         style="fill:#fffbfb;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 18 3 L 18 6 L 15 6 L 15 8 L 18 8 L 18 11 L 20 11 L 20 8 L 23 8 L 23 6 L 20 6 L 20 3 L 18 3 z M 4 6 C 2.8920005 6 2.0000002 6.8920005 2 8 L 2 18 C 1.9999998 19.108 2.8920005 20 4 20 L 18 20 C 19.108 20 19.999999 19.108 20 18 L 20 13 L 18 13 L 18 16.533203 C 17.999999 17.345736 17.345736 18 16.533203 18 L 5.4667969 18 C 4.6542635 18 3.9999998 17.345736 4 16.533203 L 4 9.4667969 C 4.0000002 8.6542635 4.6542635 8 5.4667969 8 L 13 8 L 13 6 L 4 6 z M 5 10 L 5 12 L 17 12 L 17 10 L 5 10 z M 5 14 L 5 16 L 17 16 L 17 14 L 5 14 z "
+         transform="matrix(0.56249999,0,0,0.56249999,115.58498,22.498806)"
+         id="rect899" />
+    </g>
+  </g>
+</svg>