diff --git a/data.json b/data.json
index c0fbca92bd..ab9d410e6e 100644
--- a/data.json
+++ b/data.json
@@ -16190,11 +16190,6 @@
             "root": "system-config-samba"
         }
     },
-    "system-hibernate": {
-        "linux": {
-            "root": "system-hibernate"
-        }
-    },
     "system-lock-screen": {
         "linux": {
             "root": "system-lock-screen",
@@ -16207,15 +16202,6 @@
             ]
         }
     },
-    "system-restart": {
-        "linux": {
-            "root": "system-restart",
-            "symlinks": [
-                "un-reboot",
-                "xfsm-reboot"
-            ]
-        }
-    },
     "system-search": {
         "linux": {
             "root": "system-search",
@@ -16276,18 +16262,6 @@
             ]
         }
     },
-    "system-suspend": {
-        "linux": {
-            "root": "system-suspend",
-            "symlinks": [
-                "gnome-session-hibernate",
-                "gnome-session-suspend",
-                "system-suspend-hibernate",
-                "xfpm-suspend",
-                "xfsm-hibernate"
-            ]
-        }
-    },
     "systemback": {
         "linux": {
             "root": "systemback"
@@ -17191,6 +17165,11 @@
             ]
         }
     },
+    "un-reboot": {
+        "linux": {
+            "root": "un-reboot"
+        }
+    },
     "unetbootin": {
         "linux": {
             "root": "unetbootin"
diff --git a/icons/circle/48/system-hibernate.svg b/icons/circle/48/system-hibernate.svg
deleted file mode 100644
index 16b5205d08..0000000000
--- a/icons/circle/48/system-hibernate.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
- <defs>
-  <linearGradient id="linearGradient3764" x1="1" x2="47" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)">
-   <stop style="stop-color:#5d4b33;stop-opacity:1"/>
-   <stop offset="1" style="stop-color:#69553a;stop-opacity:1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m 36.31 5 c 5.859 4.062 9.688 10.831 9.688 18.5 c 0 12.426 -10.07 22.5 -22.5 22.5 c -7.669 0 -14.438 -3.828 -18.5 -9.688 c 1.037 1.822 2.306 3.499 3.781 4.969 c 4.085 3.712 9.514 5.969 15.469 5.969 c 12.703 0 23 -10.298 23 -23 c 0 -5.954 -2.256 -11.384 -5.969 -15.469 c -1.469 -1.475 -3.147 -2.744 -4.969 -3.781 z m 4.969 3.781 c 3.854 4.113 6.219 9.637 6.219 15.719 c 0 12.703 -10.297 23 -23 23 c -6.081 0 -11.606 -2.364 -15.719 -6.219 c 4.16 4.144 9.883 6.719 16.219 6.719 c 12.703 0 23 -10.298 23 -23 c 0 -6.335 -2.575 -12.06 -6.719 -16.219 z" style="opacity:0.05"/>
-  <path d="m 41.28 8.781 c 3.712 4.085 5.969 9.514 5.969 15.469 c 0 12.703 -10.297 23 -23 23 c -5.954 0 -11.384 -2.256 -15.469 -5.969 c 4.113 3.854 9.637 6.219 15.719 6.219 c 12.703 0 23 -10.298 23 -23 c 0 -6.081 -2.364 -11.606 -6.219 -15.719 z" style="opacity:0.1"/>
-  <path d="m 31.25 2.375 c 8.615 3.154 14.75 11.417 14.75 21.13 c 0 12.426 -10.07 22.5 -22.5 22.5 c -9.708 0 -17.971 -6.135 -21.12 -14.75 a 23 23 0 0 0 44.875 -7 a 23 23 0 0 0 -16 -21.875 z" style="opacity:0.2"/>
- </g>
- <g>
-  <path d="m 24 1 c 12.703 0 23 10.297 23 23 c 0 12.703 -10.297 23 -23 23 -12.703 0 -23 -10.297 -23 -23 0 -12.703 10.297 -23 23 -23 z" style="fill:url(#linearGradient3764);fill-opacity:1"/>
- </g>
- <g>
-  <g>
-   <g transform="translate(1,1)">
-    <g style="opacity:0.1">
-     <!-- color: #69553a -->
-     <g>
-      <path d="m 23.965 12 c -1.32 0.023 -2.371 1.105 -2.355 2.426 l 0 3.797 l -2.68 -2.684 c -0.453 -0.461 -1.078 -0.719 -1.727 -0.719 c -0.648 0 -1.266 0.254 -1.715 0.719 c -0.918 0.949 -0.895 2.461 0.051 3.383 l 2.691 2.691 l -3.797 0 c -0.867 -0.008 -1.672 0.445 -2.105 1.188 c -0.438 0.746 -0.438 1.668 0 2.414 c 0.434 0.742 1.238 1.195 2.105 1.188 l 3.797 0 l -2.684 2.68 c -0.617 0.605 -0.867 1.488 -0.648 2.324 c 0.223 0.836 0.871 1.484 1.707 1.707 c 0.836 0.219 1.719 -0.031 2.324 -0.648 l 2.68 -2.684 l 0 3.789 c -0.008 0.863 0.445 1.668 1.188 2.105 c 0.746 0.434 1.668 0.434 2.414 0 c 0.742 -0.438 1.199 -1.242 1.188 -2.105 l 0 -3.789 l 2.68 2.684 c 0.605 0.617 1.488 0.867 2.328 0.648 c 0.836 -0.223 1.484 -0.871 1.703 -1.707 c 0.219 -0.836 -0.027 -1.73 -0.648 -2.332 l -2.672 -2.672 l 3.789 0 c 0.648 0.008 1.266 -0.25 1.723 -0.711 c 0.457 -0.457 0.711 -1.074 0.699 -1.723 c -0.02 -1.32 -1.105 -2.371 -2.422 -2.355 l -3.801 0 l 2.695 -2.691 c 0.461 -0.449 0.719 -1.066 0.719 -1.715 c 0 -0.648 -0.262 -1.266 -0.727 -1.715 c -0.945 -0.918 -2.461 -0.895 -3.383 0.047 l -2.68 2.684 l 0 -3.797 c 0.008 -0.648 -0.25 -1.27 -0.711 -1.727 c -0.457 -0.457 -1.074 -0.707 -1.723 -0.699 m -0.004 0" style="fill:#000;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
-     </g>
-    </g>
-   </g>
-  </g>
- </g>
- <g>
-  <g>
-   <!-- color: #69553a -->
-   <g>
-    <path d="m 23.965 12 c -1.32 0.023 -2.371 1.105 -2.355 2.426 l 0 3.797 l -2.68 -2.684 c -0.453 -0.461 -1.078 -0.719 -1.727 -0.719 c -0.648 0 -1.266 0.254 -1.715 0.719 c -0.918 0.949 -0.895 2.461 0.051 3.383 l 2.691 2.691 l -3.797 0 c -0.867 -0.008 -1.672 0.445 -2.105 1.188 c -0.438 0.746 -0.438 1.668 0 2.414 c 0.434 0.742 1.238 1.195 2.105 1.188 l 3.797 0 l -2.684 2.68 c -0.617 0.605 -0.867 1.488 -0.648 2.324 c 0.223 0.836 0.871 1.484 1.707 1.707 c 0.836 0.219 1.719 -0.031 2.324 -0.648 l 2.68 -2.684 l 0 3.789 c -0.008 0.863 0.445 1.668 1.188 2.105 c 0.746 0.434 1.668 0.434 2.414 0 c 0.742 -0.438 1.199 -1.242 1.188 -2.105 l 0 -3.789 l 2.68 2.684 c 0.605 0.617 1.488 0.867 2.328 0.648 c 0.836 -0.223 1.484 -0.871 1.703 -1.707 c 0.219 -0.836 -0.027 -1.73 -0.648 -2.332 l -2.672 -2.672 l 3.789 0 c 0.648 0.008 1.266 -0.25 1.723 -0.711 c 0.457 -0.457 0.711 -1.074 0.699 -1.723 c -0.02 -1.32 -1.105 -2.371 -2.422 -2.355 l -3.801 0 l 2.695 -2.691 c 0.461 -0.449 0.719 -1.066 0.719 -1.715 c 0 -0.648 -0.262 -1.266 -0.727 -1.715 c -0.945 -0.918 -2.461 -0.895 -3.383 0.047 l -2.68 2.684 l 0 -3.797 c 0.008 -0.648 -0.25 -1.27 -0.711 -1.727 c -0.457 -0.457 -1.074 -0.707 -1.723 -0.699 m -0.004 0" style="fill:#f9f9f9;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
-   </g>
-  </g>
- </g>
- <g>
-  <path d="m 40.03 7.531 c 3.712 4.084 5.969 9.514 5.969 15.469 0 12.703 -10.297 23 -23 23 c -5.954 0 -11.384 -2.256 -15.469 -5.969 4.178 4.291 10.01 6.969 16.469 6.969 c 12.703 0 23 -10.298 23 -23 0 -6.462 -2.677 -12.291 -6.969 -16.469 z" style="opacity:0.1"/>
- </g>
-</svg>
diff --git a/icons/circle/48/system-suspend.svg b/icons/circle/48/system-suspend.svg
deleted file mode 100644
index c58e92f502..0000000000
--- a/icons/circle/48/system-suspend.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
- <defs>
-  <linearGradient id="linearGradient3764" x1="1" x2="47" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)">
-   <stop style="stop-color:#ffb821;stop-opacity:1"/>
-   <stop offset="1" style="stop-color:#ffbe34;stop-opacity:1"/>
-  </linearGradient>
- </defs>
- <g>
-  <path d="m 36.31 5 c 5.859 4.062 9.688 10.831 9.688 18.5 c 0 12.426 -10.07 22.5 -22.5 22.5 c -7.669 0 -14.438 -3.828 -18.5 -9.688 c 1.037 1.822 2.306 3.499 3.781 4.969 c 4.085 3.712 9.514 5.969 15.469 5.969 c 12.703 0 23 -10.298 23 -23 c 0 -5.954 -2.256 -11.384 -5.969 -15.469 c -1.469 -1.475 -3.147 -2.744 -4.969 -3.781 z m 4.969 3.781 c 3.854 4.113 6.219 9.637 6.219 15.719 c 0 12.703 -10.297 23 -23 23 c -6.081 0 -11.606 -2.364 -15.719 -6.219 c 4.16 4.144 9.883 6.719 16.219 6.719 c 12.703 0 23 -10.298 23 -23 c 0 -6.335 -2.575 -12.06 -6.719 -16.219 z" style="opacity:0.05"/>
-  <path d="m 41.28 8.781 c 3.712 4.085 5.969 9.514 5.969 15.469 c 0 12.703 -10.297 23 -23 23 c -5.954 0 -11.384 -2.256 -15.469 -5.969 c 4.113 3.854 9.637 6.219 15.719 6.219 c 12.703 0 23 -10.298 23 -23 c 0 -6.081 -2.364 -11.606 -6.219 -15.719 z" style="opacity:0.1"/>
-  <path d="m 31.25 2.375 c 8.615 3.154 14.75 11.417 14.75 21.13 c 0 12.426 -10.07 22.5 -22.5 22.5 c -9.708 0 -17.971 -6.135 -21.12 -14.75 a 23 23 0 0 0 44.875 -7 a 23 23 0 0 0 -16 -21.875 z" style="opacity:0.2"/>
- </g>
- <g>
-  <path d="m 24 1 c 12.703 0 23 10.297 23 23 c 0 12.703 -10.297 23 -23 23 -12.703 0 -23 -10.297 -23 -23 0 -12.703 10.297 -23 23 -23 z" style="fill:url(#linearGradient3764);fill-opacity:1"/>
- </g>
- <g>
-  <g>
-   <g transform="translate(1,1)">
-    <g style="opacity:0.1">
-     <!-- color: #ffbe34 -->
-     <g>
-      <path d="m 24.04 17 c -4.18 0 -7.336 2.238 -9.457 3.359 c -2.117 1.125 -3.262 2.305 -3.262 2.305 c -0.313 0.316 -0.313 0.914 0 1.23 c 0 0 0.426 0.414 1.164 0.965 l -1.266 1.34 c -0.301 0.324 -0.297 0.906 0.008 1.223 c 0.305 0.32 0.855 0.309 1.152 -0.02 l 1.52 -1.605 c 0.215 0.129 0.441 0.273 0.684 0.402 c 0.594 0.316 1.293 0.625 2.047 0.91 l -0.48 1.93 c -0.109 0.434 0.168 0.93 0.578 1.043 c 0.41 0.113 0.883 -0.18 0.984 -0.617 l 0.484 -1.844 c 1.449 0.41 3.129 0.707 5.03 0.773 l 0 1.742 c -0.008 0.453 0.383 0.867 0.809 0.867 c 0.426 0 0.813 -0.414 0.805 -0.867 l 0 -1.742 c 1.984 -0.07 3.723 -0.367 5.211 -0.805 l 0.48 1.906 c 0.109 0.434 0.59 0.727 1 0.605 c 0.41 -0.121 0.684 -0.629 0.566 -1.066 l -0.508 -1.977 c 0.699 -0.273 1.344 -0.566 1.898 -0.855 c 0.238 -0.129 0.469 -0.273 0.684 -0.402 l 1.418 1.5 c 0.297 0.32 0.844 0.324 1.145 0.008 c 0.301 -0.316 0.309 -0.891 0.016 -1.211 l -1.16 -1.234 c 0.738 -0.551 1.16 -0.965 1.16 -0.965 c 0.313 -0.316 0.313 -0.914 0 -1.23 c 0 0 -1.141 -1.18 -3.262 -2.305 c -2.121 -1.125 -5.277 -3.359 -9.457 -3.359 m 0.008 1.711 c 3.914 0 6.828 2.18 8.754 3.195 c 1.32 0.699 1.527 1.016 1.922 1.367 c -0.398 0.352 -0.602 0.664 -1.922 1.363 c -1.898 1 -4.766 2.035 -8.602 2.063 c -0.098 -0.023 -0.199 -0.023 -0.305 0 c -3.832 -0.027 -6.695 -1.059 -8.598 -2.063 c -1.32 -0.699 -1.527 -1.016 -1.922 -1.363 c 0.398 -0.355 0.602 -0.668 1.922 -1.367 c 1.926 -1.02 4.84 -3.195 8.75 -3.195 m 0 0" style="fill:#000;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
-     </g>
-    </g>
-   </g>
-  </g>
- </g>
- <g>
-  <g>
-   <!-- color: #ffbe34 -->
-   <g>
-    <path d="m 24.04 17 c -4.18 0 -7.336 2.238 -9.457 3.359 c -2.117 1.125 -3.262 2.305 -3.262 2.305 c -0.313 0.316 -0.313 0.914 0 1.23 c 0 0 0.426 0.414 1.164 0.965 l -1.266 1.34 c -0.301 0.324 -0.297 0.906 0.008 1.223 c 0.305 0.32 0.855 0.309 1.152 -0.02 l 1.52 -1.605 c 0.215 0.129 0.441 0.273 0.684 0.402 c 0.594 0.316 1.293 0.625 2.047 0.91 l -0.48 1.93 c -0.109 0.434 0.168 0.93 0.578 1.043 c 0.41 0.113 0.883 -0.18 0.984 -0.617 l 0.484 -1.844 c 1.449 0.41 3.129 0.707 5.03 0.773 l 0 1.742 c -0.008 0.453 0.383 0.867 0.809 0.867 c 0.426 0 0.813 -0.414 0.805 -0.867 l 0 -1.742 c 1.984 -0.07 3.723 -0.367 5.211 -0.805 l 0.48 1.906 c 0.109 0.434 0.59 0.727 1 0.605 c 0.41 -0.121 0.684 -0.629 0.566 -1.066 l -0.508 -1.977 c 0.699 -0.273 1.344 -0.566 1.898 -0.855 c 0.238 -0.129 0.469 -0.273 0.684 -0.402 l 1.418 1.5 c 0.297 0.32 0.844 0.324 1.145 0.008 c 0.301 -0.316 0.309 -0.891 0.016 -1.211 l -1.16 -1.234 c 0.738 -0.551 1.16 -0.965 1.16 -0.965 c 0.313 -0.316 0.313 -0.914 0 -1.23 c 0 0 -1.141 -1.18 -3.262 -2.305 c -2.121 -1.125 -5.277 -3.359 -9.457 -3.359 m 0.008 1.711 c 3.914 0 6.828 2.18 8.754 3.195 c 1.32 0.699 1.527 1.016 1.922 1.367 c -0.398 0.352 -0.602 0.664 -1.922 1.363 c -1.898 1 -4.766 2.035 -8.602 2.063 c -0.098 -0.023 -0.199 -0.023 -0.305 0 c -3.832 -0.027 -6.695 -1.059 -8.598 -2.063 c -1.32 -0.699 -1.527 -1.016 -1.922 -1.363 c 0.398 -0.355 0.602 -0.668 1.922 -1.367 c 1.926 -1.02 4.84 -3.195 8.75 -3.195 m 0 0" style="fill:#2d2d2d;fill-opacity:1;stroke:none;fill-rule:nonzero"/>
-   </g>
-  </g>
- </g>
- <g>
-  <path d="m 40.03 7.531 c 3.712 4.084 5.969 9.514 5.969 15.469 0 12.703 -10.297 23 -23 23 c -5.954 0 -11.384 -2.256 -15.469 -5.969 4.178 4.291 10.01 6.969 16.469 6.969 c 12.703 0 23 -10.298 23 -23 0 -6.462 -2.677 -12.291 -6.969 -16.469 z" style="opacity:0.1"/>
- </g>
-</svg>
diff --git a/icons/circle/48/system-restart.svg b/icons/circle/48/un-reboot.svg
similarity index 100%
rename from icons/circle/48/system-restart.svg
rename to icons/circle/48/un-reboot.svg
diff --git a/icons/shine/48/system-suspend.svg b/icons/shine/48/system-suspend.svg
deleted file mode 100644
index 924d0122e7..0000000000
--- a/icons/shine/48/system-suspend.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" xmlns:xlink="http://www.w3.org/1999/xlink">
-<defs>
-<linearGradient id="linearGradient3963">
-<stop offset="0" style="stop-color:#888a85"/>
-<stop offset="1" style="stop-color:#a7a9a3"/>
-</linearGradient>
-<linearGradient xlink:href="#linearGradient3963" id="linearGradient3969" y1="1052.362" y2="1003.362" x2="0" gradientUnits="userSpaceOnUse"/>
-</defs>
-<g transform="translate(0 -1004.3622)">
-<rect width="48" x="0" y="1004.348" height="48" style="fill:none"/>
-<rect width="48" x="0" y="1004.362" rx="1.945" height="48" style="fill:url(#linearGradient3969)"/>
-</g>
-<g style="fill:#fff" transform="translate(0 -1004.3622)">
-<path style="opacity:.15" d="m 2.4738922e-8,1004.3622 0,48 16.781249975261079,0 12.84375,-48 -29.624999975261076,0 z"/>
-<path style="line-height:normal;color:#000" d="m 24.0569,1020.1924 c -5.166667,0 -9.068243,2.6098 -11.6875,3.9196 -2.6192568,1.3096 -4.0312498,2.6875 -4.0312498,2.6875 -0.3842435,0.3717 -0.3842435,1.0657 0,1.4375 0,0 0.524519,0.4784 1.4375,1.125 l -1.5625,1.5625 c -0.373249,0.3752 -0.3685808,1.0578 0.00977,1.4278 0.3783466,0.3702 1.060792,0.3597 1.4277343,-0.022 l 1.8749995,-1.875 c 0.26596,0.1483 0.546365,0.3199 0.84375,0.4688 0.733657,0.3668 1.596758,0.7273 2.53125,1.0625 l -0.59375,2.25 c -0.131062,0.5073 0.211356,1.0881 0.718681,1.219 0.507325,0.1309 1.088036,-0.2116 1.218819,-0.719 l 0.59375,-2.1563 c 1.789367,0.4784 3.866739,0.8282 6.21875,0.9063 l 0,2.0312 c -0.0075,0.5282 0.471635,1.0142 1,1.0142 0.528365,0 1.007472,-0.4859 1,-1.0142 l 0,-2.0312 c 2.448125,-0.081 4.599022,-0.4284 6.4375,-0.9375 l 0.59375,2.2187 c 0.13755,0.5089 0.726905,0.846 1.235312,0.7067 0.508407,-0.1395 0.843414,-0.7301 0.702188,-1.238 l -0.625,-2.3125 c 0.861405,-0.3169 1.657887,-0.657 2.34375,-1 0.297385,-0.1488 0.57779,-0.3205 0.84375,-0.4688 l 1.75,1.75 c 0.369309,0.3713 1.041661,0.3759 1.416014,0.01 0.374353,-0.3662 0.384555,-1.0385 0.02149,-1.4159 l -1.4375,-1.4375 c 0.912981,-0.6466 1.4375,-1.125 1.4375,-1.125 0.384243,-0.3718 0.384243,-1.0657 0,-1.4375 0,0 -1.411993,-1.3779 -4.03125,-2.6875 -2.619257,-1.3098 -6.520833,-3.9196 -11.6875,-3.9196 z m 0,2 c 4.833333,0 8.431757,2.5417 10.8125,3.7321 1.633358,0.8166 1.886181,1.1815 2.375,1.5937 -0.488819,0.4122 -0.741642,0.7771 -2.375,1.5938 -2.348899,1.1743 -5.888908,2.3743 -10.625,2.4062 -0.123514,-0.024 -0.251486,-0.024 -0.375,0 -4.736092,-0.032 -8.276101,-1.2319 -10.625,-2.4062 -1.633358,-0.8167 -1.886181,-1.1816 -2.375,-1.5938 0.488819,-0.4122 0.741642,-0.7771 2.375,-1.5937 2.380743,-1.1904 5.979167,-3.7321 10.8125,-3.7321 z"/>
-</g>
-</svg>
diff --git a/icons/shine/48/system-restart.svg b/icons/shine/48/un-reboot.svg
similarity index 100%
rename from icons/shine/48/system-restart.svg
rename to icons/shine/48/un-reboot.svg
diff --git a/icons/square/48/system-hibernate.svg b/icons/square/48/system-hibernate.svg
deleted file mode 100644
index f31b2623be..0000000000
--- a/icons/square/48/system-hibernate.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<svg id="svg35548" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
- <defs id="defs35508">
-  <linearGradient id="linearGradient3764" x1="1" x2="47" gradientTransform="translate(-48 .0022147)" gradientUnits="userSpaceOnUse">
-   <stop id="stop35493" stop-color="#5d4b33" offset="0"/>
-   <stop id="stop35495" stop-color="#69553a" offset="1"/>
-  </linearGradient>
-  <clipPath id="clipPath-677025042">
-   <g id="g35500" transform="translate(0 -1004.4)">
-    <rect id="rect35498" x="1" y="1005.4" width="46" height="46" rx="4" fill="#1890d0"/>
-   </g>
-  </clipPath>
-  <clipPath id="clipPath-690008788">
-   <g id="g35505" transform="translate(0 -1004.4)">
-    <rect id="rect35503" x="1" y="1005.4" width="46" height="46" rx="4" fill="#1890d0"/>
-   </g>
-  </clipPath>
- </defs>
- <g id="g35516">
-  <path id="path35510" d="m1 43v0.25c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.25c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4zm0 0.5v0.5c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.5c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" opacity=".02"/>
-  <path id="path35512" d="m1 43.25v0.25c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.25c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" opacity=".05"/>
-  <path id="path35514" d="m1 43v0.25c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.25c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" opacity=".1"/>
- </g>
- <g id="g35520">
-  <rect id="rect35518" transform="rotate(-90)" x="-47" y="1" width="46" height="46" rx="4" fill="url(#linearGradient3764)"/>
- </g>
- <g id="g35530">
-  <g id="g35528" clip-path="url(#clipPath-677025042)">
-   <g id="g35526" opacity=".1">
-    <g id="g35524">
-     <path id="path35522" d="m23.965 12c-1.32 0.023-2.371 1.105-2.355 2.426v3.797l-2.68-2.684c-0.453-0.461-1.078-0.719-1.727-0.719-0.648 0-1.266 0.254-1.715 0.719-0.918 0.949-0.895 2.461 0.051 3.383l2.691 2.691h-3.797c-0.867-8e-3 -1.672 0.445-2.105 1.188-0.438 0.746-0.438 1.668 0 2.414 0.434 0.742 1.238 1.195 2.105 1.188h3.797l-2.684 2.68c-0.617 0.605-0.867 1.488-0.648 2.324 0.223 0.836 0.871 1.484 1.707 1.707 0.836 0.219 1.719-0.031 2.324-0.648l2.68-2.684v3.789c-8e-3 0.863 0.445 1.668 1.188 2.105 0.746 0.434 1.668 0.434 2.414 0 0.742-0.438 1.199-1.242 1.188-2.105v-3.789l2.68 2.684c0.605 0.617 1.488 0.867 2.328 0.648 0.836-0.223 1.484-0.871 1.703-1.707s-0.027-1.73-0.648-2.332l-2.672-2.672h3.789c0.648 8e-3 1.266-0.25 1.723-0.711 0.457-0.457 0.711-1.074 0.699-1.723-0.02-1.32-1.105-2.371-2.422-2.355h-3.801l2.695-2.691c0.461-0.449 0.719-1.066 0.719-1.715 0-0.648-0.262-1.266-0.727-1.715-0.945-0.918-2.461-0.895-3.383 0.047l-2.68 2.684v-3.797c8e-3 -0.648-0.25-1.27-0.711-1.727-0.457-0.457-1.074-0.707-1.723-0.699"/>
-    </g>
-   </g>
-  </g>
- </g>
- <g id="g35540">
-  <g id="g35538" clip-path="url(#clipPath-690008788)">
-   <g id="g35536" transform="translate(0,-1)">
-    <g id="g35534">
-     <path id="path35532" d="m23.965 12c-1.32 0.023-2.371 1.105-2.355 2.426v3.797l-2.68-2.684c-0.453-0.461-1.078-0.719-1.727-0.719-0.648 0-1.266 0.254-1.715 0.719-0.918 0.949-0.895 2.461 0.051 3.383l2.691 2.691h-3.797c-0.867-8e-3 -1.672 0.445-2.105 1.188-0.438 0.746-0.438 1.668 0 2.414 0.434 0.742 1.238 1.195 2.105 1.188h3.797l-2.684 2.68c-0.617 0.605-0.867 1.488-0.648 2.324 0.223 0.836 0.871 1.484 1.707 1.707 0.836 0.219 1.719-0.031 2.324-0.648l2.68-2.684v3.789c-8e-3 0.863 0.445 1.668 1.188 2.105 0.746 0.434 1.668 0.434 2.414 0 0.742-0.438 1.199-1.242 1.188-2.105v-3.789l2.68 2.684c0.605 0.617 1.488 0.867 2.328 0.648 0.836-0.223 1.484-0.871 1.703-1.707s-0.027-1.73-0.648-2.332l-2.672-2.672h3.789c0.648 8e-3 1.266-0.25 1.723-0.711 0.457-0.457 0.711-1.074 0.699-1.723-0.02-1.32-1.105-2.371-2.422-2.355h-3.801l2.695-2.691c0.461-0.449 0.719-1.066 0.719-1.715 0-0.648-0.262-1.266-0.727-1.715-0.945-0.918-2.461-0.895-3.383 0.047l-2.68 2.684v-3.797c8e-3 -0.648-0.25-1.27-0.711-1.727-0.457-0.457-1.074-0.707-1.723-0.699" fill="#f9f9f9"/>
-    </g>
-   </g>
-  </g>
- </g>
- <g id="g35546">
-  <g id="g35544" transform="translate(0 -1004.4)">
-   <path id="path35542" d="m1 1043.4v4c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-4c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" opacity=".1"/>
-  </g>
- </g>
-</svg>
diff --git a/icons/square/48/system-suspend.svg b/icons/square/48/system-suspend.svg
deleted file mode 100644
index d5e821e7e2..0000000000
--- a/icons/square/48/system-suspend.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<svg id="svg35806" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
- <defs id="defs35766">
-  <linearGradient id="linearGradient3764" x1="1" x2="47" gradientTransform="translate(-48 .0022147)" gradientUnits="userSpaceOnUse">
-   <stop id="stop35751" stop-color="#ffb821" offset="0"/>
-   <stop id="stop35753" stop-color="#ffbe34" offset="1"/>
-  </linearGradient>
-  <clipPath id="clipPath-332954508">
-   <g id="g35758" transform="translate(0 -1004.4)">
-    <rect id="rect35756" x="1" y="1005.4" width="46" height="46" rx="4" fill="#1890d0"/>
-   </g>
-  </clipPath>
-  <clipPath id="clipPath-346034937">
-   <g id="g35763" transform="translate(0 -1004.4)">
-    <rect id="rect35761" x="1" y="1005.4" width="46" height="46" rx="4" fill="#1890d0"/>
-   </g>
-  </clipPath>
- </defs>
- <g id="g35774">
-  <path id="path35768" d="m1 43v0.25c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.25c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4zm0 0.5v0.5c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.5c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" opacity=".02"/>
-  <path id="path35770" d="m1 43.25v0.25c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.25c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" opacity=".05"/>
-  <path id="path35772" d="m1 43v0.25c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-0.25c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" opacity=".1"/>
- </g>
- <g id="g35778">
-  <rect id="rect35776" transform="rotate(-90)" x="-47" y="1" width="46" height="46" rx="4" fill="url(#linearGradient3764)"/>
- </g>
- <g id="g35788">
-  <g id="g35786" clip-path="url(#clipPath-332954508)">
-   <g id="g35784" opacity=".1">
-    <g id="g35782">
-     <path id="path35780" d="m24.04 17c-4.18 0-7.336 2.238-9.457 3.359-2.117 1.125-3.262 2.305-3.262 2.305-0.313 0.316-0.313 0.914 0 1.23 0 0 0.426 0.414 1.164 0.965l-1.266 1.34c-0.301 0.324-0.297 0.906 8e-3 1.223 0.305 0.32 0.855 0.309 1.152-0.02l1.52-1.605c0.215 0.129 0.441 0.273 0.684 0.402 0.594 0.316 1.293 0.625 2.047 0.91l-0.48 1.93c-0.109 0.434 0.168 0.93 0.578 1.043s0.883-0.18 0.984-0.617l0.484-1.844c1.449 0.41 3.129 0.707 5.03 0.773v1.742c-8e-3 0.453 0.383 0.867 0.809 0.867s0.813-0.414 0.805-0.867v-1.742c1.984-0.07 3.723-0.367 5.211-0.805l0.48 1.906c0.109 0.434 0.59 0.727 1 0.605 0.41-0.121 0.684-0.629 0.566-1.066l-0.508-1.977c0.699-0.273 1.344-0.566 1.898-0.855 0.238-0.129 0.469-0.273 0.684-0.402l1.418 1.5c0.297 0.32 0.844 0.324 1.145 8e-3s0.309-0.891 0.016-1.211l-1.16-1.234c0.738-0.551 1.16-0.965 1.16-0.965 0.313-0.316 0.313-0.914 0-1.23 0 0-1.141-1.18-3.262-2.305s-5.277-3.359-9.457-3.359m8e-3 1.711c3.914 0 6.828 2.18 8.754 3.195 1.32 0.699 1.527 1.016 1.922 1.367-0.398 0.352-0.602 0.664-1.922 1.363-1.898 1-4.766 2.035-8.602 2.063-0.098-0.023-0.199-0.023-0.305 0-3.832-0.027-6.695-1.059-8.598-2.063-1.32-0.699-1.527-1.016-1.922-1.363 0.398-0.355 0.602-0.668 1.922-1.367 1.926-1.02 4.84-3.195 8.75-3.195"/>
-    </g>
-   </g>
-  </g>
- </g>
- <g id="g35798">
-  <g id="g35796" clip-path="url(#clipPath-346034937)">
-   <g id="g35794" transform="translate(0,-1)">
-    <g id="g35792">
-     <path id="path35790" d="m24.04 17c-4.18 0-7.336 2.238-9.457 3.359-2.117 1.125-3.262 2.305-3.262 2.305-0.313 0.316-0.313 0.914 0 1.23 0 0 0.426 0.414 1.164 0.965l-1.266 1.34c-0.301 0.324-0.297 0.906 8e-3 1.223 0.305 0.32 0.855 0.309 1.152-0.02l1.52-1.605c0.215 0.129 0.441 0.273 0.684 0.402 0.594 0.316 1.293 0.625 2.047 0.91l-0.48 1.93c-0.109 0.434 0.168 0.93 0.578 1.043s0.883-0.18 0.984-0.617l0.484-1.844c1.449 0.41 3.129 0.707 5.03 0.773v1.742c-8e-3 0.453 0.383 0.867 0.809 0.867s0.813-0.414 0.805-0.867v-1.742c1.984-0.07 3.723-0.367 5.211-0.805l0.48 1.906c0.109 0.434 0.59 0.727 1 0.605 0.41-0.121 0.684-0.629 0.566-1.066l-0.508-1.977c0.699-0.273 1.344-0.566 1.898-0.855 0.238-0.129 0.469-0.273 0.684-0.402l1.418 1.5c0.297 0.32 0.844 0.324 1.145 8e-3s0.309-0.891 0.016-1.211l-1.16-1.234c0.738-0.551 1.16-0.965 1.16-0.965 0.313-0.316 0.313-0.914 0-1.23 0 0-1.141-1.18-3.262-2.305s-5.277-3.359-9.457-3.359m8e-3 1.711c3.914 0 6.828 2.18 8.754 3.195 1.32 0.699 1.527 1.016 1.922 1.367-0.398 0.352-0.602 0.664-1.922 1.363-1.898 1-4.766 2.035-8.602 2.063-0.098-0.023-0.199-0.023-0.305 0-3.832-0.027-6.695-1.059-8.598-2.063-1.32-0.699-1.527-1.016-1.922-1.363 0.398-0.355 0.602-0.668 1.922-1.367 1.926-1.02 4.84-3.195 8.75-3.195" fill="#2d2d2d"/>
-    </g>
-   </g>
-  </g>
- </g>
- <g id="g35804">
-  <g id="g35802" transform="translate(0 -1004.4)">
-   <path id="path35800" d="m1 1043.4v4c0 2.216 1.784 4 4 4h38c2.216 0 4-1.784 4-4v-4c0 2.216-1.784 4-4 4h-38c-2.216 0-4-1.784-4-4z" opacity=".1"/>
-  </g>
- </g>
-</svg>
diff --git a/icons/square/48/system-restart.svg b/icons/square/48/un-reboot.svg
similarity index 100%
rename from icons/square/48/system-restart.svg
rename to icons/square/48/un-reboot.svg
diff --git a/icons/utouch/48/system-hibernate.svg b/icons/utouch/48/system-hibernate.svg
deleted file mode 100644
index ece1b9ece4..0000000000
--- a/icons/utouch/48/system-hibernate.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><radialGradient id="thisWeirdIdNameFixesABug0" cx="24" cy="24" r="23.437" gradientUnits="userSpaceOnUse"><stop stop-color="#69553a"/><stop offset="1" stop-color="#49351a"/></radialGradient></defs><path d="m 47.44 11.547 l 0 24.906 c 0 10.25 0 10.984 -10.984 10.984 l -24.902 0 c -10.988 0 -10.988 -0.734 -10.988 -10.984 l 0 -24.906 c 0 -10.25 0 -10.984 10.988 -10.984 l 24.902 0 c 10.984 0 10.984 0.734 10.984 10.984" fill="url(#thisWeirdIdNameFixesABug0)"/><!-- color: #69553a --><path d="m 23.965 12 c -1.32 0.023 -2.371 1.105 -2.355 2.426 l 0 3.797 l -2.68 -2.684 c -0.453 -0.461 -1.078 -0.719 -1.727 -0.719 c -0.648 0 -1.266 0.254 -1.715 0.719 c -0.918 0.949 -0.895 2.461 0.051 3.383 l 2.691 2.691 l -3.797 0 c -0.867 -0.008 -1.672 0.445 -2.105 1.188 c -0.438 0.746 -0.438 1.668 0 2.414 c 0.434 0.742 1.238 1.195 2.105 1.188 l 3.797 0 l -2.684 2.68 c -0.617 0.605 -0.867 1.488 -0.648 2.324 c 0.223 0.836 0.871 1.484 1.707 1.707 c 0.836 0.219 1.719 -0.031 2.324 -0.648 l 2.68 -2.684 l 0 3.789 c -0.008 0.863 0.445 1.668 1.188 2.105 c 0.746 0.434 1.668 0.434 2.414 0 c 0.742 -0.438 1.199 -1.242 1.188 -2.105 l 0 -3.789 l 2.68 2.684 c 0.605 0.617 1.488 0.867 2.328 0.648 c 0.836 -0.223 1.484 -0.871 1.703 -1.707 c 0.219 -0.836 -0.027 -1.73 -0.648 -2.332 l -2.672 -2.672 l 3.789 0 c 0.648 0.008 1.266 -0.25 1.723 -0.711 c 0.457 -0.457 0.711 -1.074 0.699 -1.723 c -0.02 -1.32 -1.105 -2.371 -2.422 -2.355 l -3.801 0 l 2.695 -2.691 c 0.461 -0.449 0.719 -1.066 0.719 -1.715 c 0 -0.648 -0.262 -1.266 -0.727 -1.715 c -0.945 -0.918 -2.461 -0.895 -3.383 0.047 l -2.68 2.684 l 0 -3.797 c 0.008 -0.648 -0.25 -1.27 -0.711 -1.727 c -0.457 -0.457 -1.074 -0.707 -1.723 -0.699 m -0.004 0" fill="#fff"/><path d="m 38.27 47.44 c 2.543 -0.012 4.379 -0.082 5.711 -0.441 l -4.23 -7.25 -4.484 7.691 1.191 0 c 0.641 0 1.242 0 1.813 0 z m 1.48 -7.691 -5.125 -8.789 -5.129 8.789 z m 0 0 7.652 0 c 0.031 -0.973 0.039 -2.063 0.039 -3.297 l 0 -1.098 -2.563 -4.395 z m 5.129 -8.789 -5.129 -8.789 -5.125 8.789 z m 0 0 2.563 0 0 -4.395 z m -10.254 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -5.129 8.789 10.254 0 z m 0 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -5.129 8.789 10.254 0 z m 0 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -3.297 5.648 c 0 1.168 0.012 2.211 0.039 3.141 l 8.383 0 z m 0 0 -3.297 -5.648 0 5.648 z m 5.125 8.789 -4.313 7.395 c 1.598 0.293 3.809 0.297 6.879 0.297 l 1.922 0 z m 0 -17.578 -5.125 -8.789 -3.297 5.648 0 3.141 z m 0 0 10.254 0 -5.125 -8.789 z m 5.129 -8.789 -5.129 -8.789 -5.125 8.789 z m 0 0 10.254 0 -5.129 -8.789 z m 5.125 -8.789 -2.352 -4.03 -5.336 0 c -0.078 0 -0.141 0 -0.215 0 l -2.352 4.03 z m 0 0 10.254 0 -2.352 -4.03 -5.551 0 z m 10.254 0 10.254 0 l -2.352 -4.03 c -0.313 0 -0.609 0 -0.941 0 l -4.609 0 z m 0 0 -5.125 8.789 10.254 0 z m 5.129 8.789 10.254 0 -5.129 -8.789 z m 0 0 -5.129 8.789 10.254 0 z m 5.125 8.789 7.691 0 0 -4.395 -2.563 -4.395 z m 5.129 -8.789 2.563 0 0 -1.832 c 0 -0.914 -0.008 -1.75 -0.023 -2.523 z m -15.383 8.789 -5.125 -8.789 -5.129 8.789 z m 10.254 -17.578 7.309 0 c -0.555 -2.758 -1.887 -3.629 -5.03 -3.902 z m -30.762 0 l -2.305 -3.953 c -3.66 0.207 -5.141 0.996 -5.734 3.953 z m -5.125 8.789 l -3.238 -5.555 c -0.043 1.074 -0.059 2.309 -0.059 3.723 l 0 1.832 z m 15.379 26.367 -4.484 7.691 8.973 0 z m 10.254 0 -4.484 7.691 8.973 0 z m -26.898 6.621 -1.602 -2.746 c 0.293 1.316 0.785 2.18 1.602 2.746 z" fill="#fff" fill-opacity="0.0383442265795207"/></svg>
\ No newline at end of file
diff --git a/icons/utouch/48/system-suspend.svg b/icons/utouch/48/system-suspend.svg
deleted file mode 100644
index 732dfaf39f..0000000000
--- a/icons/utouch/48/system-suspend.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><radialGradient id="thisWeirdIdNameFixesABug0" cx="24" cy="24" r="23.437" gradientUnits="userSpaceOnUse"><stop stop-color="#ffbe34"/><stop offset="1" stop-color="#df9e14"/></radialGradient></defs><path d="m 47.44 11.547 l 0 24.906 c 0 10.25 0 10.984 -10.984 10.984 l -24.902 0 c -10.988 0 -10.988 -0.734 -10.988 -10.984 l 0 -24.906 c 0 -10.25 0 -10.984 10.988 -10.984 l 24.902 0 c 10.984 0 10.984 0.734 10.984 10.984" fill="url(#thisWeirdIdNameFixesABug0)"/><!-- color: #ffbe34 --><path d="m 24.04 17 c -4.18 0 -7.336 2.238 -9.457 3.359 c -2.117 1.125 -3.262 2.305 -3.262 2.305 c -0.313 0.316 -0.313 0.914 0 1.23 c 0 0 0.426 0.414 1.164 0.965 l -1.266 1.34 c -0.301 0.324 -0.297 0.906 0.008 1.223 c 0.305 0.32 0.855 0.309 1.152 -0.02 l 1.52 -1.605 c 0.215 0.129 0.441 0.273 0.684 0.402 c 0.594 0.316 1.293 0.625 2.047 0.91 l -0.48 1.93 c -0.109 0.434 0.168 0.93 0.578 1.043 c 0.41 0.113 0.883 -0.18 0.984 -0.617 l 0.484 -1.844 c 1.449 0.41 3.129 0.707 5.03 0.773 l 0 1.742 c -0.008 0.453 0.383 0.867 0.809 0.867 c 0.426 0 0.813 -0.414 0.805 -0.867 l 0 -1.742 c 1.984 -0.07 3.723 -0.367 5.211 -0.805 l 0.48 1.906 c 0.109 0.434 0.59 0.727 1 0.605 c 0.41 -0.121 0.684 -0.629 0.566 -1.066 l -0.508 -1.977 c 0.699 -0.273 1.344 -0.566 1.898 -0.855 c 0.238 -0.129 0.469 -0.273 0.684 -0.402 l 1.418 1.5 c 0.297 0.32 0.844 0.324 1.145 0.008 c 0.301 -0.316 0.309 -0.891 0.016 -1.211 l -1.16 -1.234 c 0.738 -0.551 1.16 -0.965 1.16 -0.965 c 0.313 -0.316 0.313 -0.914 0 -1.23 c 0 0 -1.141 -1.18 -3.262 -2.305 c -2.121 -1.125 -5.277 -3.359 -9.457 -3.359 m 0.008 1.711 c 3.914 0 6.828 2.18 8.754 3.195 c 1.32 0.699 1.527 1.016 1.922 1.367 c -0.398 0.352 -0.602 0.664 -1.922 1.363 c -1.898 1 -4.766 2.035 -8.602 2.063 c -0.098 -0.023 -0.199 -0.023 -0.305 0 c -3.832 -0.027 -6.695 -1.059 -8.598 -2.063 c -1.32 -0.699 -1.527 -1.016 -1.922 -1.363 c 0.398 -0.355 0.602 -0.668 1.922 -1.367 c 1.926 -1.02 4.84 -3.195 8.75 -3.195 m 0 0" fill="#fff"/><path d="m 38.27 47.44 c 2.543 -0.012 4.379 -0.082 5.711 -0.441 l -4.23 -7.25 -4.484 7.691 1.191 0 c 0.641 0 1.242 0 1.813 0 z m 1.48 -7.691 -5.125 -8.789 -5.129 8.789 z m 0 0 7.652 0 c 0.031 -0.973 0.039 -2.063 0.039 -3.297 l 0 -1.098 -2.563 -4.395 z m 5.129 -8.789 -5.129 -8.789 -5.125 8.789 z m 0 0 2.563 0 0 -4.395 z m -10.254 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -5.129 8.789 10.254 0 z m 0 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -5.129 8.789 10.254 0 z m 0 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -3.297 5.648 c 0 1.168 0.012 2.211 0.039 3.141 l 8.383 0 z m 0 0 -3.297 -5.648 0 5.648 z m 5.125 8.789 -4.313 7.395 c 1.598 0.293 3.809 0.297 6.879 0.297 l 1.922 0 z m 0 -17.578 -5.125 -8.789 -3.297 5.648 0 3.141 z m 0 0 10.254 0 -5.125 -8.789 z m 5.129 -8.789 -5.129 -8.789 -5.125 8.789 z m 0 0 10.254 0 -5.129 -8.789 z m 5.125 -8.789 -2.352 -4.03 -5.336 0 c -0.078 0 -0.141 0 -0.215 0 l -2.352 4.03 z m 0 0 10.254 0 -2.352 -4.03 -5.551 0 z m 10.254 0 10.254 0 l -2.352 -4.03 c -0.313 0 -0.609 0 -0.941 0 l -4.609 0 z m 0 0 -5.125 8.789 10.254 0 z m 5.129 8.789 10.254 0 -5.129 -8.789 z m 0 0 -5.129 8.789 10.254 0 z m 5.125 8.789 7.691 0 0 -4.395 -2.563 -4.395 z m 5.129 -8.789 2.563 0 0 -1.832 c 0 -0.914 -0.008 -1.75 -0.023 -2.523 z m -15.383 8.789 -5.125 -8.789 -5.129 8.789 z m 10.254 -17.578 7.309 0 c -0.555 -2.758 -1.887 -3.629 -5.03 -3.902 z m -30.762 0 l -2.305 -3.953 c -3.66 0.207 -5.141 0.996 -5.734 3.953 z m -5.125 8.789 l -3.238 -5.555 c -0.043 1.074 -0.059 2.309 -0.059 3.723 l 0 1.832 z m 15.379 26.367 -4.484 7.691 8.973 0 z m 10.254 0 -4.484 7.691 8.973 0 z m -26.898 6.621 -1.602 -2.746 c 0.293 1.316 0.785 2.18 1.602 2.746 z" fill="#fff" fill-opacity="0.09259259259259259"/></svg>
\ No newline at end of file
diff --git a/icons/utouch/48/system-restart.svg b/icons/utouch/48/un-reboot.svg
similarity index 98%
rename from icons/utouch/48/system-restart.svg
rename to icons/utouch/48/un-reboot.svg
index 4ecf7f85a9..d673cba2d6 100644
--- a/icons/utouch/48/system-restart.svg
+++ b/icons/utouch/48/un-reboot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><radialGradient id="thisWeirdIdNameFixesABug0" cx="24" cy="24" r="23.437" gradientUnits="userSpaceOnUse"><stop stop-color="#30bd65"/><stop offset="1" stop-color="#109d45"/></radialGradient></defs><path d="m 47.44 11.547 l 0 24.906 c 0 10.25 0 10.984 -10.984 10.984 l -24.902 0 c -10.988 0 -10.988 -0.734 -10.988 -10.984 l 0 -24.906 c 0 -10.25 0 -10.984 10.988 -10.984 l 24.902 0 c 10.984 0 10.984 0.734 10.984 10.984" fill="url(#thisWeirdIdNameFixesABug0)"/><!-- color: #30bd65 --><path d="m 34.559 19.613 c -1.828 -4.02 -5.922 -6.613 -10.531 -6.613 c -4.715 0 -9.03 2.832 -10.73 7.04 l 3.578 1.324 c 1.133 -2.809 4.01 -4.688 7.152 -4.688 c 3.035 0 5.719 1.68 6.961 4.301 l -2.609 1 l 6.672 3.688 l 1.953 -6.977 m -2.445 0.93" fill="#fff"/><path d="m 24.03 31.33 c -3.01 0 -5.75 -1.727 -6.977 -4.344 l 2.563 -0.945 l -6.598 -3.602 l -2.02 6.793 l 2.461 -0.91 c 1.793 4.01 5.98 6.68 10.562 6.68 c 4.734 0 8.922 -2.719 10.688 -6.926 l -3.566 -1.355 c -1.168 2.809 -3.965 4.621 -7.121 4.621 m 0 -0.004" fill="#fff"/><path d="m 38.27 47.44 c 2.543 -0.012 4.379 -0.082 5.711 -0.441 l -4.23 -7.25 -4.484 7.691 1.191 0 c 0.641 0 1.242 0 1.813 0 z m 1.48 -7.691 -5.125 -8.789 -5.129 8.789 z m 0 0 7.652 0 c 0.031 -0.973 0.039 -2.063 0.039 -3.297 l 0 -1.098 -2.563 -4.395 z m 5.129 -8.789 -5.129 -8.789 -5.125 8.789 z m 0 0 2.563 0 0 -4.395 z m -10.254 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -5.129 8.789 10.254 0 z m 0 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -5.129 8.789 10.254 0 z m 0 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -3.297 5.648 c 0 1.168 0.012 2.211 0.039 3.141 l 8.383 0 z m 0 0 -3.297 -5.648 0 5.648 z m 5.125 8.789 -4.313 7.395 c 1.598 0.293 3.809 0.297 6.879 0.297 l 1.922 0 z m 0 -17.578 -5.125 -8.789 -3.297 5.648 0 3.141 z m 0 0 10.254 0 -5.125 -8.789 z m 5.129 -8.789 -5.129 -8.789 -5.125 8.789 z m 0 0 10.254 0 -5.129 -8.789 z m 5.125 -8.789 -2.352 -4.03 -5.336 0 c -0.078 0 -0.141 0 -0.215 0 l -2.352 4.03 z m 0 0 10.254 0 -2.352 -4.03 -5.551 0 z m 10.254 0 10.254 0 l -2.352 -4.03 c -0.313 0 -0.609 0 -0.941 0 l -4.609 0 z m 0 0 -5.125 8.789 10.254 0 z m 5.129 8.789 10.254 0 -5.129 -8.789 z m 0 0 -5.129 8.789 10.254 0 z m 5.125 8.789 7.691 0 0 -4.395 -2.563 -4.395 z m 5.129 -8.789 2.563 0 0 -1.832 c 0 -0.914 -0.008 -1.75 -0.023 -2.523 z m -15.383 8.789 -5.125 -8.789 -5.129 8.789 z m 10.254 -17.578 7.309 0 c -0.555 -2.758 -1.887 -3.629 -5.03 -3.902 z m -30.762 0 l -2.305 -3.953 c -3.66 0.207 -5.141 0.996 -5.734 3.953 z m -5.125 8.789 l -3.238 -5.555 c -0.043 1.074 -0.059 2.309 -0.059 3.723 l 0 1.832 z m 15.379 26.367 -4.484 7.691 8.973 0 z m 10.254 0 -4.484 7.691 8.973 0 z m -26.898 6.621 -1.602 -2.746 c 0.293 1.316 0.785 2.18 1.602 2.746 z" fill="#fff" fill-opacity="0.0579520697167756"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><defs><radialGradient id="thisWeirdIdNameFixesABug0" cx="24" cy="24" r="23.437" gradientUnits="userSpaceOnUse"><stop stop-color="#30bd65"/><stop offset="1" stop-color="#109d45"/></radialGradient></defs><path d="m 47.44 11.547 l 0 24.906 c 0 10.25 0 10.984 -10.984 10.984 l -24.902 0 c -10.988 0 -10.988 -0.734 -10.988 -10.984 l 0 -24.906 c 0 -10.25 0 -10.984 10.988 -10.984 l 24.902 0 c 10.984 0 10.984 0.734 10.984 10.984" fill="url(#thisWeirdIdNameFixesABug0)"/><!-- color: #30bd65 --><path d="m 34.559 19.613 c -1.828 -4.02 -5.922 -6.613 -10.531 -6.613 c -4.715 0 -9.03 2.832 -10.73 7.04 l 3.578 1.324 c 1.133 -2.809 4.01 -4.688 7.152 -4.688 c 3.035 0 5.719 1.68 6.961 4.301 l -2.609 1 l 6.672 3.688 l 1.953 -6.977 m -2.445 0.93" fill="#fff"/><path d="m 24.03 31.33 c -3.01 0 -5.75 -1.727 -6.977 -4.344 l 2.563 -0.945 l -6.598 -3.602 l -2.02 6.793 l 2.461 -0.91 c 1.793 4.01 5.98 6.68 10.562 6.68 c 4.734 0 8.922 -2.719 10.688 -6.926 l -3.566 -1.355 c -1.168 2.809 -3.965 4.621 -7.121 4.621 m 0 -0.004" fill="#fff"/><path d="m 38.27 47.44 c 2.543 -0.012 4.379 -0.082 5.711 -0.441 l -4.23 -7.25 -4.484 7.691 1.191 0 c 0.641 0 1.242 0 1.813 0 z m 1.48 -7.691 -5.125 -8.789 -5.129 8.789 z m 0 0 7.652 0 c 0.031 -0.973 0.039 -2.063 0.039 -3.297 l 0 -1.098 -2.563 -4.395 z m 5.129 -8.789 -5.129 -8.789 -5.125 8.789 z m 0 0 2.563 0 0 -4.395 z m -10.254 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -5.129 8.789 10.254 0 z m 0 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -5.129 8.789 10.254 0 z m 0 0 -5.129 -8.789 -5.125 8.789 z m -10.254 0 -3.297 5.648 c 0 1.168 0.012 2.211 0.039 3.141 l 8.383 0 z m 0 0 -3.297 -5.648 0 5.648 z m 5.125 8.789 -4.313 7.395 c 1.598 0.293 3.809 0.297 6.879 0.297 l 1.922 0 z m 0 -17.578 -5.125 -8.789 -3.297 5.648 0 3.141 z m 0 0 10.254 0 -5.125 -8.789 z m 5.129 -8.789 -5.129 -8.789 -5.125 8.789 z m 0 0 10.254 0 -5.129 -8.789 z m 5.125 -8.789 -2.352 -4.03 -5.336 0 c -0.078 0 -0.141 0 -0.215 0 l -2.352 4.03 z m 0 0 10.254 0 -2.352 -4.03 -5.551 0 z m 10.254 0 10.254 0 l -2.352 -4.03 c -0.313 0 -0.609 0 -0.941 0 l -4.609 0 z m 0 0 -5.125 8.789 10.254 0 z m 5.129 8.789 10.254 0 -5.129 -8.789 z m 0 0 -5.129 8.789 10.254 0 z m 5.125 8.789 7.691 0 0 -4.395 -2.563 -4.395 z m 5.129 -8.789 2.563 0 0 -1.832 c 0 -0.914 -0.008 -1.75 -0.023 -2.523 z m -15.383 8.789 -5.125 -8.789 -5.129 8.789 z m 10.254 -17.578 7.309 0 c -0.555 -2.758 -1.887 -3.629 -5.03 -3.902 z m -30.762 0 l -2.305 -3.953 c -3.66 0.207 -5.141 0.996 -5.734 3.953 z m -5.125 8.789 l -3.238 -5.555 c -0.043 1.074 -0.059 2.309 -0.059 3.723 l 0 1.832 z m 15.379 26.367 -4.484 7.691 8.973 0 z m 10.254 0 -4.484 7.691 8.973 0 z m -26.898 6.621 -1.602 -2.746 c 0.293 1.316 0.785 2.18 1.602 2.746 z" fill="#fff" fill-opacity="0.0579520697167756"/></svg>