diff --git a/data/icons/24x24/org.xfce.ScreenSaver.png b/data/icons/24x24/org.xfce.ScreenSaver.png
index 89ad2dc528a3ec2c497ecb2632f541afb6fa0bb7..d9514e018e2e2838dcc824866f5daa45717c7264 100644
Binary files a/data/icons/24x24/org.xfce.ScreenSaver.png and b/data/icons/24x24/org.xfce.ScreenSaver.png differ
diff --git a/data/icons/24x24/org.xfce.ScreenSaver.svg b/data/icons/24x24/org.xfce.ScreenSaver.svg
index 7f62c63e4b21196b8218102e750eab04d48e382b..49ee9a54bfacf45d7fb43503086a1ff51e6fe823 100644
--- a/data/icons/24x24/org.xfce.ScreenSaver.svg
+++ b/data/icons/24x24/org.xfce.ScreenSaver.svg
@@ -14,7 +14,7 @@
    id="svg18"
    sodipodi:docname="org.xfce.ScreenSaver.svg"
    inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   inkscape:export-filename="/home/maug/GIT/screensaver/xfce4-screensaver/data/icons/32x32/org.xfce.ScreenSaver.png"
+   inkscape:export-filename="/home/maug/GIT/screensaver/xfce4-screensaver/data/icons/24x24/org.xfce.ScreenSaver.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96">
   <metadata
@@ -25,7 +25,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -296,7 +296,7 @@
        id="path5549-7-7"
        inkscape:connector-curvature="0" />
     <rect
-       style="fill:#fbeb83;fill-rule:evenodd;stroke-width:3.75411"
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411"
        id="rect1046"
        width="1"
        height="1"
@@ -312,7 +312,7 @@
        height="1"
        width="1"
        id="rect1046-2"
-       style="fill:#fbeb83;fill-rule:evenodd;stroke-width:3.75411" />
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411" />
     <rect
        ry="0"
        rx="0"
@@ -321,7 +321,7 @@
        height="1"
        width="1"
        id="rect1046-7"
-       style="fill:#fbeb83;fill-rule:evenodd;stroke-width:3.75411" />
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411" />
     <rect
        ry="0"
        rx="0"
@@ -330,7 +330,7 @@
        height="1"
        width="1"
        id="rect1046-5"
-       style="fill:#fbeb83;fill-rule:evenodd;stroke-width:3.75411" />
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411" />
     <rect
        ry="0"
        rx="0"
@@ -339,6 +339,6 @@
        height="1"
        width="1"
        id="rect1046-22"
-       style="fill:#fbeb83;fill-rule:evenodd;stroke-width:3.75411" />
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411" />
   </g>
 </svg>
diff --git a/data/icons/48x48/org.xfce.ScreenSaver.png b/data/icons/48x48/org.xfce.ScreenSaver.png
index 647d25972cc57a1a153d67223e587b3af5265b69..97d99a147e0fa84ccb04b8a31c28c50e1a0107a0 100644
Binary files a/data/icons/48x48/org.xfce.ScreenSaver.png and b/data/icons/48x48/org.xfce.ScreenSaver.png differ
diff --git a/data/icons/48x48/org.xfce.ScreenSaver.svg b/data/icons/48x48/org.xfce.ScreenSaver.svg
index b7c753a198b9c064b1d34541fe3e4434bdc5b1bc..09488b98365a1b618bb1739dbf5481f10fa24e22 100644
--- a/data/icons/48x48/org.xfce.ScreenSaver.svg
+++ b/data/icons/48x48/org.xfce.ScreenSaver.svg
@@ -8,15 +8,15 @@
    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"
-   inkscape:export-ydpi="96"
-   inkscape:export-xdpi="96"
-   inkscape:export-filename="/home/maug/GIT/screensaver/xfce4-screensaver/data/icons/48x48/org.xfce.ScreenSaver.png"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="org.xfce.ScreenSaver.svg"
-   id="svg18"
-   version="1.1"
+   height="48"
    width="48"
-   height="48">
+   version="1.1"
+   id="svg18"
+   sodipodi:docname="org.xfce.ScreenSaver.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   inkscape:export-filename="/home/maug/GIT/screensaver/xfce4-screensaver/data/icons/48x48/org.xfce.ScreenSaver.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <metadata
      id="metadata24">
     <rdf:RDF>
@@ -32,218 +32,218 @@
   <defs
      id="defs22">
     <linearGradient
-       id="linearGradient1175"
-       inkscape:collect="always">
+       inkscape:collect="always"
+       id="linearGradient1175">
       <stop
