diff --git a/app/src/main/res/drawable/ic_av_timer_white_24dp.xml b/app/src/main/res/drawable/ic_av_timer_white_24dp.xml
deleted file mode 100644
index 36f3f9f6d..000000000
--- a/app/src/main/res/drawable/ic_av_timer_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M11,17c0,0.55 0.45,1 1,1s1,-0.45 1,-1 -0.45,-1 -1,-1 -1,0.45 -1,1zM11,3v4h2L13,5.08c3.39,0.49 6,3.39 6,6.92 0,3.87 -3.13,7 -7,7s-7,-3.13 -7,-7c0,-1.68 0.59,-3.22 1.58,-4.42L12,13l1.41,-1.41 -6.8,-6.8v0.02C4.42,6.45 3,9.05 3,12c0,4.97 4.02,9 9,9 4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9h-1zM18,12c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1 0.45,1 1,1 1,-0.45 1,-1zM6,12c0,0.55 0.45,1 1,1s1,-0.45 1,-1 -0.45,-1 -1,-1 -1,0.45 -1,1z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_otp_white_24dp.xml b/app/src/main/res/drawable/ic_otp_white_24dp.xml
new file mode 100644
index 000000000..5f82090f0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_otp_white_24dp.xml
@@ -0,0 +1,74 @@
+<?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">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M9.19922,3.13867 L9.19922,4.73828 L9.19922,6.33984 L10.8008,6.33984
+L10.8008,4.79297 C13.6944,5.15457,15.9841,7.44622,16.3457,10.3398
+L14.8008,10.3398 L14.8008,11.9395 L16.3438,11.9395
+C16.2972,12.3042,16.211,12.6543,16.1074,12.998 L17.7559,12.998
+C17.9,12.399,18,11.7819,18,11.1387 C18,6.72041,14.4183,3.13867,10,3.13867
+L9.19922,3.13867 Z M4.7207,5.17383 L4.59766,5.25
+C4.30768,5.51569,4.03687,5.80202,3.78906,6.10742
+C3.74408,6.16236,3.76404,6.13658,3.75391,6.14844
+C2.62072,7.56491,2.00133,9.32361,2,11.1387
+C2,11.4166,2.02145,11.6889,2.05078,11.959
+C2.06909,12.128,2.09815,12.2932,2.12695,12.459
+C2.15024,12.5993,2.17255,12.7392,2.20313,12.877
+C2.21201,12.9175,2.21732,12.9597,2.22656,13 L2.23633,13
+C2.42308,13.7827,2.72966,14.5165,3.12695,15.1914
+C3.30082,14.5824,3.66062,14.0532,4.14453,13.666
+C4.05066,13.4483,3.95825,13.2294,3.88867,13 L3.89063,13
+C3.88529,12.9838,3.88033,12.9674,3.875,12.9512
+C3.77847,12.6238,3.7054,12.2864,3.66211,11.9395 L5.19727,11.9395
+L5.20703,11.9395 L5.20703,10.3398 L5.19727,10.3398 L3.66406,10.3398
+C3.69055,10.1356,3.73432,9.93472,3.7793,9.73438
+C3.81343,9.59208,3.85116,9.45203,3.89258,9.3125
+C4.09265,8.63652,4.39089,7.99073,4.80859,7.41211 L9.10156,11.7051
+C9.41495,12.0185,9.91902,12.0185,10.2324,11.7051
+C10.5458,11.3917,10.5458,10.8876,10.2324,10.5742 L5.14258,5.48242
+C5.02985,5.36975,4.72451,5.175,4.72266,5.17383 L4.7207,5.17383 Z M6,14
+C4.892,14,4,14.892,4,16 L4,19 C4,20.108,4.892,21,6,21 L21,21
+C22.108,21,23,20.108,23,19 L23,16 C23,14.892,22.108,14,21,14 L6,14 Z M7.5,15
+C7.777,15,8,15.2787,8,15.625 L8,16.293 L8.47266,15.8203
+C8.71749,15.5755,9.07172,15.5366,9.26758,15.7324
+C9.46352,15.9283,9.42449,16.2825,9.17969,16.5273 L8.70703,17 L9.375,17
+C9.72124,17,10,17.223,10,17.5 C10,17.777,9.72124,18,9.375,18 L8.70703,18
+L9.17969,18.4727 C9.42449,18.7175,9.46367,19.0717,9.26758,19.2676
+C9.07172,19.4634,8.71749,19.4245,8.47266,19.1797 L8,18.707 L8,19.375
+C8,19.7212,7.777,20,7.5,20 C7.223,20,7,19.7212,7,19.375 L7,18.707
+L6.52734,19.1797 C6.28251,19.4245,5.92828,19.4634,5.73242,19.2676
+C5.53649,19.0717,5.57551,18.7175,5.82031,18.4727 L6.29297,18 L5.625,18
+C5.27876,18,5,17.777,5,17.5 C5,17.223,5.27876,17,5.625,17 L6.29297,17
+L5.82031,16.5273 C5.57551,16.2825,5.53633,15.9283,5.73242,15.7324
+C5.92828,15.5366,6.28251,15.5755,6.52734,15.8203 L7,16.293 L7,15.625
+C7,15.2787,7.223,15,7.5,15 Z M13.5,15 C13.777,15,14,15.2787,14,15.625 L14,16.293
+L14.4727,15.8203 C14.7175,15.5755,15.0717,15.5366,15.2676,15.7324
+C15.4635,15.9283,15.4245,16.2825,15.1797,16.5273 L14.707,17 L15.375,17
+C15.7212,17,16,17.223,16,17.5 C16,17.777,15.7212,18,15.375,18 L14.707,18
+L15.1797,18.4727 C15.4245,18.7175,15.4637,19.0717,15.2676,19.2676
+C15.0717,19.4634,14.7175,19.4245,14.4727,19.1797 L14,18.707 L14,19.375
+C14,19.7212,13.777,20,13.5,20 C13.223,20,13,19.7212,13,19.375 L13,18.707
+L12.5273,19.1797 C12.2825,19.4245,11.9283,19.4634,11.7324,19.2676
+C11.5365,19.0717,11.5755,18.7175,11.8203,18.4727 L12.293,18 L11.625,18
+C11.2788,18,11,17.777,11,17.5 C11,17.223,11.2788,17,11.625,17 L12.293,17
+L11.8203,16.5273 C11.5755,16.2825,11.5363,15.9283,11.7324,15.7324
+C11.9283,15.5366,12.2825,15.5755,12.5273,15.8203 L13,16.293 L13,15.625
+C13,15.2787,13.223,15,13.5,15 Z M19.5,15 C19.777,15,20,15.2787,20,15.625
+L20,16.293 L20.4727,15.8203 C20.7175,15.5755,21.0717,15.5366,21.2676,15.7324
+C21.4635,15.9283,21.4245,16.2825,21.1797,16.5273 L20.707,17 L21.375,17
+C21.7212,17,22,17.223,22,17.5 C22,17.777,21.7212,18,21.375,18 L20.707,18
+L21.1797,18.4727 C21.4245,18.7175,21.4637,19.0717,21.2676,19.2676
+C21.0717,19.4634,20.7175,19.4245,20.4727,19.1797 L20,18.707 L20,19.375
+C20,19.7212,19.777,20,19.5,20 C19.223,20,19,19.7212,19,19.375 L19,18.707
+L18.5273,19.1797 C18.2825,19.4245,17.9283,19.4634,17.7324,19.2676
+C17.5365,19.0717,17.5755,18.7175,17.8203,18.4727 L18.293,18 L17.625,18
+C17.2788,18,17,17.777,17,17.5 C17,17.223,17.2788,17,17.625,17 L18.293,17
+L17.8203,16.5273 C17.5755,16.2825,17.5363,15.9283,17.7324,15.7324
+C17.9283,15.5366,18.2825,15.5755,18.5273,15.8203 L19,16.293 L19,15.625
+C19,15.2787,19.223,15,19.5,15 Z" />
+</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 d22f6d342..4935468c9 100644
--- a/app/src/main/res/menu/entry_edit.xml
+++ b/app/src/main/res/menu/entry_edit.xml
@@ -34,7 +34,7 @@
         app:showAsAction="always" />
         -->
     <item android:id="@+id/menu_add_otp"
