From 64ee37e4409dbde80bd98fb8d3f65b0146b9cb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= <tomaz.vajngerl@collabora.co.uk>
Date: Thu, 4 Apr 2019 21:51:22 +0900
Subject: [PATCH] ios widget defs: update combobox, checkbox, spinbox SVGs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In addition remove spinbox pressed state (it wasn't useful) and
draw white filled empty rect for spinbox as we don't draw the
background automatically.

Change-Id: I892108c5839dc463cdb9e4f4f09276fc184f4944
Reviewed-on: https://gerrit.libreoffice.org/70258
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
---
 vcl/Package_theme_definitions.mk              |   2 -
 .../theme_definitions/ios/definition.xml      |  19 +-
 .../ios/spinbox-left-disabled.svg             |   2 +-
 .../ios/spinbox-left-pressed.svg              |   5 +-
 .../ios/spinbox-left-rollover.svg             |   4 -
 .../theme_definitions/ios/spinbox-left.svg    |   2 +-
 .../ios/spinbox-right-disabled.svg            |   4 +-
 .../ios/spinbox-right-pressed.svg             |   7 +-
 .../ios/spinbox-right-rollover.svg            |   5 -
 .../theme_definitions/ios/spinbox-right.svg   |   4 +-
 .../ios/switch-off-disabled.svg               | 192 ++---------------
 .../ios/switch-off-pressed.svg                | 170 ++-------------
 .../theme_definitions/ios/switch-off.svg      | 193 ++----------------
 .../ios/switch-on-disabled.svg                | 157 ++------------
 .../ios/switch-on-pressed.svg                 | 155 +-------------
 .../theme_definitions/ios/switch-on.svg       | 157 ++------------
 .../ios/tick-off-disabled.svg                 |  95 +--------
 .../ios/tick-off-pressed.svg                  | 135 +-----------
 .../theme_definitions/ios/tick-off.svg        | 124 ++---------
 .../ios/tick-on-disabled.svg                  | 134 +-----------
 .../theme_definitions/ios/tick-on-pressed.svg | 125 +-----------
 .../theme_definitions/ios/tick-on.svg         | 127 ++----------
 22 files changed, 153 insertions(+), 1665 deletions(-)
 delete mode 100644 vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svg
 delete mode 100644 vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svg

diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index dbb0a92fe268..395a90b19b6e 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -25,11 +25,9 @@ $(eval $(call gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_F
 	ios/tick-on-disabled.svg \
 	ios/spinbox-left.svg \
 	ios/spinbox-left-pressed.svg \
-	ios/spinbox-left-rollover.svg \
 	ios/spinbox-left-disabled.svg \
 	ios/spinbox-right.svg \
 	ios/spinbox-right-pressed.svg \
-	ios/spinbox-right-rollover.svg \
 	ios/spinbox-right-disabled.svg \
 	ios/common-rect.svg \
 	ios/common-rect-disabled.svg \
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 5b4aa12b44ea..61d6aa21578e 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -102,7 +102,7 @@
                 <image source="tick-off-pressed.svg" />
             </state>
             <state enabled="false" button-value="false">
-                <image source="tick-on-disabled.svg" />
+                <image source="tick-off-disabled.svg" />
             </state>
         </part>
         <part value="Focus">
@@ -113,7 +113,7 @@
     </radiobutton>
 
     <checkbox>
-        <part value="Entire" width="44" height="26">
+        <part value="Entire" width="46" height="32">
            <state enabled="true" pressed="false" button-value="true">
                 <image source="switch-on.svg" />
             </state>
@@ -130,7 +130,7 @@
                 <image source="switch-off-pressed.svg" />
             </state>
             <state enabled="false" button-value="false">
-                <image source="switch-on-disabled.svg" />
+                <image source="switch-off-disabled.svg" />
             </state>
         </part>
         <part value="Focus">
@@ -192,8 +192,7 @@
             </state>
         </part>
         <part value="SubEdit">
-            <state>
-            </state>
+            <state/> <!-- Intentional empty - don't draw anything -->
         </part>
         <part value="ButtonDown" width="35" height="36">
             <state enabled="true">
@@ -212,7 +211,9 @@
 
     <spinbox>
         <part value="Entire">
-            <state/> <!-- Intentional empty - don't draw anything -->
+            <state>
+                <rect stroke="#ffffff" fill="#ffffff" stroke-width="0" />
+            </state>
         </part>
         <part value="SubEdit">
             <state/> <!-- Intentional empty - don't draw anything -->
@@ -224,9 +225,6 @@
             <state enabled="true" pressed="true">
                 <external source="spinbox-left-pressed.svg" />
             </state>
-            <state enabled="true" rollover="true">
-                <external source="spinbox-left-rollover.svg" />
-            </state>
             <state enabled="false">
                 <external source="spinbox-left-disabled.svg" />
             </state>
@@ -238,9 +236,6 @@
             <state enabled="true" pressed="true">
                 <external source="spinbox-right-pressed.svg" />
             </state>
-            <state enabled="true" rollover="true">
-                <external source="spinbox-right-rollover.svg" />
-            </state>
             <state enabled="false">
                 <external source="spinbox-right-disabled.svg" />
             </state>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
index b239b8e239b9..01cac0c3e881 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svg
@@ -1,4 +1,4 @@
 <svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
  <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#fff" stroke="#8e8e93" stroke-linecap="round"/>
- <rect x="17" y="12" width="10" height="2" fill="#8e8e93"/>
+ <rect x="15" y="12" width="14" height="2" fill="#8e8e93"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
index 1ddc6503b087..df8c90cccb89 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svg
@@ -1,4 +1,5 @@
 <svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
- <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#49a0ff" stroke="#007aff" stroke-linecap="round"/>
- <rect x="17" y="12" width="10" height="2" fill="#fff"/>
+ <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="none" stroke="#007aff" stroke-linecap="round"/>
+ <rect x="15" y="12" width="14" height="2" fill="#007aff"/>
+ <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#007aff" opacity=".15" stroke="#007aff" stroke-linecap="round"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svg b/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svg
deleted file mode 100644
index ae9634759af3..000000000000
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
- <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#dbecff" stroke="#007aff" stroke-linecap="round"/>
- <rect x="17" y="12" width="10" height="2" fill="#007aff"/>
-</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left.svg b/vcl/uiconfig/theme_definitions/ios/spinbox-left.svg
index 25296e8000ce..a300f6f3af2c 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left.svg
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left.svg
@@ -1,4 +1,4 @@
 <svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
  <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#fff" stroke="#007aff" stroke-linecap="round"/>
- <rect x="17" y="12" width="10" height="2" fill="#007aff"/>
+ <rect x="15" y="12" width="14" height="2" fill="#007aff"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svg b/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svg
index 5d7f8de2cff8..5eb82b2f8f72 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svg
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svg
@@ -1,5 +1,5 @@
 <svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
  <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#fff" stroke="#8e8e93" stroke-linecap="round"/>
- <rect x="17" y="12" width="10" height="2" fill="#8e8e93"/>
- <rect x="21" y="8" width="2" height="10" fill="#8e8e93"/>
+ <rect x="15" y="12" width="14" height="2" fill="#8e8e93"/>
+ <rect x="21" y="6" width="2" height="14" fill="#8e8e93"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svg b/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svg
index 0c5ee41db734..ac476a0da90f 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svg
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svg
@@ -1,5 +1,6 @@
 <svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#49a0ff" stroke="#007aff" stroke-linecap="round"/>
- <rect x="17" y="12" width="10" height="2" fill="#fff"/>
- <rect x="21" y="8" width="2" height="10" fill="#fff"/>
+ <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="none" stroke="#007aff" stroke-linecap="round"/>
+ <rect x="15" y="12" width="14" height="2"/>
+ <rect x="21" y="6" width="2" height="14"/>
+ <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#007aff" opacity=".15" stroke="#007aff" stroke-linecap="round"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svg b/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svg
deleted file mode 100644
index 7f07d86f3ff4..000000000000
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#dbecff" stroke="#007aff" stroke-linecap="round"/>
- <rect x="17" y="12" width="10" height="2" fill="#007aff"/>
- <rect x="21" y="8" width="2" height="10" fill="#007aff"/>
-</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right.svg b/vcl/uiconfig/theme_definitions/ios/spinbox-right.svg
index dc27b98296a4..6e6676052be4 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-right.svg
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right.svg
@@ -1,5 +1,5 @@
 <svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
  <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#fff" stroke="#007aff" stroke-linecap="round"/>
- <rect x="17" y="12" width="10" height="2" fill="#007aff"/>
- <rect x="21" y="8" width="2" height="10" fill="#007aff"/>
+ <rect x="15" y="12" width="14" height="2" fill="#007aff"/>
+ <rect x="21" y="6" width="2" height="14" fill="#007aff"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svg b/vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svg
index 7fb674b79c44..a24166a7679f 100644
--- a/vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svg
+++ b/vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svg
@@ -1,182 +1,14 @@
-<?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: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="44"
-   height="26"
-   viewBox="0 0 11.641666 6.8791669"
-   version="1.1"
-   id="svg1344"
-   sodipodi:docname="switch-off-disabled-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <defs
-     id="defs1338">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1305-1"
-       id="linearGradient90305"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(221.11606,-122.19969)"
-       x1="12.628486"
-       y1="74.504791"
-       x2="17.991665"
-       y2="74.504791" />
-    <linearGradient
-       id="linearGradient1305-1"
-       inkscape:collect="always">
-      <stop
-         id="stop1301-0"
-         offset="0"
-         style="stop-color:#fafafa;stop-opacity:1" />
-      <stop
-         id="stop1303-1"
-         offset="1"
-         style="stop-color:#f0f0f0;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1982"
-       id="radialGradient90307"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.8606398,0.03262669,-0.00495255,0.43422932,-444.76567,-34.699637)"
-       cx="238.88559"
-       cy="-48.005653"
-       fx="238.88559"
-       fy="-48.005653"
-       r="5.8247647" />
-    <linearGradient
-       id="linearGradient1982"
-       inkscape:collect="always">
-      <stop
-         id="stop1978"
-         offset="0"
-         style="stop-color:#e6e6e6;stop-opacity:1" />
-      <stop
-         id="stop1980"
-         offset="1"
-         style="stop-color:#e6e6e6;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315-6"
-       id="linearGradient90309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95999995,0,0,0.95999995,221.81456,-118.9557)"
-       x1="24.494602"
-       y1="70.76062"
-       x2="17.508867"
-       y2="77.49472" />
-    <linearGradient
-       id="linearGradient1315-6"
-       inkscape:collect="always">
-      <stop
-         id="stop1311-0"
-         offset="0"
-         style="stop-color:#c8c8c8;stop-opacity:1" />
-      <stop
-         id="stop1313-7"
-         offset="1"
-         style="stop-color:#f5f5f5;stop-opacity:0" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#ff47c6"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="86.037232"
-     inkscape:cy="-1.1532721"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="960"
-     inkscape:window-height="1016"
-     inkscape:window-x="960"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata1341">
-    <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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(245.45773,51.15387)">
-    <g
-       inkscape:label="Layer 1"
-       id="g90303"
-       transform="translate(3.6903419e-6)">
-      <rect
-         style="opacity:1;fill:url(#linearGradient90305);fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect90293"
-         width="11.641666"
-         height="6.8791666"
-         x="233.81607"
-         y="-51.15387"
-         rx="3.4395833"
-         ry="5.2916665"
-         transform="scale(-1,1)" />
-      <rect
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#f0f0f0;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect90295"
-         width="11.384946"
-         height="6.6224456"
-         x="233.94443"
-         y="-51.025509"
-         rx="3.3637338"
-         ry="5.0941887"
-         transform="scale(-1,1)" />
-      <rect
-         transform="scale(-1,1)"
-         ry="5.0941887"
-         rx="3.3637338"
-         y="-51.025509"
-         x="233.94443"
-         height="6.6224456"
-         width="11.384946"
-         id="rect90297"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient90307);stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         r="3.175"
-         cy="-47.449703"
-         cx="241.75357"
-         id="circle90299"
-         style="opacity:1;fill:url(#linearGradient90309);fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="scale(-1,1)" />
-      <circle
-         style="opacity:1;fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="circle90301"
-         cx="242.01814"
-         cy="-47.714287"
-         r="3.175"
-         transform="scale(-1,1)" />
-    </g>
+<svg version="1.1" viewBox="0 0 46 32" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter864" x="-.072" y="-.072" width="1.144" height="1.144" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.1905"/>
+  </filter>
+ </defs>
+ <g transform="matrix(3.7783 0 0 3.8564 927.42 199.77)">
+  <g transform="translate(.5911 .076237)" opacity=".5">
+   <rect transform="scale(-1,1)" x="234.59" y="-50.912" width="10.74" height="6.3951" rx="3.175" ry="6.35" fill="none" opacity="1" stroke="#e4e4e4" stroke-width=".3788"/>
+   <circle transform="matrix(-1 0 0 1 -.39821 .23624)" cx="241.75" cy="-47.45" r="3.175" fill="#c6c6c6" filter="url(#filter864)" opacity=".75"/>
+   <circle transform="scale(-1,1)" cx="242.15" cy="-47.714" r="2.9829" fill="#fefeff" opacity="1" stroke="#ebebeb" stroke-opacity=".78431" stroke-width=".13229"/>
   </g>
+ </g>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svg b/vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svg
index 964f42cd7a16..f1f898096238 100644
--- a/vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svg
+++ b/vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svg
@@ -1,159 +1,15 @@
-<?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: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="44"
-   height="26"
-   viewBox="0 0 11.641666 6.8791669"
-   version="1.1"
-   id="svg1344"
-   sodipodi:docname="switch-off-pressed-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <defs
-     id="defs1338">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="74.504791"
-       x2="17.991665"
-       y1="74.504791"
-       x1="12.628486"
-       id="linearGradient1307-9"
-       xlink:href="#linearGradient1305-9"
-       inkscape:collect="always"
-       gradientTransform="translate(221.11606,-122.19969)" />
-    <linearGradient
-       id="linearGradient1305-9"
-       inkscape:collect="always">
-      <stop
-         id="stop1301-4"
-         offset="0"
-         style="stop-color:#ebebeb;stop-opacity:1" />
-      <stop
-         id="stop1303-5"
-         offset="1"
-         style="stop-color:#ebebeb;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.95999995,0,0,0.95999995,221.81456,-118.9557)"
-       gradientUnits="userSpaceOnUse"
-       y2="77.49472"
-       x2="17.508867"
-       y1="70.76062"
-       x1="24.494602"
-       id="linearGradient1317-9"
-       xlink:href="#linearGradient1315-6"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient1315-6"
-       inkscape:collect="always">
-      <stop
-         id="stop1311-0"
-         offset="0"
-         style="stop-color:#c8c8c8;stop-opacity:1" />
-      <stop
-         id="stop1313-7"
-         offset="1"
-         style="stop-color:#f5f5f5;stop-opacity:0" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#ff47c6"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="24.540385"
-     inkscape:cy="11.223509"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="960"
-     inkscape:window-height="1016"
-     inkscape:window-x="960"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata1341">
-    <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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(245.45773,51.15387)">
-    <g
-       transform="translate(3.6903419e-6)"
-       id="layer1-03"
-       inkscape:label="Layer 1">
-      <rect
-         transform="scale(-1,1)"
-         ry="5.2916665"
-         rx="3.4395833"
-         y="-51.15387"
-         x="233.81607"
-         height="6.8791666"
-         width="11.641666"
-         id="rect1282-78"
-         style="opacity:1;fill:url(#linearGradient1307-9);fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         ry="5.0941887"
-         rx="3.3637338"
-         y="-51.025509"
-         x="233.94443"
-         height="6.6224456"
-         width="11.384946"
-         id="rect1996-8"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#f0f0f0;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#f0f0f0;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect1968-6"
-         width="11.384946"
-         height="6.6224456"
-         x="233.94443"
-         y="-51.025509"
-         rx="3.3637338"
-         ry="5.0941887"
-         transform="scale(-1,1)" />
-      <circle
-         transform="scale(-1,1)"
-         style="opacity:1;fill:url(#linearGradient1317-9);fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="circle1309-0"
-         cx="241.75357"
-         cy="-47.449703"
-         r="3.175" />
-      <circle
-         transform="scale(-1,1)"
-         r="3.175"
-         cy="-47.714287"
-         cx="242.01814"
-         id="path1293-4"
-         style="opacity:1;fill:#e1e1e1;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
+<svg version="1.1" viewBox="0 0 46 32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <radialGradient id="radialGradient840" cx="241.59" cy="-47.248" r="4.2368" gradientTransform="matrix(.98186 -.0040331 .003525 .85818 4.3485 -5.6203)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#121212" offset="0"/>
+   <stop stop-color="#c6c6c6" stop-opacity="0" offset="1"/>
+  </radialGradient>
+ </defs>
+ <g transform="matrix(3.7405 0 0 3.8201 918.41 198.09)">
+  <g transform="translate(.6348 .032528)">
+   <rect transform="scale(-1,1)" x="234.59" y="-50.912" width="10.74" height="6.3951" rx="3.175" ry="6.35" fill="#e4e4e4" stroke="#e4e4e4" stroke-width=".3788"/>
+   <rect transform="scale(-1,1)" x="237.15" y="-50.774" width="8.4824" height="7.2644" rx="3.175" ry="6.35" fill="url(#radialGradient840)"/>
+   <rect transform="scale(-1,1)" x="237.91" y="-50.799" width="7.2232" height="6.2779" rx="3.175" ry="6.35" fill="#fff" stroke="#ebebeb" stroke-opacity=".78431" stroke-width=".10751"/>
   </g>
+ </g>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-off.svg b/vcl/uiconfig/theme_definitions/ios/switch-off.svg
index 9531df0bdbbd..80fda60b95bd 100644
--- a/vcl/uiconfig/theme_definitions/ios/switch-off.svg
+++ b/vcl/uiconfig/theme_definitions/ios/switch-off.svg
@@ -1,182 +1,15 @@
-<?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: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="44"
-   height="26"
-   viewBox="0 0 11.641666 6.8791669"
-   version="1.1"
-   id="svg1344"
-   sodipodi:docname="switch-off-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <defs
-     id="defs1338">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="74.504791"
-       x2="17.991665"
-       y1="74.504791"
-       x1="12.628486"
-       id="linearGradient1307-0"
-       xlink:href="#linearGradient1305-1"
-       inkscape:collect="always"
-       gradientTransform="translate(221.11606,-122.19969)" />
-    <linearGradient
-       id="linearGradient1305-1"
-       inkscape:collect="always">
-      <stop
-         id="stop1301-0"
-         offset="0"
-         style="stop-color:#fafafa;stop-opacity:1" />
-      <stop
-         id="stop1303-1"
-         offset="1"
-         style="stop-color:#f0f0f0;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.8606398,0.03262669,-0.00495255,0.43422932,-444.76567,-34.699637)"
-       r="5.8247647"
-       fy="-48.005653"
-       fx="238.88559"
-       cy="-48.005653"
-       cx="238.88559"
-       id="radialGradient1984"
-       xlink:href="#linearGradient1982"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient1982"
-       inkscape:collect="always">
-      <stop
-         id="stop1978"
-         offset="0"
-         style="stop-color:#e6e6e6;stop-opacity:1" />
-      <stop
-         id="stop1980"
-         offset="1"
-         style="stop-color:#e6e6e6;stop-opacity:0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315-6"
-       id="linearGradient89897"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95999995,0,0,0.95999995,221.81456,-118.9557)"
-       x1="24.494602"
-       y1="70.76062"
-       x2="17.508867"
-       y2="77.49472" />
-    <linearGradient
-       id="linearGradient1315-6"
-       inkscape:collect="always">
-      <stop
-         id="stop1311-0"
-         offset="0"
-         style="stop-color:#c8c8c8;stop-opacity:1" />
-      <stop
-         id="stop1313-7"
-         offset="1"
-         style="stop-color:#f5f5f5;stop-opacity:0" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#ff47c6"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="31.236457"
-     inkscape:cy="-12.26495"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="960"
-     inkscape:window-height="1016"
-     inkscape:window-x="960"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata1341">
-    <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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(245.45773,51.15387)">
-    <g
-       transform="translate(3.6903419e-6)"
-       id="layer1-7"
-       inkscape:label="Layer 1">
-      <rect
-         transform="scale(-1,1)"
-         ry="5.2916665"
-         rx="3.4395833"
-         y="-51.15387"
-         x="233.81607"
-         height="6.8791666"
-         width="11.641666"
-         id="rect1282-7"
-         style="opacity:1;fill:url(#linearGradient1307-0);fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         ry="5.0941887"
-         rx="3.3637338"
-         y="-51.025509"
-         x="233.94443"
-         height="6.6224456"
-         width="11.384946"
-         id="rect1996"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#f0f0f0;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient1984);stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect1968"
-         width="11.384946"
-         height="6.6224456"
-         x="233.94443"
-         y="-51.025509"
-         rx="3.3637338"
-         ry="5.0941887"
-         transform="scale(-1,1)" />
-      <circle
-         transform="scale(-1,1)"
-         style="opacity:1;fill:url(#linearGradient89897);fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="circle1309-2"
-         cx="241.75357"
-         cy="-47.449703"
-         r="3.175" />
-      <circle
-         transform="scale(-1,1)"
-         r="3.175"
-         cy="-47.714287"
-         cx="242.01814"
-         id="path1293-6"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
+<svg version="1.1" viewBox="0 0 46 32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <radialGradient id="radialGradient858" cx="241.75" cy="-47.45" r="3.6322" gradientTransform="matrix(.95314 .0010684 -.0010429 .93044 11.678 -3.1355)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#121212" offset="0"/>
+   <stop stop-color="#c6c6c6" stop-opacity="0" offset="1"/>
+  </radialGradient>
+ </defs>
+ <g transform="matrix(3.7783 0 0 3.7628 927.41 195)">
+  <g transform="translate(.59099 .076237)">
+   <rect transform="scale(-1,1)" x="234.59" y="-50.912" width="10.74" height="6.3951" rx="3.175" ry="6.35" fill="#fff" stroke="#e4e4e4" stroke-width=".3788"/>
+   <circle transform="scale(-1,1)" cx="242.15" cy="-47.026" r="3.6322" fill="url(#radialGradient858)"/>
+   <circle transform="scale(-1,1)" cx="242.15" cy="-47.714" r="2.9829" fill="#fff" stroke="#ebebeb" stroke-opacity=".78431" stroke-width=".13229"/>
   </g>