-         id="stop1171"
+         style="stop-color:#d2d8dc;stop-opacity:1"
          offset="0"
-         style="stop-color:#d2d8dc;stop-opacity:1" />
+         id="stop1171" />
       <stop
-         id="stop1173"
+         style="stop-color:#758087;stop-opacity:1"
          offset="1"
-         style="stop-color:#758087;stop-opacity:1" />
+         id="stop1173" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient948">
+       id="linearGradient948"
+       inkscape:collect="always">
       <stop
-         style="stop-color:#d2d8dc;stop-opacity:1"
+         id="stop944"
          offset="0"
-         id="stop944" />
+         style="stop-color:#d2d8dc;stop-opacity:1" />
       <stop
-         style="stop-color:#758087;stop-opacity:1"
+         id="stop946"
          offset="1"
-         id="stop946" />
+         style="stop-color:#758087;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="233.40434"
-       x2="1118.7346"
-       y1="283.53955"
-       x1="1118.7346"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient942"
+       inkscape:collect="always"
        xlink:href="#linearGradient948"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="233.40434"
-       x2="1118.7346"
-       y1="283.53955"
-       x1="1118.7346"
+       id="linearGradient942"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient1134"
+       x1="1118.7346"
+       y1="283.53955"
+       x2="1118.7346"
+       y2="233.40434" />
+    <linearGradient
+       inkscape:collect="always"
        xlink:href="#linearGradient1175"
-       inkscape:collect="always" />
+       id="linearGradient1134"
+       gradientUnits="userSpaceOnUse"
+       x1="1118.7346"
+       y1="283.53955"
+       x2="1118.7346"
+       y2="233.40434" />
     <linearGradient
        id="linearGradient9567">
       <stop
-         id="stop9569"
+         style="stop-color:#204a87;stop-opacity:1"
          offset="0"
-         style="stop-color:#204a87;stop-opacity:1" />
+         id="stop9569" />
       <stop
-         id="stop9571"
+         style="stop-color:#081527;stop-opacity:0.99"
          offset="1"
-         style="stop-color:#081527;stop-opacity:0.99" />
+         id="stop9571" />
     </linearGradient>
     <radialGradient
-       r="19.00016"
-       fy="37.921711"
-       fx="24.006104"
-       cy="37.921711"
-       cx="24.006104"
-       gradientTransform="matrix(2.8072129,0,0,1.3866673,-43.39006,61.789292)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient9531"
+       inkscape:collect="always"
        xlink:href="#linearGradient9567"
-       inkscape:collect="always" />
+       id="radialGradient9531"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.8072129,0,0,1.3866673,-43.39006,61.789292)"
+       cx="24.006104"
+       cy="37.921711"
+       fx="24.006104"
+       fy="37.921711"
+       r="19.00016" />
   </defs>
   <sodipodi:namedview
-     inkscape:document-rotation="0"
-     inkscape:pagecheckerboard="false"
-     inkscape:guide-bbox="true"
-     showguides="false"
-     inkscape:current-layer="g16"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="0"
-     inkscape:cy="16.575308"
-     inkscape:cx="41.503698"
-     inkscape:zoom="16"
-     showgrid="true"
-     id="namedview20"
-     inkscape:window-height="1031"
-     inkscape:window-width="1920"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
+     pagecolor="#ffffff"
      bordercolor="#666666"
-     pagecolor="#ffffff">
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1031"
+     id="namedview20"
+     showgrid="true"
+     inkscape:zoom="16"
+     inkscape:cx="41.503698"
+     inkscape:cy="16.575308"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g16"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:document-rotation="0">
     <sodipodi:guide
-       inkscape:locked="false"
-       id="guide1036"
+       position="-32.300885,140.26549"
        orientation="0,1"
-       position="-32.300885,140.26549" />
+       id="guide1036"
+       inkscape:locked="false" />
     <inkscape:grid
-       empspacing="4"
+       type="xygrid"
        id="grid841"
-       type="xygrid" />
+       empspacing="4" />
     <sodipodi:guide
-       inkscape:locked="false"
-       id="guide895"
+       position="-31.532847,112.9927"
        orientation="1,0"
-       position="-31.532847,112.9927" />
+       id="guide895"
+       inkscape:locked="false" />
   </sodipodi:namedview>
   <g
-     transform="translate(0,-80)"
+     id="g16"
      style="stroke-width:4"
-     id="g16">
+     transform="translate(0,-80)">
     <path
