diff --git a/artwork/ic_nlp_marker.svg b/artwork/ic_nlp_marker.svg
new file mode 100644
index 0000000..0866268
--- /dev/null
+++ b/artwork/ic_nlp_marker.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2013, microG Project Team
+  ~ SPDX-License-Identifier: CC-BY-SA-4.0
+  -->
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
+  <path d="M12 2a7 7 0 00-7 7h4.5A2.5 2.5 0 0112 6.5V2z" fill="#cddc39"/>
+  <path d="M12 2v4.5A2.5 2.5 0 0114.5 9H19a7 7 0 00-7-7z" fill="#009688"/>
+  <path d="M14.5 9a2.5 2.5 0 01-2.5 2.5V22s7-7.75 7-13h-4.5z" fill="#e91e63"/>
+  <path d="M5 9c0 5.25 7 13 7 13V11.5A2.5 2.5 0 019.5 9H5z" fill="#ff9800"/>
+</svg>
\ No newline at end of file
diff --git a/artwork/ic_nlp_settings.svg b/artwork/ic_nlp_settings.svg
new file mode 100644
index 0000000..6bb38b8
--- /dev/null
+++ b/artwork/ic_nlp_settings.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ~ SPDX-FileCopyrightText: 2013, microG Project Team
+  ~ SPDX-License-Identifier: CC-BY-SA-4.0
+  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256">
+  <defs>
+    <linearGradient id="a">
+      <stop offset="0" stop-color="#6a8592"/>
+      <stop offset="1" stop-color="#627f8d"/>
+    </linearGradient>
+    <linearGradient xlink:href="#a" id="b" x1="11.98" y1="2" x2="11.98" y2="21.91" gradientUnits="userSpaceOnUse" gradientTransform="scale(10.66667)"/>
+    <filter id="c" x="-.5" y="-.5" width="2" height="2" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="1" flood-color="#000" result="flood"/>
+      <feComposite in="flood" in2="SourceGraphic" operator="in" result="composite1"/>
+      <feGaussianBlur in="composite" stdDeviation="6" result="blur"/>
+      <feComponentTransfer>
+        <feFuncA type="linear" slope=".2"/>
+      </feComponentTransfer>
+      <feOffset dy="6" result="offset"/>
+      <feComposite in="SourceGraphic" in2="offset" result="composite2"/>
+    </filter>
+    <filter color-interpolation-filters="sRGB" id="d">
+      <feOffset dy="5" result="result11" in="SourceGraphic"/>
+      <feComposite operator="in" in="SourceGraphic" result="result6" in2="result11"/>
+      <feFlood flood-color="#FFF" flood-opacity=".2" result="result10"/>
+      <feBlend in="result6" result="result13" in2="result10"/>
+      <feComposite in2="SourceGraphic" operator="in" result="result2"/>
+      <feBlend result="result12" in2="SourceGraphic"/>
+      <feOffset result="result11" dy="-5" in="SourceGraphic"/>
+      <feComposite result="result6" in="result12" operator="in" in2="result11"/>
+      <feFlood result="result10" flood-opacity=".2" flood-color="#000"/>
+      <feBlend in2="result10" in="result6"/>
+      <feComposite result="result2" operator="in" in2="result12"/>
+      <feBlend in="result2" in2="result12" result="result12"/>
+    </filter>
+  </defs>
+  <path d="M207.25 138.45c.43-3.41.75-6.82.75-10.45 0-3.63-.32-7.04-.75-10.45l22.51-17.6a5.38 5.38 0 001.28-6.83l-21.33-36.9a5.36 5.36 0 00-6.51-2.35l-26.56 10.66a77.93 77.93 0 00-18.03-10.45l-4.05-28.27a5.2 5.2 0 00-5.23-4.48h-42.66a5.2 5.2 0 00-5.23 4.48l-4.05 28.27a81.95 81.95 0 00-18.03 10.45L52.8 53.87a5.2 5.2 0 00-6.5 2.34L24.95 93.12a5.26 5.26 0 001.28 6.83l22.5 17.6A84.6 84.6 0 0048 128c0 3.52.32 7.04.75 10.45l-22.51 17.6a5.38 5.38 0 00-1.28 6.83l21.33 36.9a5.36 5.36 0 006.51 2.35l26.56-10.66a77.93 77.93 0 0018.03 10.45l4.05 28.27a5.2 5.2 0 005.23 4.48h42.66a5.2 5.2 0 005.23-4.48l4.05-28.27a81.95 81.95 0 0018.03-10.45l26.56 10.66a5.2 5.2 0 006.5-2.34l21.34-36.91a5.38 5.38 0 00-1.28-6.83z" fill="url(#b)" filter="url(#c)"/>
+  <path d="M0 0h256v256H0z" fill="none"/>
+  <path d="M207.25 138.45c.43-3.41.75-6.82.75-10.45 0-3.63-.32-7.04-.75-10.45l22.51-17.6a5.38 5.38 0 001.28-6.83l-21.33-36.9a5.36 5.36 0 00-6.51-2.35l-26.56 10.66a77.93 77.93 0 00-18.03-10.45l-4.05-28.27a5.2 5.2 0 00-5.23-4.48h-42.66a5.2 5.2 0 00-5.23 4.48l-4.05 28.27a81.95 81.95 0 00-18.03 10.45L52.8 53.87a5.2 5.2 0 00-6.5 2.34L24.95 93.12a5.26 5.26 0 001.28 6.83l22.5 17.6A84.6 84.6 0 0048 128c0 3.52.32 7.04.75 10.45l-22.51 17.6a5.38 5.38 0 00-1.28 6.83l21.33 36.9a5.36 5.36 0 006.51 2.35l26.56-10.66a77.93 77.93 0 0018.03 10.45l4.05 28.27a5.2 5.2 0 005.23 4.48h42.66a5.2 5.2 0 005.23-4.48l4.05-28.27a81.95 81.95 0 0018.03-10.45l26.56 10.66a5.2 5.2 0 006.5-2.34l21.34-36.91a5.38 5.38 0 00-1.28-6.83z" fill="url(#b)" filter="url(#d)"/>
+  <path d="M152.13 87.81l-42.1 16.52 18.02 73.79 29.67 29.97.9-6.18a81.7 81.7 0 0018-10.44l26.57 10.66c2.45.96 5.25 0 6.53-2.35l19.94-34.5z" fill-opacity=".06"/>
+  <path d="M128 69.55a40.89 40.89 0 00-40.92 40.91c0 30.7 40.92 76 40.92 76s40.92-45.3 40.92-76A40.89 40.89 0 00128 69.55zm0 55.53a14.62 14.62 0 11.01-29.24 14.62 14.62 0 01-.01 29.24z" transform="matrix(.85383 0 0 .85383 18.71 18.71)" fill="#fff" filter="url(#c)"/>
+</svg>
\ No newline at end of file
diff --git a/ic_nlp_marker.svg b/ic_nlp_marker.svg
deleted file mode 100644
index 5322be9..0000000
--- a/ic_nlp_marker.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   version="1.1"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg4184"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="microg_map_marker_colored.svg">
-  <metadata
-     id="metadata4192">
-    <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>
-  <defs
-     id="defs4190" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     id="namedview4188"
-     showgrid="false"
-     inkscape:zoom="34.166667"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4184" />
-  <path
-     style="opacity:1;fill:#cddc39;fill-opacity:1;stroke:none;stroke-width:30;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 12 2 A 7 7 0 0 0 5 9 L 9.5 9 A 2.5 2.5 0 0 1 12 6.5 L 12 2 z "
-     id="rect4194" />
-  <path
-     style="opacity:1;fill:#009688;fill-opacity:1;stroke:none;stroke-width:30;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 12 2 L 12 6.5 A 2.5 2.5 0 0 1 14.5 9 L 19 9 A 7 7 0 0 0 12 2 z "
-     id="rect4756" />
-  <path
-     style="opacity:1;fill:#e91e63;fill-opacity:1;stroke:none;stroke-width:30;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 14.5 9 A 2.5 2.5 0 0 1 12 11.5 L 12 22 C 12 22 19 14.25 19 9 L 14.5 9 z "
-     id="rect4758" />
-  <path
-     style="opacity:1;fill:#ff9800;fill-opacity:1;stroke:none;stroke-width:30;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="M 5 9 C 5 14.25 12 22 12 22 L 12 11.5 A 2.5 2.5 0 0 1 9.5 9 L 5 9 z "
-     id="rect4760" />
-</svg>
diff --git a/ic_nlp_settings.svg b/ic_nlp_settings.svg
deleted file mode 100644
index cabec67..0000000
--- a/ic_nlp_settings.svg
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="256"
-   height="256"
-   viewBox="0 0 256 256"
-   id="svg3059"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="ic_nlp_settings.svg"
-   inkscape:export-filename="/home/marvin/Pictures/icons/nlp/ic_nlp_settings_72.png"
-   inkscape:export-xdpi="25.3125"
-   inkscape:export-ydpi="25.3125">
-  <metadata
-     id="metadata3069">
-    <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>
-  <defs
-     id="defs3067">
-    <linearGradient
-       id="linearGradient3847">
-      <stop
-         style="stop-color:#6a8592;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
-      <stop
-         id="stop3851"
-         offset="1"
-         style="stop-color:#627f8d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3847"
-       id="linearGradient3845"
-       x1="11.978406"
-       y1="2.0046263"
-       x2="11.978406"
-       y2="21.906435"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(10.666667,10.666667)" />
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Drop Shadow"
-       id="filter4067"
-       x="-0.5"
-       y="-0.5"
-       width="2"
-       height="2">
-      <feFlood
-         flood-opacity="1"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4069" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite4071" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="6"
-         result="blur"
-         id="feGaussianBlur4073" />
-      <feComponentTransfer
-         id="feComponentTransfer13">
-        <feFuncA
-           type="linear"
-           slope="0.2"
-           id="feFuncA15" />
-      </feComponentTransfer>
-      <feOffset
-         dx="0"
-         dy="6"
-         result="offset"
-         id="feOffset4075"
-         stdDeviation="8" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite4077" />
-    </filter>
-    <filter
-       inkscape:label="Edge Tint/Shade"
-       inkscape:menu="Shadows and Glows"
-       inkscape:menu-tooltip="Adds a colorizable drop shadow inside"
-       color-interpolation-filters="sRGB"
-       id="filter4119">
-      <feOffset
-         dx="0"
-         dy="5"
-         result="result11"
-         id="feOffset4123"
-         in="SourceGraphic" />
-      <feComposite
-         id="feComposite4151"
-         operator="in"
-         in="SourceGraphic"
-         result="result6"
-         in2="result11" />
-      <feFlood
-         id="feFlood4153"
-         flood-color="rgb(255,255,255)"
-         flood-opacity="0.20000000000000001"
-         result="result10" />
-      <feBlend
-         id="feBlend4157"
-         mode="normal"
-         in="result6"
-         result="result13"
-         in2="result10" />
-      <feComposite
-         id="feComposite4159"
-         in2="SourceGraphic"
-         operator="in"
-         result="result2" />
-      <feBlend
-         result="result12"
-         in2="SourceGraphic"
-         mode="normal"
-         id="feBlend4161"
-         blend="normal" />
-      <feOffset
-         id="feOffset4149"
-         result="result11"
-         dy="-5"
-         dx="0"
-         in="SourceGraphic" />
-      <feComposite
-         result="result6"
-         in="result12"
-         operator="in"
-         in2="result11"
-         id="feComposite4125" />
-      <feFlood
-         result="result10"
-         in="result6"
-         flood-opacity="0.20000000000000001"
-         flood-color="rgb(0,0,0)"
-         id="feFlood4127" />
-      <feBlend
-         mode="normal"
-         in2="result10"
-         id="feBlend4129"
-         in="result6" />
-      <feComposite
-         result="result2"
-         operator="in"
-         in2="result12"
-         id="feComposite4131" />
-      <feBlend
-         blend="normal"
-         id="feBlend4133"
-         in="result2"
-         mode="normal"
-         in2="result12"
-         result="result12" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1014"
-     id="namedview3065"
-     showgrid="false"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="5.0676199"
-     inkscape:cy="116.50473"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3059" />
-  <path
-     sodipodi:nodetypes="csccccccccssccccccccsccccccccsscccccccc"
-     inkscape:connector-curvature="0"
-     style="fill:url(#linearGradient3845);fill-opacity:1;filter:url(#filter4067)"
-     id="path3085"
-     d="M 207.25333,138.45333 C 207.68,135.04 208,131.62667 208,128 c 0,-3.62667 -0.32,-7.04 -0.74667,-10.45333 L 229.76,99.946667 c 2.02667,-1.6 2.56,-4.48 1.28,-6.826667 L 209.70667,56.213333 c -1.28,-2.346666 -4.16,-3.2 -6.50667,-2.346666 L 176.64,64.533333 C 171.09333,60.266667 165.12,56.746667 158.61333,54.08 L 154.56,25.813333 c -0.32,-2.56 -2.56,-4.48 -5.22667,-4.48 l -42.66666,0 c -2.66667,0 -4.90667,1.92 -5.22667,4.48 L 97.386667,54.08 C 90.88,56.746667 84.906667,60.373333 79.36,64.533333 L 52.8,53.866667 c -2.453333,-0.96 -5.226667,0 -6.506667,2.346666 L 24.96,93.12 c -1.386667,2.346667 -0.746667,5.226667 1.28,6.826667 L 48.746667,117.54667 C 48.32,120.96 48,124.48 48,128 c 0,3.52 0.32,7.04 0.746667,10.45333 l -22.506667,17.6 c -2.026667,1.6 -2.56,4.48 -1.28,6.82667 l 21.333333,36.90667 c 1.28,2.34666 4.16,3.2 6.506667,2.34666 l 26.56,-10.66666 c 5.546667,4.26666 11.52,7.78666 18.026667,10.45333 L 101.44,230.18667 c 0.32,2.56 2.56,4.48 5.22667,4.48 l 42.66666,0 c 2.66667,0 4.90667,-1.92 5.22667,-4.48 L 158.61333,201.92 c 6.50667,-2.66667 12.48,-6.29333 18.02667,-10.45333 l 26.56,10.66666 c 2.45333,0.96 5.22667,0 6.50667,-2.34666 L 231.04,162.88 c 1.28,-2.34667 0.74667,-5.22667 -1.28,-6.82667 z" />
-  <path
-     d="M 0,0 H 256 V 256 H 0 z"
-     id="path3061"
-     inkscape:connector-curvature="0"
-     style="fill:none" />
-  <path
-     d="M 207.25333,138.45333 C 207.68,135.04 208,131.62667 208,128 c 0,-3.62667 -0.32,-7.04 -0.74667,-10.45333 L 229.76,99.946667 c 2.02667,-1.6 2.56,-4.48 1.28,-6.826667 L 209.70667,56.213333 c -1.28,-2.346666 -4.16,-3.2 -6.50667,-2.346666 L 176.64,64.533333 C 171.09333,60.266667 165.12,56.746667 158.61333,54.08 L 154.56,25.813333 c -0.32,-2.56 -2.56,-4.48 -5.22667,-4.48 l -42.66666,0 c -2.66667,0 -4.90667,1.92 -5.22667,4.48 L 97.386667,54.08 C 90.88,56.746667 84.906667,60.373333 79.36,64.533333 L 52.8,53.866667 c -2.453333,-0.96 -5.226667,0 -6.506667,2.346666 L 24.96,93.12 c -1.386667,2.346667 -0.746667,5.226667 1.28,6.826667 L 48.746667,117.54667 C 48.32,120.96 48,124.48 48,128 c 0,3.52 0.32,7.04 0.746667,10.45333 l -22.506667,17.6 c -2.026667,1.6 -2.56,4.48 -1.28,6.82667 l 21.333333,36.90667 c 1.28,2.34666 4.16,3.2 6.506667,2.34666 l 26.56,-10.66666 c 5.546667,4.26666 11.52,7.78666 18.026667,10.45333 L 101.44,230.18667 c 0.32,2.56 2.56,4.48 5.22667,4.48 l 42.66666,0 c 2.66667,0 4.90667,-1.92 5.22667,-4.48 L 158.61333,201.92 c 6.50667,-2.66667 12.48,-6.29333 18.02667,-10.45333 l 26.56,10.66666 c 2.45333,0.96 5.22667,0 6.50667,-2.34666 L 231.04,162.88 c 1.28,-2.34667 0.74667,-5.22667 -1.28,-6.82667 z"
-     id="path3063"
-     style="fill:url(#linearGradient3845);fill-opacity:1;filter:url(#filter4119)"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="csccccccccssccccccccsccccccccsscccccccc" />
-  <path
-     style="fill:#000000;fill-opacity:0.0627451"
-     d="m 152.125,87.8125 -42.08969,16.5136 18.01439,73.78924 29.66905,29.97841 0.90625,-6.1875 c 6.50667,-2.66667 12.45333,-6.2775 18,-10.4375 l 26.5625,10.65625 c 2.45333,0.96 5.25125,0.003 6.53125,-2.34375 l 19.9375,-34.5 z"
-     id="rect4273"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccccc" />
-  <path
-     inkscape:connector-curvature="0"
-     d="m 128,69.546667 c -22.62142,0 -40.917299,18.295893 -40.917299,40.917333 0,30.688 40.917299,75.98923 40.917299,75.98923 0,0 40.9173,-45.30123 40.9173,-75.98923 0,-22.62144 -18.29588,-40.917333 -40.9173,-40.917333 z m 0,55.530663 c -8.06655,0 -14.61332,-6.54677 -14.61332,-14.61333 0,-8.06656 6.54677,-14.613333 14.61332,-14.613333 8.06655,0 14.61332,6.546773 14.61332,14.613333 0,8.06656 -6.54677,14.61333 -14.61332,14.61333 z"
-     id="path3049"
-     style="fill:#ffffff;fill-opacity:1;filter:url(#filter4067)"
-     transform="matrix(0.85382845,0,0,0.85382845,18.709959,18.709951)" />
-</svg>