+ </g>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svg b/vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svg
index ac03c80b2538..931417d62194 100644
--- a/vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svg
+++ b/vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svg
@@ -1,144 +1,15 @@
-<?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: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="44"
-   height="26"
-   viewBox="0 0 11.641666 6.8791669"
-   version="1.1"
-   id="svg1344"
-   sodipodi:docname="switch-on-disabled-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <defs
-     id="defs1338">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient89956"
-       id="linearGradient89921"
-       gradientUnits="userSpaceOnUse"
-       x1="12.628486"
-       y1="74.504791"
-       x2="17.991665"
-       y2="74.504791" />
-    <linearGradient
-       id="linearGradient89956"
-       inkscape:collect="always">
-      <stop
-         id="stop89952"
-         offset="0"
-         style="stop-color:#8de79d;stop-opacity:1" />
-      <stop
-         id="stop89954"
-         offset="1"
-         style="stop-color:#89e398;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="linearGradient89923"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95999998,0,0,0.95999998,0.69849913,2.9794158)"
-       x1="22.639814"
-       y1="74.738647"
-       x2="16.967495"
-       y2="74.738647" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1315">
-      <stop
-         style="stop-color:#40b654;stop-opacity:1;"
-         offset="0"
-         id="stop1311" />
-      <stop
-         style="stop-color:#40b654;stop-opacity:0;"
-         offset="1"
-         id="stop1313" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#ff47c6"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="15.080862"
-     inkscape:cy="-11.660505"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="960"
-     inkscape:window-height="1016"
-     inkscape:window-x="960"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata1341">
-    <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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(245.45773,51.15387)">
-    <g
-       id="g89919"
-       transform="translate(-258.15773,-122.1997)">
-      <rect
-         style="opacity:1;fill:url(#linearGradient89921);fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect89913"
-         width="11.641666"
-         height="6.8791666"
-         x="12.7"
-         y="71.045822"
-         rx="3.4395833"
-         ry="5.2916665" />
-      <circle
-         r="3.175"
-         cy="74.485405"
-         cx="20.637501"
-         id="circle89915"
-         style="opacity:1;fill:url(#linearGradient89923);fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="circle89917"
-         cx="20.902084"
-         cy="74.485405"
-         r="3.175" />
-      <rect
-         transform="scale(-1,1)"
-         ry="5.0941887"
-         rx="3.3637338"
-         y="71.174187"
-         x="-24.213306"
-         height="6.6224442"
-         width="11.384946"
-         id="rect1996-8-8-0"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#89e399;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
+<svg version="1.1" viewBox="0 0 46 32" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient850" x1="234.4" x2="239.24" y1="-47.714" y2="-47.785" gradientTransform="matrix(3.7774 0 0 3.7628 -883.43 195.28)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#4cd964" offset="0"/>
+   <stop stop-color="#4ad462" offset="1"/>
+  </linearGradient>
+  <radialGradient id="radialGradient858-0" cx="241.75" cy="-47.45" r="3.6322" gradientTransform="matrix(3.6004 .0040202 -.0039394 3.5011 -840.31 183.48)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#121212" offset="0"/>
+   <stop stop-color="#c6c6c6" stop-opacity="0" offset="1"/>
+  </radialGradient>
+ </defs>
+ <rect x="2.7091" y="3.7083" width="40.569" height="24.063" rx="11.993" ry="23.894" fill="url(#linearGradient850)" opacity=".5" stroke="#52d667" stroke-width="1.4281"/>
+ <ellipse cx="30.284" cy="18.331" rx="13.72" ry="13.667" fill="url(#radialGradient858-0)" opacity=".5" stroke-width="3.7701"/>
+ <ellipse cx="31.266" cy="15.742" rx="11.268" ry="11.224" fill="#fff" stroke="#ebebeb" stroke-opacity=".78431" stroke-width=".49875"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svg b/vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svg
index d4cf9e764118..b6f7169ba666 100644
--- a/vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svg
+++ b/vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svg
@@ -1,146 +1,11 @@
-<?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: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="44"
-   height="26"
-   viewBox="0 0 11.641666 6.8791669"
-   version="1.1"
-   id="svg1344"
-   sodipodi:docname="switch-on-pressed-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <defs
-     id="defs1338">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="74.504791"
-       x2="17.991665"
-       y1="74.504791"
-       x1="12.628486"
-       id="linearGradient1307-09"
-       xlink:href="#linearGradient1305"
-       inkscape:collect="always"
-       gradientTransform="translate(-258.15775,-122.19969)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1305">
-      <stop
-         style="stop-color:#4cd964;stop-opacity:1"
-         offset="0"
-         id="stop1301" />
-      <stop
-         style="stop-color:#4ad361;stop-opacity:1"
-         offset="1"
-         id="stop1303" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.95999995,0,0,0.95999995,-257.45925,-119.22028)"
-       gradientUnits="userSpaceOnUse"
-       y2="74.738647"
-       x2="16.967495"
-       y1="74.738647"
-       x1="22.639814"
-       id="linearGradient1317-6"
-       xlink:href="#linearGradient1315"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1315">
-      <stop
-         style="stop-color:#40b654;stop-opacity:1;"
-         offset="0"
-         id="stop1311" />
-      <stop
-         style="stop-color:#40b654;stop-opacity:0;"
-         offset="1"
-         id="stop1313" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#ff47c6"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="16.937777"
-     inkscape:cy="2.8250852"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="960"
-     inkscape:window-height="1016"
-     inkscape:window-x="960"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata1341">
-    <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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(245.45773,51.15387)">
-    <g
-       transform="translate(3.6903419e-6)"
-       id="layer1-85"
-       inkscape:label="Layer 1">
-      <rect
-         ry="5.2916665"
-         rx="3.4395833"
-         y="-51.15387"
-         x="-245.45773"
-         height="6.8791666"
-         width="11.641666"
-         id="rect1282-3"
-         style="opacity:1;fill:url(#linearGradient1307-09);fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         style="opacity:1;fill:url(#linearGradient1317-6);fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="circle1309-3"
-         cx="-237.52023"
-         cy="-47.714287"
-         r="3.175" />
-      <circle
-         r="3.175"
-         cy="-47.714287"
-         cx="-237.25566"
-         id="path1293-8"
-         style="opacity:1;fill:#dff7e3;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         ry="5.0941887"
-         rx="3.3637338"
-         y="-51.025509"
-         x="233.94443"
-         height="6.6224442"
-         width="11.384946"
-         id="rect1996-8-8-9"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#4ad361;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
+<svg version="1.1" viewBox="0 0 46 32" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <radialGradient id="radialGradient840" cx="241.59" cy="-47.248" r="4.2368" gradientTransform="matrix(3.6941 -.015341 .013262 3.2643 -863.77 176.13)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#121212" offset="0"/>
+   <stop stop-color="#c6c6c6" stop-opacity="0" offset="1"/>
+  </radialGradient>
+ </defs>
+ <rect x="2.7365" y="3.7209" width="40.407" height="24.326" rx="11.945" ry="24.154" fill="#4bd663" stroke="#4bd763" stroke-width="1.433"/>
+ <rect x="12.105" y="4.3676" width="31.913" height="27.632" rx="11.945" ry="24.154" fill="url(#radialGradient840)" stroke-width="3.783"/>
+ <rect x="15.227" y="4.1508" width="27.176" height="23.88" rx="11.945" ry="24.154" fill="#fff" stroke="#ebebeb" stroke-opacity=".78431" stroke-width=".40671"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/switch-on.svg b/vcl/uiconfig/theme_definitions/ios/switch-on.svg
index c84dff5272da..3c13bd4519df 100644
--- a/vcl/uiconfig/theme_definitions/ios/switch-on.svg
+++ b/vcl/uiconfig/theme_definitions/ios/switch-on.svg
@@ -1,144 +1,15 @@
-<?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: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="44"
-   height="26"
-   viewBox="0 0 11.641666 6.8791669"
-   version="1.1"
-   id="svg1344"
-   sodipodi:docname="switch-on-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <defs
-     id="defs1338">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1305"
-       id="linearGradient1307"
-       x1="12.628486"
-       y1="74.504791"
-       x2="17.991665"
-       y2="74.504791"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1305">
-      <stop
-         style="stop-color:#4cd964;stop-opacity:1"
-         offset="0"
-         id="stop1301" />
-      <stop
-         style="stop-color:#4ad361;stop-opacity:1"
-         offset="1"
-         id="stop1303" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="linearGradient1317"
-       x1="22.639814"
-       y1="74.738647"
-       x2="16.967495"
-       y2="74.738647"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95999998,0,0,0.95999998,0.69849913,2.9794158)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient1315">
-      <stop
-         style="stop-color:#40b654;stop-opacity:1;"
-         offset="0"
-         id="stop1311" />
-      <stop
-         style="stop-color:#40b654;stop-opacity:0;"
-         offset="1"
-         id="stop1313" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#ff47c6"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="16.040364"
-     inkscape:cy="-14.101811"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="960"
-     inkscape:window-height="1016"
-     inkscape:window-x="960"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata1341">
-    <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="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(245.45773,51.15387)">
-    <g
-       transform="translate(-258.15773,-122.1997)"
-       id="g89892">
-      <rect
-         ry="5.2916665"
-         rx="3.4395833"
-         y="71.045822"
-         x="12.7"
-         height="6.8791666"
-         width="11.641666"
-         id="rect1282"
-         style="opacity:1;fill:url(#linearGradient1307);fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         style="opacity:1;fill:url(#linearGradient1317);fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="circle1309"
-         cx="20.637501"
-         cy="74.485405"
-         r="3.175" />
-      <circle
-         r="3.175"
-         cy="74.485405"
-         cx="20.902084"
-         id="path1293"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         transform="scale(-1,1)"
-         ry="5.0941887"
-         rx="3.3637338"
-         y="71.174187"
-         x="-24.213306"
-         height="6.6224446"
-         width="11.384946"
-         id="rect1996-8-8"
-         style="opacity:1;fill:none;fill-opacity:1;stroke:#4ad361;stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
+<svg version="1.1" viewBox="0 0 46 32" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient850" x1="234.4" x2="239.24" y1="-47.714" y2="-47.785" gradientTransform="matrix(3.7773 0 0 3.7628 -883.38 195.28)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#4cd964" offset="0"/>
+   <stop stop-color="#4ad462" offset="1"/>
+  </linearGradient>
+  <radialGradient id="radialGradient858-0-7" cx="241.75" cy="-47.45" r="3.6322" gradientTransform="matrix(3.6003 .0040202 -.0039394 3.5011 -840.26 183.48)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#121212" offset="0"/>
+   <stop stop-color="#c6c6c6" stop-opacity="0" offset="1"/>
+  </radialGradient>
+ </defs>
+ <rect x="2.7336" y="3.7083" width="40.568" height="24.063" rx="11.993" ry="23.894" fill="url(#linearGradient850)" stroke="#52d667" stroke-width="1.4281"/>
+ <ellipse cx="30.308" cy="18.331" rx="13.72" ry="13.667" fill="url(#radialGradient858-0-7)" stroke-width="3.77"/>
+ <ellipse cx="31.29" cy="15.742" rx="11.267" ry="11.224" fill="#fff" stroke="#ebebeb" stroke-opacity=".78431" stroke-width=".49874"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svg b/vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svg
index 4890906c9f67..909397fb5565 100644
--- a/vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svg
+++ b/vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svg
@@ -1,93 +1,4 @@
-<?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"
-   id="svg1344"
-   version="1.1"
-   viewBox="0 0 6.8791662 6.8791669"
-   height="26"
-   width="26"
-   sodipodi:docname="tick-off-disabled-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <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="namedview13"
-     showgrid="false"
-     inkscape:zoom="3.2091769"
-     inkscape:cx="-72.175005"
-     inkscape:cy="20.179603"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1338">
-    <radialGradient
-       gradientTransform="matrix(1.1736111,-2.5566718e-7,2.5566717e-7,1.173611,-295.03909,-135.13117)"
-       gradientUnits="userSpaceOnUse"
-       r="3.175"
-       fy="74.485405"
-       fx="45.177605"
-       cy="74.485405"
-       cx="45.177605"
-       id="radialGradient88258"
-       xlink:href="#linearGradient87950" />
-    <linearGradient
-       id="linearGradient87950">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop87946" />
-      <stop
-         style="stop-color:#7b7b7b;stop-opacity:0"
-         offset="1"
-         id="stop87948" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata1341">
-    <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
-     transform="translate(245.45773,51.15387)"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#8ab4e4;fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect91642"
-       width="6.8791666"
-       height="6.8791656"
-       x="-245.45773"
-       y="-51.15387"
-       rx="3.4395833"
-       ry="3.4395828" />
-    <circle
-       style="opacity:1;fill:#fafafa;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="circle91646"
-       cx="-242.01814"
-       cy="-47.714287"
-       r="3.175" />
-  </g>
+<svg version="1.1" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg">
+ <rect x="-.0060954" y=".0034595" width="26" height="26" rx="13" ry="13" fill="#8ab4e4" stroke-width="3.7795"/>
+ <circle cx="12.995" cy="13.005" r="12" fill="#fafafa" stroke-width="3.7795"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svg b/vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svg
index f01d94aaaafe..eeb5475b14a3 100644
--- a/vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svg
+++ b/vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svg
@@ -1,126 +1,11 @@
-<?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"
-   id="svg1344"
-   version="1.1"
-   viewBox="0 0 6.8791662 6.8791669"
-   height="26"
-   width="26"
-   sodipodi:docname="tick-off-pressed-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <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="namedview13"
-     showgrid="false"
-     inkscape:zoom="3.2091769"
-     inkscape:cx="-6.270255"
-     inkscape:cy="22.672454"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1338">
-    <radialGradient
-       gradientTransform="matrix(1.1736111,-2.5566718e-7,2.5566717e-7,1.173611,-295.03909,-135.13117)"
-       gradientUnits="userSpaceOnUse"
-       r="3.175"
-       fy="74.485405"
-       fx="45.177605"
-       cy="74.485405"
-       cx="45.177605"
-       id="radialGradient88258"
-       xlink:href="#linearGradient87950" />
-    <linearGradient
-       id="linearGradient87950">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop87946" />
-      <stop
-         style="stop-color:#7b7b7b;stop-opacity:0"
-         offset="1"
-         id="stop87948" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient90579"
-       id="radialGradient90581"
-       cx="53.445831"
-       cy="74.485405"
-       fx="53.445831"
-       fy="74.485405"
-       r="3.4395833"
-       gradientTransform="matrix(1.565141,0,0,1.4674024,-325.6684,-157.01436)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient90579">
-      <stop
-         style="stop-color:#007aff;stop-opacity:0"
-         offset="0"
-         id="stop90575" />
-      <stop
-         style="stop-color:#646464;stop-opacity:0.03921569"
-         offset="1"
-         id="stop90577" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata1341">
-    <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
-     transform="translate(245.45773,51.15387)"
-     id="layer1">
-    <rect
-       style="display:inline;opacity:1;fill:#0071f0;fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1170"
-       width="6.8791666"
-       height="6.8791656"
-       x="-245.45773"
-       y="-51.15387"
-       rx="3.4395833"
-       ry="3.4395828" />
-    <circle
-       style="display:inline;opacity:1;fill:#eaf0f6;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="circle1174"
-       cx="-242.01814"
-       cy="-47.714287"
-       r="3.175" />
-    <rect
-       ry="3.1800878"
-       rx="3.180088"
-       y="-50.894375"
-       x="-245.19824"
-       height="6.3601756"
-       width="6.3601761"
-       id="rect90573"
-       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient90581);stroke-width:0.25440705;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="Inner-shadow" />
-  </g>
+<svg version="1.1" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <radialGradient id="radialGradient90581" cx="53.446" cy="74.485" r="3.4396" gradientTransform="matrix(5.9155 0 0 5.5461 -303.16 -400.11)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#007aff" stop-opacity="0" offset="0"/>
+   <stop stop-color="#646464" stop-opacity=".039216" offset="1"/>
+  </radialGradient>
+ </defs>
+ <rect x="-6.7139e-6" y="6.7139e-7" width="26" height="26" rx="13" ry="13" fill="#0071f0"/>
+ <circle cx="13" cy="13" r="12" fill="#eaf0f6"/>
+ <rect x=".98" y=".981" width="24.038" height="24.038" rx="12.019" ry="12.019" fill="none" stroke="url(#radialGradient90581)" stroke-width=".96154"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-off.svg b/vcl/uiconfig/theme_definitions/ios/tick-off.svg
index ca8d2d8daf5d..16d2a51096a0 100644
--- a/vcl/uiconfig/theme_definitions/ios/tick-off.svg
+++ b/vcl/uiconfig/theme_definitions/ios/tick-off.svg
@@ -1,113 +1,13 @@
-<?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: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="26"
-   height="26"
-   viewBox="0 0 6.8791662 6.8791669"
-   version="1.1"
-   id="svg1344"
-   sodipodi:docname="tick-off-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <defs
-     id="defs1338">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient87950"
-       id="radialGradient88258"
-       cx="45.177605"
-       cy="74.485405"
-       fx="45.177605"
-       fy="74.485405"
-       r="3.175"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1736111,-2.5566718e-7,2.5566717e-7,1.173611,-295.03909,-135.13117)" />
-    <linearGradient
-       id="linearGradient87950"
-       inkscape:collect="always">
-      <stop
-         id="stop87946"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1" />
-      <stop
-         id="stop87948"
-         offset="1"
-         style="stop-color:#7b7b7b;stop-opacity:0" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#ff47c6"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-44.853613"
-     inkscape:cy="-2.0411022"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="960"
-     inkscape:window-height="1016"
-     inkscape:window-x="960"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata1341">
-    <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="Tick-off"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(245.45773,51.15387)">
-    <rect
-       ry="3.4395828"
-       rx="3.4395833"
-       y="-51.15387"
-       x="-245.45773"
-       height="6.8791656"
-       width="6.8791666"
-       id="rect1170"
-       style="display:inline;opacity:1;fill:#007aff;fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="Stroke" />
-    <circle
-       style="display:inline;opacity:1;fill:url(#radialGradient88258);fill-opacity:1;stroke:none;stroke-width:0.29480639;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="circle1172"
-       cx="-242.01814"
-       cy="-47.714287"
-       r="3.4395833"
-       inkscape:label="shadow" />
-    <circle
-       r="3.175"
-       cy="-47.714287"
-       cx="-242.01814"
-       id="circle1174"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.27212897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="circle-white" />
-  </g>
+<svg version="1.1" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <radialGradient id="radialGradient88258" cx="45.178" cy="74.485" r="3.175" gradientTransform="matrix(4.4356 -9.663e-7 9.663e-7 4.4356 -187.39 -317.38)" gradientUnits="userSpaceOnUse">
+   <stop offset="0"/>
+   <stop stop-color="#7b7b7b" stop-opacity="0" offset="1"/>
+  </radialGradient>
+ </defs>
+ <g stroke-width="3.7795">
+  <rect x="-.0060954" y=".0034595" width="26" height="26" rx="13" ry="13" fill="#007aff"/>
+  <circle cx="12.995" cy="13.005" r="13" fill="url(#radialGradient88258)"/>
+  <circle cx="12.995" cy="13.005" r="12" fill="#fff"/>
+ </g>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svg b/vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svg
index 855129df44fa..0db53e3d4c2e 100644
--- a/vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svg
+++ b/vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svg
@@ -1,125 +1,11 @@
-<?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"
-   id="svg1344"
-   version="1.1"
-   viewBox="0 0 6.8791662 6.8791669"
-   height="26"
-   width="26"
-   sodipodi:docname="tick-on-disabled-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <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="namedview13"
-     showgrid="false"
-     inkscape:zoom="12.836708"
-     inkscape:cx="25.776711"
-     inkscape:cy="5.7547945"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs1338">
-    <radialGradient
-       gradientTransform="matrix(1.1736111,-2.5566718e-7,2.5566717e-7,1.173611,-295.03909,-135.13117)"
-       gradientUnits="userSpaceOnUse"
-       r="3.175"
-       fy="74.485405"
-       fx="45.177605"
-       cy="74.485405"
-       cx="45.177605"
-       id="radialGradient88258"
-       xlink:href="#linearGradient87950" />
-    <linearGradient
-       id="linearGradient87950">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop87946" />
-      <stop
-         style="stop-color:#7b7b7b;stop-opacity:0"
-         offset="1"
-         id="stop87948" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient90579"
-       id="radialGradient91656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1153842,7.9576548e-7,-6.4384668e-7,1.7115383,-355.07655,-175.19895)"
-       cx="53.445831"
-       cy="74.485405"
-       fx="53.445831"
-       fy="74.485405"
-       r="3.4395833" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient90579">
-      <stop
-         style="stop-color:#007aff;stop-opacity:0"
-         offset="0"
-         id="stop90575" />
-      <stop
-         style="stop-color:#646464;stop-opacity:0.19607843"
-         offset="1"
-         id="stop90577" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata1341">
-    <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
-     transform="translate(245.45773,51.15387)"
-     id="layer1">
-    <rect
-       ry="3.4395828"
-       rx="3.4395833"
-       y="-51.15387"
-       x="-245.45773"
-       height="6.8791656"
-       width="6.8791666"
-       id="rect91648"
-       style="opacity:1;fill:#8ab4e4;fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       inkscape:connector-curvature="0"
-       id="path91650"
-       d="m -244.06867,-47.763897 0.26459,-0.264583 1.2237,1.223698 2.34818,-2.348175 0.26458,0.264583 -2.61276,2.612758 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient91656);stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect91652"
-       width="6.614583"
-       height="6.6145825"
-       x="-245.32544"
-       y="-51.02158"
-       rx="3.3072915"
-       ry="3.3072913" />
-  </g>
+<svg version="1.1" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <radialGradient id="radialGradient91656" cx="53.446" cy="74.485" r="3.4396" gradientTransform="matrix(7.9952 3.0076e-6 -2.4334e-6 6.4688 -414.31 -468.83)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#007aff" stop-opacity="0" offset="0"/>
+   <stop stop-color="#646464" stop-opacity=".19608" offset="1"/>
+  </radialGradient>
+ </defs>
+ <rect x="-1.3449e-5" y="7.8907e-6" width="26" height="26" rx="13" ry="13" fill="#8ab4e4"/>
+ <path d="m5.25 12.813 1-1 4.625 4.625 8.875-8.875 0.99999 1-9.875 9.875z" fill="#fff"/>
+ <rect x=".49999" y=".5" width="25" height="25" rx="12.5" ry="12.5" fill="none" stroke="url(#radialGradient91656)"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svg b/vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svg
index 4cb2a79575aa..cf02114dd199 100644
--- a/vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svg
+++ b/vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svg
@@ -1,116 +1,11 @@
-<?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: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="26.000027"
-   height="26"
-   viewBox="0 0 6.8791733 6.8791669"
-   version="1.1"
-   id="svg1344"
-   sodipodi:docname="tick-on-pressed-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <defs
-     id="defs1338">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient90579"
-       id="radialGradient90581"
-       cx="53.445831"
-       cy="74.485405"
-       fx="53.445831"
-       fy="74.485405"
-       r="3.4395833"
-       gradientTransform="matrix(1.6277465,0,0,1.5260985,-329.0144,-161.38636)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient90579">
-      <stop
-         style="stop-color:#007aff;stop-opacity:0"
-         offset="0"
-         id="stop90575" />
-      <stop
-         style="stop-color:#646464;stop-opacity:0.19607843"
-         offset="1"
-         id="stop90577" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#ff47c6"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="-2.0212707"
-     inkscape:cy="-2.6403371"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata1341">
-    <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="Tick-off"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(245.45773,51.15387)">
-    <rect
-       style="display:inline;opacity:1;fill:#0071f0;fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect89736"
-       width="6.8791666"
-       height="6.8791656"
-       x="-245.45773"
-       y="-51.15387"
-       rx="3.4395833"
-       ry="3.4395828"
-       inkscape:label="circle-blue" />
-    <path
-       style="display:inline;fill:#dfeaf7;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-       d="m -244.06866,-47.763902 0.26459,-0.264583 1.2237,1.223698 2.34818,-2.348175 0.26458,0.264583 -2.61276,2.612758 z"
-       id="polygon97539-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:label="Check" />
-    <rect
-       ry="3.3072913"
-       rx="3.3072915"
-       y="-51.021576"
-       x="-245.32544"
-       height="6.6145825"
-       width="6.614583"
-       id="rect90573"
-       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient90581);stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="Inner-shadow" />
-  </g>
+<svg version="1.1" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <radialGradient id="radialGradient90581" cx="53.446" cy="74.485" r="3.4396" gradientTransform="matrix(6.1521 0 0 5.7679 -315.8 -416.63)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#007aff" stop-opacity="0" offset="0"/>
+   <stop stop-color="#646464" stop-opacity=".19608" offset="1"/>
+  </radialGradient>
+ </defs>
+ <rect x="-1.3449e-5" y="-6.9939e-6" width="26" height="26" rx="13" ry="13" fill="#0071f0"/>
+ <path d="m5.25 12.812 1-1 4.625 4.625 8.875-8.875 0.99999 1-9.875 9.875z" fill="#dfeaf7"/>
+ <rect x=".49999" y=".5" width="25" height="25" rx="12.5" ry="12.5" fill="none" stroke="url(#radialGradient90581)"/>
 </svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/tick-on.svg b/vcl/uiconfig/theme_definitions/ios/tick-on.svg