-       d="m 1084,61.125 a 27.159795,27.159795 0 0 0 -27.0625,24.900391 l -16,191.999999 A 27.159795,27.159795 0 0 0 1068,307.4375 h 48 48 a 27.159795,27.159795 0 0 0 27.0625,-29.41211 l -16,-191.999999 A 27.159795,27.159795 0 0 0 1148,61.125 h -32 z"
-       id="rect2101-7"
-       style="display:inline;opacity:1;fill:#a7b0b7;fill-opacity:1;stroke:none;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
-       inkscape:original="M 1084 88.28125 L 1068 280.28125 L 1116 280.28125 L 1164 280.28125 L 1148 88.28125 L 1116 88.28125 L 1084 88.28125 z "
-       inkscape:radius="27.15708"
+       transform="matrix(0.10644519,0,0,0.10104106,-94.792832,93.936189)"
        sodipodi:type="inkscape:offset"
-       transform="matrix(0.10644519,0,0,0.10104106,-94.792832,93.936189)" />
-    <path
-       d="m 1084,61.125 a 27.159795,27.159795 0 0 0 -27.0625,24.900391 l -16,191.999999 A 27.159795,27.159795 0 0 0 1068,307.4375 h 48 48 a 27.159795,27.159795 0 0 0 27.0625,-29.41211 l -16,-191.999999 A 27.159795,27.159795 0 0 0 1148,61.125 h -32 z"
-       id="rect2101"
-       style="display:inline;opacity:1;fill:url(#linearGradient1134);fill-opacity:1;stroke:none;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
-       inkscape:original="M 1084 88.28125 L 1068 280.28125 L 1116 280.28125 L 1164 280.28125 L 1148 88.28125 L 1116 88.28125 L 1084 88.28125 z "
        inkscape:radius="27.15708"
+       inkscape:original="M 1084 88.28125 L 1068 280.28125 L 1116 280.28125 L 1164 280.28125 L 1148 88.28125 L 1116 88.28125 L 1084 88.28125 z "
+       style="display:inline;opacity:1;fill:#a7b0b7;fill-opacity:1;stroke:none;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+       id="rect2101-7"
+       d="m 1084,61.125 a 27.159795,27.159795 0 0 0 -27.0625,24.900391 l -16,191.999999 A 27.159795,27.159795 0 0 0 1068,307.4375 h 48 48 a 27.159795,27.159795 0 0 0 27.0625,-29.41211 l -16,-191.999999 A 27.159795,27.159795 0 0 0 1148,61.125 h -32 z" />
+    <path
+       transform="matrix(0.10577991,0,0,0.10104106,-94.100379,92.936189)"
        sodipodi:type="inkscape:offset"
-       transform="matrix(0.10577991,0,0,0.10104106,-94.100379,92.936189)" />
+       inkscape:radius="27.15708"
+       inkscape:original="M 1084 88.28125 L 1068 280.28125 L 1116 280.28125 L 1164 280.28125 L 1148 88.28125 L 1116 88.28125 L 1084 88.28125 z "
+       style="display:inline;opacity:1;fill:url(#linearGradient1134);fill-opacity:1;stroke:none;stroke-width:20;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+       id="rect2101"
+       d="m 1084,61.125 a 27.159795,27.159795 0 0 0 -27.0625,24.900391 l -16,191.999999 A 27.159795,27.159795 0 0 0 1068,307.4375 h 48 48 a 27.159795,27.159795 0 0 0 27.0625,-29.41211 l -16,-191.999999 A 27.159795,27.159795 0 0 0 1148,61.125 h -32 z" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:#758087;fill-opacity:1;stroke-width:1.54228604"
+       d="m 3.5716143,85.726043 c -0.8705634,0 -1.571414,0.69176 -1.571414,1.553054 V 114.44695 A 1.5871283,1.5288344 0 0 0 3.5716143,116 H 44.428386 c 0.870563,0 1.571414,-0.69327 1.571414,-1.55305 V 87.279097 a 1.5871283,1.5288344 0 0 0 -1.571414,-1.553054 z"
        id="path6"
-       d="m 3.5716143,85.726043 c -0.8705634,0 -1.571414,0.69176 -1.571414,1.553054 V 114.44695 A 1.5871283,1.5288344 0 0 0 3.5716143,116 H 44.428386 c 0.870563,0 1.571414,-0.69327 1.571414,-1.55305 V 87.279097 a 1.5871283,1.5288344 0 0 0 -1.571414,-1.553054 z" />
+       style="fill:#758087;fill-opacity:1;stroke-width:1.54228604"
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:#d1d7db;fill-opacity:1;stroke:#a7b0b7;stroke-width:0.97208714;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4.0227546,84.48603 c -0.8513379,0 -1.536711,0.669623 -1.536711,1.501395 v 27.025125 c 0,0.83178 0.6853731,1.50141 1.536711,1.50141 H 43.977248 c 0.851337,0 1.536708,-0.66963 1.536708,-1.50141 V 85.987425 c 0,-0.831772 -0.685371,-1.501395 -1.536708,-1.501395 z"
        id="path8"