-        android:icon="@drawable/ic_av_timer_white_24dp"
+        android:icon="@drawable/ic_otp_white_24dp"
         android:title="@string/entry_setup_otp"
         android:orderInCategory="94"
         app:showAsAction="always" />
diff --git a/art/ic_otp.svg b/art/ic_otp.svg
new file mode 100644
index 000000000..97803358d
--- /dev/null
+++ b/art/ic_otp.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_otp.svg">
+  <defs
+     id="defs4832" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#acacac"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="15.382369"
+     inkscape:cy="8.3340159"
+     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)">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.19999099;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 9.1992188 3.1386719 L 9.1992188 4.7382812 L 9.1992188 6.3398438 L 10.800781 6.3398438 L 10.800781 4.7929688 C 13.694435 5.1545669 15.984121 7.4462151 16.345703 10.339844 L 14.800781 10.339844 L 14.800781 11.939453 L 16.34375 11.939453 C 16.297172 12.304226 16.21096 12.654335 16.107422 12.998047 L 17.755859 12.998047 C 17.900037 12.399016 18 11.781868 18 11.138672 C 18 6.7204051 14.418276 3.1386719 10 3.1386719 L 9.1992188 3.1386719 z M 4.7207031 5.1738281 L 4.5976562 5.25 C 4.307683 5.5156924 4.0368669 5.8020174 3.7890625 6.1074219 C 3.7440847 6.1623552 3.7640396 6.1365797 3.7539062 6.1484375 C 2.6207152 7.5649051 2.0013333 9.3236069 2 11.138672 C 2 11.416633 2.021448 11.688929 2.0507812 11.958984 C 2.0690924 12.128033 2.0981531 12.293221 2.1269531 12.458984 C 2.150242 12.599287 2.1725472 12.739214 2.203125 12.876953 C 2.2120139 12.917451 2.2173181 12.959733 2.2265625 13 L 2.2363281 13 C 2.4230837 13.78274 2.7296553 14.516492 3.1269531 15.191406 C 3.3008198 14.582357 3.6606202 14.05321 4.1445312 13.666016 C 4.0506647 13.448345 3.9582541 13.229399 3.8886719 13 L 3.890625 13 C 3.8852917 12.983822 3.8803333 12.96735 3.875 12.951172 C 3.7784667 12.623847 3.7053983 12.286372 3.6621094 11.939453 L 5.1972656 11.939453 L 5.2070312 11.939453 L 5.2070312 10.339844 L 5.1972656 10.339844 L 3.6640625 10.339844 C 3.6905514 10.135565 3.7343191 9.9347199 3.7792969 9.734375 C 3.8134302 9.5920817 3.8511559 9.4520253 3.8925781 9.3125 C 4.0926492 8.6365213 4.3908871 7.990728 4.8085938 7.4121094 L 9.1015625 11.705078 C 9.4149492 12.018468 9.9190173 12.018468 10.232422 11.705078 C 10.545809 11.391688 10.545809 10.887609 10.232422 10.574219 L 5.1425781 5.4824219 C 5.0298525 5.3697494 4.7245088 5.1750018 4.7226562 5.1738281 L 4.7207031 5.1738281 z M 6 14 C 4.892 14 4 14.892 4 16 L 4 19 C 4 20.108 4.892 21 6 21 L 21 21 C 22.108 21 23 20.108 23 19 L 23 16 C 23 14.892 22.108 14 21 14 L 6 14 z M 7.5 15 C 7.7769956 15 8 15.278749 8 15.625 L 8 16.292969 L 8.4726562 15.820312 C 8.7174918 15.575483 9.0717203 15.536564 9.2675781 15.732422 C 9.4635248 15.92829 9.4244875 16.282508 9.1796875 16.527344 L 8.7070312 17 L 9.375 17 C 9.72124 17 10 17.223001 10 17.5 C 10 17.777001 9.72124 18 9.375 18 L 8.7070312 18 L 9.1796875 18.472656 C 9.4244875 18.717492 9.463667 19.071711 9.2675781 19.267578 C 9.0717203 19.463443 8.7174918 19.424522 8.4726562 19.179688 L 8 18.707031 L 8 19.375 C 8 19.721249 7.7769956 20 7.5 20 C 7.2230044 20 7 19.721249 7 19.375 L 7 18.707031 L 6.5273438 19.179688 C 6.2825082 19.424519 5.9282797 19.463439 5.7324219 19.267578 C 5.536493 19.071711 5.5755125 18.717492 5.8203125 18.472656 L 6.2929688 18 L 5.625 18 C 5.27876 18 5 17.777001 5 17.5 C 5 17.223001 5.27876 17 5.625 17 L 6.2929688 17 L 5.8203125 16.527344 C 5.5755125 16.282508 5.536333 15.92829 5.7324219 15.732422 C 5.9282797 15.536557 6.2825082 15.575478 6.5273438 15.820312 L 7 16.292969 L 7 15.625 C 7 15.278749 7.2230044 15 7.5 15 z M 13.5 15 C 13.776996 15 14 15.278749 14 15.625 L 14 16.292969 L 14.472656 15.820312 C 14.717492 15.575483 15.07172 15.536564 15.267578 15.732422 C 15.463525 15.92829 15.424487 16.282508 15.179688 16.527344 L 14.707031 17 L 15.375 17 C 15.72124 17 16 17.223001 16 17.5 C 16 17.777001 15.72124 18 15.375 18 L 14.707031 18 L 15.179688 18.472656 C 15.424487 18.717492 15.463667 19.071711 15.267578 19.267578 C 15.07172 19.463443 14.717492 19.424522 14.472656 19.179688 L 14 18.707031 L 14 19.375 C 14 19.721249 13.776996 20 13.5 20 C 13.223004 20 13 19.721249 13 19.375 L 13 18.707031 L 12.527344 19.179688 C 12.282508 19.424519 11.92828 19.463439 11.732422 19.267578 C 11.536493 19.071711 11.575513 18.717492 11.820312 18.472656 L 12.292969 18 L 11.625 18 C 11.27876 18 11 17.777001 11 17.5 C 11 17.223001 11.27876 17 11.625 17 L 12.292969 17 L 11.820312 16.527344 C 11.575513 16.282508 11.536333 15.92829 11.732422 15.732422 C 11.92828 15.536557 12.282508 15.575478 12.527344 15.820312 L 13 16.292969 L 13 15.625 C 13 15.278749 13.223004 15 13.5 15 z M 19.5 15 C 19.776996 15 20 15.278749 20 15.625 L 20 16.292969 L 20.472656 15.820312 C 20.717492 15.575483 21.07172 15.536564 21.267578 15.732422 C 21.463525 15.92829 21.424487 16.282508 21.179688 16.527344 L 20.707031 17 L 21.375 17 C 21.72124 17 22 17.223001 22 17.5 C 22 17.777001 21.72124 18 21.375 18 L 20.707031 18 L 21.179688 18.472656 C 21.424487 18.717492 21.463667 19.071711 21.267578 19.267578 C 21.07172 19.463443 20.717492 19.424522 20.472656 19.179688 L 20 18.707031 L 20 19.375 C 20 19.721249 19.776996 20 19.5 20 C 19.223004 20 19 19.721249 19 19.375 L 19 18.707031 L 18.527344 19.179688 C 18.282508 19.424519 17.92828 19.463439 17.732422 19.267578 C 17.536493 19.071711 17.575513 18.717492 17.820312 18.472656 L 18.292969 18 L 17.625 18 C 17.27876 18 17 17.777001 17 17.5 C 17 17.223001 17.27876 17 17.625 17 L 18.292969 17 L 17.820312 16.527344 C 17.575513 16.282508 17.536333 15.92829 17.732422 15.732422 C 17.92828 15.536557 18.282508 15.575478 18.527344 15.820312 L 19 16.292969 L 19 15.625 C 19 15.278749 19.223004 15 19.5 15 z "
+         transform="matrix(0.56249999,0,0,0.56249999,115.58498,22.498806)"
+         id="rect831" />
+      <g
+         id="Layer_1"
+         transform="matrix(-0.00397893,0,0,0.00397893,125.58386,23.674135)" />
+    </g>
+  </g>
+</svg>