index 75675ab608b5..f812bcba776f 100644
--- a/vcl/uiconfig/theme_definitions/ios/tick-on.svg
+++ b/vcl/uiconfig/theme_definitions/ios/tick-on.svg
@@ -1,116 +1,13 @@
-<?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: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="26.000027"
-   height="26"
-   viewBox="0 0 6.8791733 6.8791669"
-   version="1.1"
-   id="svg1344"
-   sodipodi:docname="tick-on-inkscape.svg"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14">
-  <defs
-     id="defs1338">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient90579"
-       id="radialGradient90581"
-       cx="53.445831"
-       cy="74.485405"
-       fx="53.445831"
-       fy="74.485405"
-       r="3.4395833"
-       gradientTransform="matrix(2.1153842,7.9576548e-7,-6.4384668e-7,1.7115383,-355.07655,-175.19896)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient90579">
-      <stop
-         style="stop-color:#007aff;stop-opacity:0"
-         offset="0"
-         id="stop90575" />
-      <stop
-         style="stop-color:#646464;stop-opacity:0.19607843"
-         offset="1"
-         id="stop90577" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#ff47c6"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="8.8107404"
-     inkscape:cy="-2.0411022"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="960"
-     inkscape:window-height="1016"
-     inkscape:window-x="960"
-     inkscape:window-y="27"
-     inkscape:window-maximized="0"
-     inkscape:showpageshadow="false"
-     borderlayer="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata1341">
-    <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="Tick-off"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(245.45773,51.15387)">
-    <rect
-       style="display:inline;opacity:1;fill:#007aff;fill-opacity:1;stroke:none;stroke-width:0.34406587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect89736"
-       width="6.8791666"
-       height="6.8791656"
-       x="-245.45773"
-       y="-51.15387"
-       rx="3.4395833"
-       ry="3.4395828"
-       inkscape:label="circle-blue" />
-    <path
-       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-       d="m -244.06866,-47.763902 0.26459,-0.264583 1.2237,1.223698 2.34818,-2.348175 0.26458,0.264583 -2.61276,2.612758 z"
-       id="polygon97539-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:label="Check" />
-    <rect
-       ry="3.3072913"
-       rx="3.3072915"
-       y="-51.021576"
-       x="-245.32544"
-       height="6.6145825"
-       width="6.614583"
-       id="rect90573"
-       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:url(#radialGradient90581);stroke-width:0.26458332;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:label="Inner-shadow" />
-  </g>
+<svg version="1.1" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <radialGradient id="radialGradient90581" cx="53.446" cy="74.485" r="3.4396" gradientTransform="matrix(7.9952 3.0076e-6 -2.4334e-6 6.4688 -659.77 -519.98)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#007aff" stop-opacity="0" offset="0"/>
+   <stop stop-color="#646464" stop-opacity=".19608" offset="1"/>
+  </radialGradient>
+ </defs>
+ <g transform="translate(245.46 51.154)">
+  <rect x="-245.46" y="-51.154" width="26" height="26" rx="13" ry="13" fill="#007aff"/>
+  <path d="m-240.21-38.341 1-0.99999 4.625 4.625 8.875-8.8749 0.99999 0.99999-9.875 9.8749z" fill="#fff"/>
+  <rect x="-244.96" y="-50.654" width="25" height="25" rx="12.5" ry="12.5" fill="none" stroke="url(#radialGradient90581)"/>
+ </g>
 </svg>