-       d="m 4.0227546,84.48603 c -0.8513379,0 -1.536711,0.669623 -1.536711,1.501395 v 27.025125 c 0,0.83178 0.6853731,1.50141 1.536711,1.50141 H 43.977248 c 0.851337,0 1.536708,-0.66963 1.536708,-1.50141 V 85.987425 c 0,-0.831772 -0.685371,-1.501395 -1.536708,-1.501395 z" />
+       style="fill:#d1d7db;fill-opacity:1;stroke:#a7b0b7;stroke-width:0.97208714;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:#18262f;fill-opacity:1;stroke-width:1.67705083"
+       d="m 4,86 h 40 v 27 H 4 Z"
        id="path12-5"
-       d="m 4,86 h 40 v 27 H 4 Z" />
+       style="fill:#18262f;fill-opacity:1;stroke-width:1.67705083"
+       inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;fill:url(#radialGradient9531);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.81852001;enable-background:new"
-       id="rect9511"
-       width="40"
-       height="27"
+       y="86"
        x="4"
-       y="86" />
+       height="27"
+       width="40"
+       id="rect9511"
+       style="display:inline;fill:url(#radialGradient9531);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.81852001;enable-background:new" />
     <path
-       inkscape:connector-curvature="0"
-       id="path5549"
+       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#fcf4c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.2;marker:none;enable-background:accumulate"
        d="m 35.33032,96 c 0.743615,0.901048 1.194576,2.052713 1.194576,3.312215 0,2.878855 -2.333799,5.212665 -5.21268,5.212665 -1.259496,0 -2.411141,-0.45094 -3.312216,-1.19456 C 28.630295,106.01696 31.039699,108 33.918558,108 37.277257,108 40,105.27724 40,101.91855 40,99.039658 38.016959,96.630299 35.33032,96 Z"
-       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#fcf4c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.2;marker:none;enable-background:accumulate" />
+       id="path5549"
+       inkscape:connector-curvature="0" />
     <rect
-       ry="0"
-       rx="0"
-       y="90"
-       x="12"
-       height="2"
-       width="2"
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411"
        id="rect1046-5"
-       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:7.50822" />
-    <rect
-       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:7.50822"
-       id="rect1046-5-7"
-       width="2"
-       height="2"
-       x="8"
-       y="96"
+       width="1"
+       height="1"
+       x="12"
+       y="90"
        rx="0"
        ry="0" />
     <rect
-       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:7.50822"
-       id="rect1046-5-5"
-       width="2"
-       height="2"
-       x="12"
-       y="106"
+       ry="0"
        rx="0"
-       ry="0" />
+       y="96"
+       x="8"
+       height="1"
+       width="1"
+       id="rect1046-5-7"
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411" />
     <rect
-       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:7.50822"
-       id="rect1046-5-2"
-       width="2"
-       height="2"
-       x="32"
-       y="88"
+       ry="0"
        rx="0"
-       ry="0" />
+       y="106"
+       x="12"
+       height="1"
+       width="1"
+       id="rect1046-5-5"
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411" />
     <rect
-       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:7.50822"
-       id="rect1046-5-9"
-       width="2"
-       height="2"
-       x="20"
-       y="100"
+       ry="0"
        rx="0"
-       ry="0" />
+       y="88"
+       x="32"
+       height="1"
+       width="1"
+       id="rect1046-5-2"
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411" />
     <rect
-       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:7.50822"
-       id="rect1046-5-1"
-       width="2"
-       height="2"
-       x="24"
-       y="108"
+       ry="0"
        rx="0"
-       ry="0" />
+       y="100"
+       x="20"
+       height="1"
+       width="1"
+       id="rect1046-5-9"
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411" />
     <rect
        ry="0"
        rx="0"
-       y="92"
-       x="22"
-       height="2"
-       width="2"
+       y="108"
+       x="24"
+       height="1"
+       width="1"
+       id="rect1046-5-1"
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411" />
+    <rect
+       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:3.75411"
        id="rect1046-5-56"
-       style="fill:#fcf4c0;fill-rule:evenodd;stroke-width:7.50822" />
+       width="1"
+       height="1"
+       x="22"
+       y="92"
+       rx="0"
+       ry="0" />
   </g>
 </svg>