diff --git a/art/md_switch_thumb_disable.svg b/art/md_switch_thumb_disable.svg
deleted file mode 100644
index efd83c2d00ba30b32a4c4927d64e05162734e793..0000000000000000000000000000000000000000
--- a/art/md_switch_thumb_disable.svg
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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"
-   sodipodi:docname="md_switch_thumb_disable_centered_square.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <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="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="10.572032"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <g
-       id="g6404">
-      <circle
-         style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)"
-         id="circle4234"
-         cx="59.999996"
-         cy="66.499878"
-         r="26.444" />
-      <g
-         transform="translate(3.3103058e-6,0.33229253)"
-         id="g4148">
-        <circle
-           style="opacity:1;fill:#bdbdbd;fill-opacity:1;stroke:#bdbdbd;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path4218"
-           cx="59.999996"
-           cy="62.167587"
-           r="25.916904" />
-        <circle
-           r="25.916904"
-           cy="183.07845"
-           cx="-74.490921"
-           id="circle4220"
-           style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-           transform="matrix(0,-1,1,0,-123.07845,-12.323334)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/art/md_switch_thumb_off_normal.svg b/art/md_switch_thumb_off_normal.svg
deleted file mode 100644
index 25d1761db7e28bcfb8d87e0d261d750e7ec9f91a..0000000000000000000000000000000000000000
--- a/art/md_switch_thumb_off_normal.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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"
-   sodipodi:docname="md_switch_thumb_off_normal_centered.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <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="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="10.052965"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       r="26.444"
-       cy="66.5"
-       cx="59.999996"
-       id="circle4234"
-       style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)" />
-    <g
-       id="g6390"
-       transform="translate(3.3103058e-6,-0.91758577)">
-      <circle
-         r="25.916904"
-         cy="63.417587"
-         cx="59.999996"
-         id="path4218"
-         style="opacity:1;fill:#fafafa;fill-opacity:1;stroke:#fafafa;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         transform="matrix(0,-1,1,0,-123.07845,-11.073334)"
-         style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-         id="circle4220"
-         cx="-74.490921"
-         cy="183.07845"
-         r="25.916904" />
-    </g>
-  </g>
-</svg>
diff --git a/art/md_switch_thumb_off_pressed.svg b/art/md_switch_thumb_off_pressed.svg
deleted file mode 100644
index 002b478156548d6185dc3f097548248ad4ed592e..0000000000000000000000000000000000000000
--- a/art/md_switch_thumb_off_pressed.svg
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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"
-   sodipodi:docname="md_switch_thumb_off_pressed_centered.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <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="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="10.572032"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       style="opacity:1;fill:#313131;fill-opacity:0.10196078;fill-rule:nonzero;stroke:none;stroke-width:1.00100005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.10196078"
-       id="path4819"
-       cx="60"
-       cy="62.5"
-       r="60" />
-    <circle
-       r="26.444"
-       cy="66.5"
-       cx="59.999996"
-       id="circle4234"
-       style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)" />
-    <g
-       id="g6417"
-       transform="translate(3.3103058e-6,-0.91758577)">
-      <circle
-         r="25.916904"
-         cy="63.417587"
-         cx="59.999996"
-         id="path4218"
-         style="opacity:1;fill:#fafafa;fill-opacity:1;stroke:#fafafa;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         transform="matrix(0,-1,1,0,-123.07845,-11.073334)"
-         style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-         id="circle4220"
-         cx="-74.490921"
-         cy="183.07845"
-         r="25.916904" />
-    </g>
-  </g>
-</svg>
diff --git a/art/md_switch_thumb_on_normal.svg b/art/md_switch_thumb_on_normal.svg
deleted file mode 100644
index 5e8f90f39a2101c26d8fa945bf34df8c2876a019..0000000000000000000000000000000000000000
--- a/art/md_switch_thumb_on_normal.svg
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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"
-   sodipodi:docname="md_switch_thumb_on_normal_centered_square.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <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="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="-14.397519"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       r="26.444"
-       cy="66.499878"
-       cx="59.999996"
-       id="circle4234"
-       style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)" />
-    <g
-       id="g6440"
-       transform="translate(3.3103058e-6,0.33241423)">
-      <circle
-         r="25.916904"
-         cy="62.167587"
-         cx="59.999996"
-         id="path4218"
-         style="opacity:1;fill:#0091ea;fill-opacity:1;stroke:#0091ea;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         transform="matrix(0,-1,1,0,-123.07845,-12.323334)"
-         style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-         id="circle4220"
-         cx="-74.490921"
-         cy="183.07845"
-         r="25.916904" />
-    </g>
-  </g>
-</svg>
diff --git a/art/md_switch_thumb_on_pressed.svg b/art/md_switch_thumb_on_pressed.svg
deleted file mode 100644
index e0331e7b77d6003d1a7c0215a10052822e895506..0000000000000000000000000000000000000000
--- a/art/md_switch_thumb_on_pressed.svg
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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"
-   sodipodi:docname="md_switch_thumb_on_pressed_centered_square.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <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>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="-46.31369"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       style="opacity:1;fill:#0093e8;fill-opacity:0.10196078;fill-rule:nonzero;stroke:none;stroke-width:1.00100005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.10196078"
-       id="path4819"
-       cx="60"
-       cy="62.5"
-       r="60" />
-    <g
-       id="g4156">
-      <circle
-         style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)"
-         id="circle4234"
-         cx="59.999996"
-         cy="66.5"
-         r="26.444" />
-      <g
-         transform="translate(3.3103058e-6,0.33241423)"
-         id="g4149">
-        <circle
-           style="opacity:1;fill:#0091ea;fill-opacity:1;stroke:#0091ea;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path4218"
-           cx="59.999996"
-           cy="62.167587"
-           r="25.916904" />
-        <circle
-           r="25.916904"
-           cy="183.07845"
-           cx="-74.490921"
-           id="circle4220"
-           style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-           transform="matrix(0,-1,1,0,-123.07845,-12.323334)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/art/render.rb b/art/render.rb
index 1e36bba90dd68b864cc663bddc59470283df159d..3ef6ea4c7439565c54e2a2541315225693d246b9 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -57,11 +57,6 @@ images = {
 	'ic_notifications_paused_white80.svg' => ['ic_notifications_paused_white80', 24],
 	'ic_notifications_white80.svg' => ['ic_notifications_white80', 24],
 	'ic_verified_fingerprint.svg' => ['ic_verified_fingerprint', 36],
-	'md_switch_thumb_disable.svg' => ['switch_thumb_disable', 48],
-	'md_switch_thumb_off_normal.svg' => ['switch_thumb_off_normal', 48],
-	'md_switch_thumb_off_pressed.svg' => ['switch_thumb_off_pressed', 48],
-	'md_switch_thumb_on_normal.svg' => ['switch_thumb_on_normal', 48],
-	'md_switch_thumb_on_pressed.svg' => ['switch_thumb_on_pressed', 48],
 	'message_bubble_received.svg' => ['message_bubble_received.9', 0],
 	'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0],
 	'message_bubble_received_dark.svg' => ['message_bubble_received_dark.9', 0],
diff --git a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
index fb59257ca42cc146a617af306b9766ec9d1d05f4..0d8b69ee6e77042864b5f29e2666c3cf01f23cef 100644
--- a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
@@ -9,6 +9,7 @@ import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.CompoundButton;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -130,6 +131,7 @@ public abstract class OmemoActivity extends XmppActivity {
         View view = getLayoutInflater().inflate(R.layout.contact_key, keys, false);
         TextView key = view.findViewById(R.id.key);
         TextView keyType =  view.findViewById(R.id.key_type);
+        ImageButton enableUndecided = view.findViewById(R.id.button_enable_device);
         if (Config.X509_VERIFICATION && status.getTrust() == FingerprintStatus.Trust.VERIFIED_X509) {
             key.setOnClickListener(v -> showX509Certificate(account,fingerprint));
             keyType.setOnClickListener(v -> showX509Certificate(account,fingerprint));
@@ -159,12 +161,13 @@ public abstract class OmemoActivity extends XmppActivity {
                 trustToggle.setVisibility(View.VISIBLE);
                 trustToggle.setOnCheckedChangeListener(onCheckedChangeListener);
                 if (status.getTrust() == FingerprintStatus.Trust.UNDECIDED && undecidedNeedEnablement) {
-                    trustToggle.setOnClickListener(v -> {
+                    enableUndecided.setVisibility(View.VISIBLE);
+                    enableUndecided.setOnClickListener(v -> {
                         account.getAxolotlService().setFingerprintTrust(fingerprint,FingerprintStatus.createActive(false));
-                        v.setEnabled(true);
-                        v.setOnClickListener(null);
+                        enableUndecided.setVisibility(View.GONE);
+                        trustToggle.setVisibility(View.VISIBLE);
                     });
-                    trustToggle.setEnabled(false);
+                    trustToggle.setVisibility(View.GONE);
                 } else {
                     trustToggle.setOnClickListener(null);
                     trustToggle.setEnabled(true);
diff --git a/src/main/res/drawable-hdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-hdpi/ic_new_releases_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..db0b316314e32c8220e43cf079700188adfabc37
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_new_releases_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png b/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a52eb94674725cc41d7ef366810981c49c191a71
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-mdpi/ic_new_releases_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8f4f111e89e52dbcccf6ff574df88683d31e87e
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_new_releases_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png b/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e7ba807fcf3587964ea5ba4658a6f3f8a173089
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-xhdpi/ic_new_releases_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..917b6cf4a54d826a6e9ca4736bfd3765d3269254
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_new_releases_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png b/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b863eba7cf6161ca848c4acc23bfc49855cbc0b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_new_releases_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..56c24d8d9a355f989328594317c0929d60a22d24
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_new_releases_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..25b278a55f1bf78ca6248ef7f4f7b83335125317
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_new_releases_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_new_releases_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec775ec68488a695f65a2244cfa15e4510947452
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_new_releases_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_new_releases_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_new_releases_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c039061f369682574b324ee1675b0f5dd3e560f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_new_releases_white_24dp.png differ
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index aeb866a9927dafeadb8f8eaaa4ebe7dadb1dc9cf..486b2563785271cafadf5e80e513a9fad08dbcdc 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -51,7 +51,7 @@
                         android:layout_centerVertical="true"
                         android:layout_toRightOf="@+id/your_photo"
                         android:orientation="vertical"
-                        android:paddingLeft="8dp">
+                        android:paddingLeft="@dimen/avatar_item_distance">
 
                         <TextView
                             android:id="@+id/muc_your_nick"
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index e999bc64fb0b151d782d8a693e4b1cd359a50c95..82c062bb75eb3efa7d3ccb4dbffcbdbe8aeb9b30 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -20,7 +20,7 @@
         android:layout_centerVertical="true"
         android:layout_toRightOf="@+id/contact_photo"
         android:orientation="vertical"
-        android:paddingLeft="16dp" >
+        android:paddingLeft="@dimen/avatar_item_distance" >
 
         <TextView
             android:id="@+id/contact_display_name"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 386b9057ab06e90077b0ec475b188226d41cd031..a194f9e180e6d5c377a3874a02c067035a658aef 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -48,36 +48,42 @@
             android:longClickable="true"/>
         <LinearLayout
             android:id="@+id/action_container"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/key_action_width"
+            android:layout_height="48dp"
             android:orientation="vertical"
             android:layout_alignParentRight="true"
+            android:gravity="center"
             android:layout_centerVertical="true">
             <ImageButton
-                android:layout_gravity="center_horizontal"
                 android:id="@+id/button_remove"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:alpha="?attr/icon_alpha"
-                android:background="?android:selectableItemBackground"
+                android:background="?attr/selectableItemBackgroundBorderless"
                 android:padding="@dimen/image_button_padding"
                 android:src="?attr/icon_remove"
                 android:visibility="gone" />
+            <ImageButton
+                android:id="@+id/button_enable_device"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:alpha="?attr/icon_alpha"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:padding="@dimen/image_button_padding"
+                android:src="?attr/icon_enable_undecided_device"
+                android:visibility="gone" />
 
             <ImageView
                 android:visibility="gone"
                 android:id="@+id/verified_fingerprint"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:padding="@dimen/image_button_padding"
                 android:src="@drawable/ic_verified_fingerprint" />
 
             <android.support.v7.widget.SwitchCompat
                 android:id="@+id/tgl_trust"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
                 android:visibility="gone" />
         </LinearLayout>
 
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 919bcc7a3ee0727c64a9efbf2336de859504cbba..87ea36f8de527f25a2abfc872707ca4820d7679c 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -61,6 +61,7 @@
     <attr name="icon_share" format="reference"/>
     <attr name="icon_import_export" format="reference"/>
     <attr name="icon_scan_qr_code" format="reference"/>
+    <attr name="icon_enable_undecided_device" format="reference"/>
 
     <attr name="icon_notifications" format="reference"/>
     <attr name="icon_notifications_off" format="reference"/>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 98161fcc1605224012a6ead117795840caf0bd02..5bd04d25ebfc0c100e88c2ef0e54b4924cf3e10c 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -6,7 +6,9 @@
 	<dimen name="card_padding_list">8dp</dimen> <!-- card_padding_regular minus list_padding -->
 	<dimen name="list_padding">8dp</dimen>
 	<dimen name="image_button_padding">12dp</dimen>
+	<dimen name="key_action_width">48dp</dimen>  <!-- icon width (24dp) + 2 * image button padding -->
 	<dimen name="fineprint_size">11sp</dimen>
 	<dimen name="audio_player_width">224dp</dimen>
 	<dimen name="swipe_handle_size">32dp</dimen>
+	<dimen name="avatar_item_distance">16dp</dimen>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index c374265ce3ff901717a1a5ff656bcf6083c94159..4cdf905b3f40a05b5a3f4b3a4c4dcd97f280848e 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -78,6 +78,7 @@
         <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_black_24dp</item>
         <item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_black_24dp</item>
         <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_black_24dp</item>
+        <item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_black_24dp</item>
     </style>
 
     <style name="ConversationsTheme.Dark" parent="Theme.AppCompat">
@@ -157,6 +158,7 @@
         <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_white_24dp</item>
         <item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_white_24dp</item>
         <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_white_24dp</item>
+        <item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_white_24dp</item>
     </style>
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">