diff --git a/tools/work/Papirus/actions/_TEMPLATE@16x16.SVG b/tools/work/Papirus/actions/_TEMPLATE@16x16.SVG
index 50bbe3210c..8ec62868d9 100644
--- a/tools/work/Papirus/actions/_TEMPLATE@16x16.SVG
+++ b/tools/work/Papirus/actions/_TEMPLATE@16x16.SVG
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
  <defs>
-  <style type="text/css" id="current-color-scheme">
+  <style id="current-color-scheme" type="text/css">
    .ColorScheme-Text { color:#444444; } .ColorScheme-Highlight { color:#5294e2; }
   </style>
  </defs>
diff --git a/tools/work/Papirus/actions/_TEMPLATE@22x22.SVG b/tools/work/Papirus/actions/_TEMPLATE@22x22.SVG
index 92bc036b86..f0f9c03ed9 100644
--- a/tools/work/Papirus/actions/_TEMPLATE@22x22.SVG
+++ b/tools/work/Papirus/actions/_TEMPLATE@22x22.SVG
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 22 22">
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22">
  <defs>
-  <style type="text/css" id="current-color-scheme">
+  <style id="current-color-scheme" type="text/css">
    .ColorScheme-Text { color:#444444; } .ColorScheme-Highlight { color:#5294e2; }
   </style>
  </defs>
- <path style="fill:currentColor" class="ColorScheme-Text" transform="translate(3 3)" d="M 2,0 2,16 4,16 4,7 7,7 8,9 14,9 14,2 10,2 9,0 4,0 2,0 Z"/>
- <path style="fill:currentColor" class="ColorScheme-Highlight" transform="translate(3 3)" d="M 4,0 4,7 7,7 8,9 14,9 14,2 10,2 9,0 4,0 Z"/>
+ <g transform="translate(3,3)">
+  <path style="fill:currentColor" class="ColorScheme-Text" d="M 2,0 2,16 4,16 4,7 7,7 8,9 14,9 14,2 10,2 9,0 4,0 2,0 Z"/>
+  <path style="fill:currentColor" class="ColorScheme-Highlight" d="M 4,0 4,7 7,7 8,9 14,9 14,2 10,2 9,0 4,0 Z"/>
+ </g>
 </svg>
diff --git a/tools/work/Papirus/actions/_TEMPLATE@24x24.SVG b/tools/work/Papirus/actions/_TEMPLATE@24x24.SVG
index aac9f27b97..184a25468a 100644
--- a/tools/work/Papirus/actions/_TEMPLATE@24x24.SVG
+++ b/tools/work/Papirus/actions/_TEMPLATE@24x24.SVG
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
  <defs>
-  <style type="text/css" id="current-color-scheme">
+  <style id="current-color-scheme" type="text/css">
    .ColorScheme-Text { color:#444444; } .ColorScheme-Highlight { color:#5294e2; }
   </style>
  </defs>
- <path style="fill:currentColor" class="ColorScheme-Text" transform="translate(4 4)" d="M 2,0 2,16 4,16 4,7 7,7 8,9 14,9 14,2 10,2 9,0 4,0 2,0 Z"/>
- <path style="fill:currentColor" class="ColorScheme-Highlight" transform="translate(4 4)" d="M 4,0 4,7 7,7 8,9 14,9 14,2 10,2 9,0 4,0 Z"/>
+ <g transform="translate(4,4)">
+  <path style="fill:currentColor" class="ColorScheme-Text" d="M 2,0 2,16 4,16 4,7 7,7 8,9 14,9 14,2 10,2 9,0 4,0 2,0 Z"/>
+  <path style="fill:currentColor" class="ColorScheme-Highlight" d="M 4,0 4,7 7,7 8,9 14,9 14,2 10,2 9,0 4,0 Z"/>
+ </g>
 </svg>
diff --git a/tools/work/Papirus/apps/_TEMPLATE@16x16.SVG b/tools/work/Papirus/apps/_TEMPLATE@16x16.SVG
index c9ddc80f03..4cfadc7955 100644
--- a/tools/work/Papirus/apps/_TEMPLATE@16x16.SVG
+++ b/tools/work/Papirus/apps/_TEMPLATE@16x16.SVG
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1">
  <g>
   <circle style="fill:#248afd" cx="8" cy="8" r="8"/>
   <circle style="fill:#79de7d" cx="8" cy="8" r="5"/>
diff --git a/tools/work/Papirus/apps/_TEMPLATE@22x22.SVG b/tools/work/Papirus/apps/_TEMPLATE@22x22.SVG
index bc4c20cfd5..4f267975b5 100644
--- a/tools/work/Papirus/apps/_TEMPLATE@22x22.SVG
+++ b/tools/work/Papirus/apps/_TEMPLATE@22x22.SVG
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" version="1.1" viewBox="0 0 22 22">
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" version="1.1">
  <g transform="translate(-1,-1)">
   <circle style="opacity:0.2" cx="12" cy="12.5" r="10"/>
   <circle style="fill:#248afd" cx="12" cy="12" r="10"/>
diff --git a/tools/work/Papirus/apps/_TEMPLATE@24x24.SVG b/tools/work/Papirus/apps/_TEMPLATE@24x24.SVG
index e966e76b9c..50d9fc3e87 100644
--- a/tools/work/Papirus/apps/_TEMPLATE@24x24.SVG
+++ b/tools/work/Papirus/apps/_TEMPLATE@24x24.SVG
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.1" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.1">
  <g>
   <circle style="opacity:0.2" cx="12" cy="12.5" r="10"/>
   <circle style="fill:#248afd" cx="12" cy="12" r="10"/>
diff --git a/tools/work/Papirus/apps/_TEMPLATE@32x32.SVG b/tools/work/Papirus/apps/_TEMPLATE@32x32.SVG
index 0276510fe5..b532968b76 100644
--- a/tools/work/Papirus/apps/_TEMPLATE@32x32.SVG
+++ b/tools/work/Papirus/apps/_TEMPLATE@32x32.SVG
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" version="1.1" viewBox="0 0 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" version="1.1">
  <g>
   <circle style="opacity:0.2" cx="16" cy="17" r="14"/>
   <circle style="fill:#248afd" cx="16" cy="16" r="14"/>
diff --git a/tools/work/Papirus/apps/_TEMPLATE@48x48.SVG b/tools/work/Papirus/apps/_TEMPLATE@48x48.SVG
index b067f24c59..4cd482d748 100644
--- a/tools/work/Papirus/apps/_TEMPLATE@48x48.SVG
+++ b/tools/work/Papirus/apps/_TEMPLATE@48x48.SVG
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1.1" viewBox="0 0 48 48">
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1.1">
  <g>
   <circle style="opacity:0.2" cx="24" cy="25" r="20"/>
   <circle style="fill:#248afd" cx="24" cy="24" r="20"/>
diff --git a/tools/work/Papirus/apps/_TEMPLATE@64x64.SVG b/tools/work/Papirus/apps/_TEMPLATE@64x64.SVG
index 687d9c2099..31afa6d802 100644
--- a/tools/work/Papirus/apps/_TEMPLATE@64x64.SVG
+++ b/tools/work/Papirus/apps/_TEMPLATE@64x64.SVG
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" version="1.1" viewBox="0 0 64 64">
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" version="1.1">
  <g>
   <circle style="opacity:0.2" cx="32" cy="33" r="28"/>
   <circle style="fill:#248afd" cx="32" cy="32" r="28"/>
diff --git a/tools/work/Papirus/devices/_TEMPLATE@16x16.SVG b/tools/work/Papirus/devices/_TEMPLATE@16x16.SVG
index f481de9815..25dfb5355b 100644
--- a/tools/work/Papirus/devices/_TEMPLATE@16x16.SVG
+++ b/tools/work/Papirus/devices/_TEMPLATE@16x16.SVG
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1">
  <defs>
-  <style type="text/css" id="current-color-scheme">
+  <style id="current-color-scheme" type="text/css">
    .ColorScheme-Text { color:#444444; } .ColorScheme-Highlight { color:#5294e2; }
   </style>
  </defs>
- <path style="fill:currentColor" class="ColorScheme-Text" d="M 1 1.0039062 C 0 1.0039062 0 2.0039062 0 2.0039062 L 0 12.003906 C 0 13.003906 1 13.003906 1 13.003906 L 6 13.003906 C 6 13.003906 5 13.003906 5 14.003906 L 5 15 L 11 15 L 11 14.003906 C 11 13.003906 10.021484 13.003906 10.021484 13.003906 L 15 13.003906 C 16 13.003906 16 12.003906 16 12.003906 L 16 2.0039062 C 16 2.0039062 16 1.0039062 15 1.0039062 L 1 1.0039062 z M 2 3.0039062 L 14 3.0039062 L 14 10.978516 L 2 11.003906 L 2 3.0039062 z"/>
+ <path style="fill:currentColor" class="ColorScheme-Text" d="M 1,1 C 0,1 0,2 0,2 V 12 C 0,13 1,13 1,13 H 6 C 6,13 5,13 5,14 V 15 H 11 V 14 C 11,13 10,13 10,13 H 15 C 16,13 16,12 16,12 V 2 C 16,2 16,1 15,1 Z M 2,3 H 14 V 11 H 2 Z"/>
 </svg>
diff --git a/tools/work/Papirus/devices/_TEMPLATE@22x22.SVG b/tools/work/Papirus/devices/_TEMPLATE@22x22.SVG
index 1d1b8e5f57..0f53421acc 100644
--- a/tools/work/Papirus/devices/_TEMPLATE@22x22.SVG
+++ b/tools/work/Papirus/devices/_TEMPLATE@22x22.SVG
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1">
- <rect style="fill:#7e7e7e" x="-20" y="-17" width="16" height="12" transform="matrix(0,-1,-1,0,0,0)" rx="1" ry="1"/>
- <rect style="fill:#757575" x="-18" y="-21" width="16" height="20" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)"/>
- <rect style="fill:#464646" x="-17" y="-20" width="14" height="18" transform="matrix(0,-1,-1,0,0,0)" rx="0" ry="0"/>
- <path style="opacity:0.2;fill:#ffffff" d="M 2,2 C 1.446,2 1,2.446 1,3 l 0,0.5 c 0,-0.554 0.446,-1 1,-1 l 18,0 c 0.554,0 1,0.446 1,1 L 21,3 C 21,2.446 20.554,2 20,2 L 2,2 Z"/>
- <path style="opacity:0.2" d="m 5,19 0,0.5 c 0,0.554 0.446,1 1,1 l 10,0 c 0.554,0 1,-0.446 1,-1 L 17,19 c 0,0.554 -0.446,1 -1,1 L 6,20 C 5.446,20 5,19.554 5,19 Z"/>
- <path style="opacity:0.2" d="m 1,17 0,0.5 c 0,0.554 0.446,1 1,1 l 18,0 c 0.554,0 1,-0.446 1,-1 L 21,17 c 0,0.554 -0.446,1 -1,1 L 2,18 C 1.446,18 1,17.554 1,17 Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" version="1.1">
+ <g transform="translate(-1,-1)">
+  <rect style="opacity:0.2" width="12" height="16" x="6" y="5.5" rx="1" ry="1"/>
+  <rect width="12" height="16" x="6" y="5" rx="1" ry="1" style="fill:#8e8e8e"/>
+  <rect style="opacity:0.2" width="20" height="16" x="2" y="3.5" rx="1" ry="1"/>
+  <rect width="20" height="16" x="2" y="3" rx="1" ry="1" style="fill:#4f4f4f"/>
+  <rect width="16" height="12" x="4" y="5" rx="0" ry="0" style="opacity:0.4"/>
+  <rect width="16" height=".5" x="4" y="17" style="opacity:0.1;fill:#ffffff"/>
+  <path d="M 3,3 C 2.446,3 2,3.446 2,4 V 4.5 C 2,3.946 2.446,3.5 3,3.5 H 21 C 21.554,3.5 22,3.946 22,4.5 V 4 C 22,3.446 21.554,3 21,3 Z" style="opacity:0.1;fill:#ffffff"/>
+ </g>
 </svg>
diff --git a/tools/work/Papirus/devices/_TEMPLATE@24x24.SVG b/tools/work/Papirus/devices/_TEMPLATE@24x24.SVG
index c5383188af..986bec17fa 100644
--- a/tools/work/Papirus/devices/_TEMPLATE@24x24.SVG
+++ b/tools/work/Papirus/devices/_TEMPLATE@24x24.SVG
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1">
- <rect style="fill:#7e7e7e" x="-21" y="-18" width="16" height="12" transform="matrix(0,-1,-1,0,0,0)" rx="1" ry="1"/>
- <rect style="fill:#757575" x="-19" y="-22" width="16" height="20" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)"/>
- <rect style="fill:#464646" x="-18" y="-21" width="14" height="18" transform="matrix(0,-1,-1,0,0,0)" rx="0" ry="0"/>
- <path style="opacity:0.2;fill:#ffffff" d="M 3,3 C 2.446,3 2,3.446 2,4 l 0,0.5 c 0,-0.554 0.446,-1 1,-1 l 18,0 c 0.554,0 1,0.446 1,1 L 22,4 C 22,3.446 21.554,3 21,3 L 3,3 Z"/>
- <path style="opacity:0.2" d="m 6,20 0,0.5 c 0,0.554 0.446,1 1,1 l 10,0 c 0.554,0 1,-0.446 1,-1 L 18,20 c 0,0.554 -0.446,1 -1,1 L 7,21 C 6.446,21 6,20.554 6,20 Z"/>
- <path style="opacity:0.2" d="m 2,18 0,0.5 c 0,0.554 0.446,1 1,1 l 18,0 c 0.554,0 1,-0.446 1,-1 L 22,18 c 0,0.554 -0.446,1 -1,1 L 3,19 C 2.446,19 2,18.554 2,18 Z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.1">
+ <rect width="12" height="16" x="6" y="5.5" rx="1" ry="1" style="opacity:0.2"/>
+ <rect style="fill:#8e8e8e" width="12" height="16" x="6" y="5" rx="1" ry="1"/>
+ <rect width="20" height="16" x="2" y="3.5" rx="1" ry="1" style="opacity:0.2"/>
+ <rect style="fill:#4f4f4f" width="20" height="16" x="2" y="3" rx="1" ry="1"/>
+ <rect style="opacity:0.4" width="16" height="12" x="4" y="5" rx="0" ry="0"/>
+ <rect style="opacity:0.1;fill:#ffffff" width="16" height=".5" x="4" y="17"/>
+ <path style="fill:#ffffff;opacity:0.1" d="M 3 3 C 2.446 3 2 3.446 2 4 L 2 4.5 C 2 3.946 2.446 3.5 3 3.5 L 21 3.5 C 21.554 3.5 22 3.946 22 4.5 L 22 4 C 22 3.446 21.554 3 21 3 L 3 3 z"/>
 </svg>
diff --git a/tools/work/Papirus/devices/_TEMPLATE@32x32.SVG b/tools/work/Papirus/devices/_TEMPLATE@32x32.SVG
index 3c69f4b9cc..74d5382058 100644
--- a/tools/work/Papirus/devices/_TEMPLATE@32x32.SVG
+++ b/tools/work/Papirus/devices/_TEMPLATE@32x32.SVG
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1">
- <rect transform="matrix(0,-1,-1,0,0,0)" rx="1.313" ry="1.333" height="16" width="21" y="-24" x="-28" fill="#7e7e7e"/>
- <rect ry="1.3" rx="1.25" transform="matrix(0,-1,-1,0,0,0)" height="26" width="20" y="-29" x="-25" fill="#757575"/>
- <rect transform="matrix(0,-1,-1,0,0,0)" rx="0" ry="0" height="22" width="16" y="-27" x="-23" fill="#4d4d4d"/>
- <path opacity=".1" d="m4.3008 5c-0.7202 0-1.3008 0.5575-1.3008 1.25v1c0-0.6925 0.5806-1.25 1.3008-1.25h23.398c0.72 0 1.301 0.5575 1.301 1.25v-1c0-0.6925-0.581-1.25-1.301-1.25h-23.398z" fill="#ffffff"/>
- <path opacity=".2" d="m8 26.688v1c0 0.727 0.5953 1.312 1.334 1.312h13.332c0.739 0 1.334-0.585 1.334-1.312v-1c0 0.727-0.595 1.312-1.334 1.312h-13.332c-0.7387 0-1.334-0.585-1.334-1.312z" fill="#000000"/>
- <path opacity=".2" d="m3 23.75v1c0 0.692 0.5806 1.25 1.3008 1.25h23.398c0.72 0 1.301-0.558 1.301-1.25v-1c0 0.692-0.581 1.25-1.301 1.25h-23.398c-0.7204 0-1.301-0.558-1.301-1.25z" fill="#000000"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" version="1.1">
+ <rect style="opacity:0.2" width="16" height="21" x="8" y="8" rx="1.25" ry="1.25"/>
+ <rect style="fill:#8e8e8e" width="16" height="21" x="8" y="7" rx="1.25" ry="1.25"/>
+ <rect style="opacity:0.2" width="26" height="20" x="3" y="6" rx="1.25" ry="1.25"/>
+ <rect style="fill:#4f4f4f" width="26" height="20" x="3" y="5" rx="1.25" ry="1.25"/>
+ <rect style="opacity:0.4" width="22" height="16" x="5" y="7" rx="0" ry="0"/>
+ <rect style="opacity:0.1;fill:#ffffff" width="22" height="1" x="5" y="23"/>
+ <path style="fill:#ffffff;opacity:0.1" d="M 4.25 5 C 3.5575 5 3 5.5575 3 6.25 L 3 7.25 C 3 6.5575 3.5575 6 4.25 6 L 27.75 6 C 28.442 6 29 6.5575 29 7.25 L 29 6.25 C 29 5.5575 28.442 5 27.75 5 L 4.25 5 z"/>
 </svg>
diff --git a/tools/work/Papirus/devices/_TEMPLATE@48x48.SVG b/tools/work/Papirus/devices/_TEMPLATE@48x48.SVG
index 3b1a829394..7b8f94311c 100644
--- a/tools/work/Papirus/devices/_TEMPLATE@48x48.SVG
+++ b/tools/work/Papirus/devices/_TEMPLATE@48x48.SVG
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.1">
- <rect ry="2" rx="2" transform="matrix(0,-1,-1,0,0,0)" height="24" width="32" y="-36" x="-42" fill="#7e7e7e"/>
- <rect transform="matrix(0,-1,-1,0,0,0)" rx="2" ry="2" height="40" width="32" y="-44" x="-38" fill="#757575"/>
- <rect ry="0" rx="0" transform="matrix(0,-1,-1,0,0,0)" height="34" width="26" y="-41" x="-35" fill="#4d4d4d"/>
- <path opacity=".2" fill="#ffffff" d="m6 6c-1.108 0-2 0.892-2 2v1c0-1.108 0.892-2 2-2h36c1.108 0 2 0.892 2 2v-1c0-1.108-0.892-2-2-2h-36z"/>
- <path opacity=".2" d="m12 40v1c0 1.108 0.892 2 2 2h20c1.108 0 2-0.892 2-2v-1c0 1.108-0.892 2-2 2h-20c-1.108 0-2-0.892-2-2z"/>
- <path opacity=".2" d="m4 36v1c0 1.108 0.892 2 2 2h36c1.108 0 2-0.892 2-2v-1c0 1.108-0.892 2-2 2h-36c-1.108 0-2-0.892-2-2z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1.1">
+ <rect style="opacity:0.2" width="24" height="32" x="12" y="11" rx="2" ry="2"/>
+ <rect width="24" height="32" x="12" y="10" rx="2" ry="2" style="fill:#8e8e8e"/>
+ <rect style="opacity:0.2" width="40" height="32" x="4" y="7" rx="2" ry="2"/>
+ <rect style="fill:#4f4f4f" width="40" height="32" x="4" y="6" rx="2" ry="2"/>
+ <rect style="opacity:0.4" width="34" height="26" x="7" y="9" rx="0" ry="0"/>
+ <rect style="opacity:0.1;fill:#ffffff" width="34" height="1" x="7" y="35"/>
+ <path style="fill:#ffffff;opacity:0.1" d="M 6 6 C 4.892 6 4 6.892 4 8 L 4 9 C 4 7.892 4.892 7 6 7 L 42 7 C 43.108 7 44 7.892 44 9 L 44 8 C 44 6.892 43.108 6 42 6 L 6 6 z"/>
 </svg>
diff --git a/tools/work/Papirus/devices/_TEMPLATE@64x64.SVG b/tools/work/Papirus/devices/_TEMPLATE@64x64.SVG
index 427e23c61f..0464a34143 100644
--- a/tools/work/Papirus/devices/_TEMPLATE@64x64.SVG
+++ b/tools/work/Papirus/devices/_TEMPLATE@64x64.SVG
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1">
- <rect transform="matrix(0,-1,-1,0,0,0)" rx="2.626" ry="2.666" height="32" width="42" y="-48" x="-55" style="fill:#7e7e7e"/>
- <rect ry="2.6" rx="2.5" transform="matrix(0,-1,-1,0,0,0)" height="52" width="40" y="-58" x="-49" style="fill:#757575"/>
- <rect transform="matrix(0,-1,-1,0,0,0)" rx="0" ry="0" height="44" width="32" y="-54" x="-45" style="fill:#464646"/>
- <path style="opacity:0.1;fill:#ffffff" d="M 8.6015625 9 C 7.1611736 9 6 10.115011 6 11.5 L 6 12.5 C 6 11.115011 7.1611791 10 8.6015625 10 L 55.396484 10 C 56.836468 10 58 11.115011 58 12.5 L 58 11.5 C 58 10.115011 56.838426 9 55.398438 9 L 8.6015625 9 z"/>
- <path style="opacity:0.2" d="M 16 52.376953 L 16 53.376953 C 16 54.830942 17.19058 56 18.667969 56 L 45.332031 56 C 46.81002 56 48 54.830942 48 53.376953 L 48 52.376953 C 48 53.830942 46.81002 55 45.332031 55 L 18.667969 55 C 17.19058 55 16 53.830942 16 52.376953 z"/>
- <path style="opacity:0.2" d="M 6 46.5 L 6 47.5 C 6 48.88399 7.1607736 50 8.6015625 50 L 55.398438 50 C 56.838426 50 58 48.88399 58 47.5 L 58 46.5 C 58 47.88399 56.838426 49 55.398438 49 L 8.6015625 49 C 7.1607736 49 6 47.88399 6 46.5 z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" version="1.1">
+ <rect style="opacity:0.2" width="32" height="42" x="16" y="14" rx="2.5" ry="2.5"/>
+ <rect style="fill:#8e8e8e" width="32" height="42" x="16" y="13" rx="2.5" ry="2.5"/>
+ <rect style="opacity:0.2" width="52" height="40" x="6" y="10" rx="2.5" ry="2.5"/>
+ <rect style="fill:#4f4f4f" width="52" height="40" x="6" y="9" rx="2.5" ry="2.5"/>
+ <rect style="opacity:0.4" width="44" height="32" x="10" y="13" rx="0" ry="0"/>
+ <rect style="opacity:0.1;fill:#ffffff" width="44" height="1" x="10" y="45"/>
+ <path style="fill:#ffffff;opacity:0.1" d="M 8.5 9 C 7.115 9 6 10.115 6 11.5 L 6 12.5 C 6 11.115 7.115 10 8.5 10 L 55.5 10 C 56.885 10 58 11.115 58 12.5 L 58 11.5 C 58 10.115 56.885 9 55.5 9 L 8.5 9 z"/>
 </svg>
diff --git a/tools/work/Papirus/emblems/_TEMPLATE@16x16.SVG b/tools/work/Papirus/emblems/_TEMPLATE@16x16.SVG
index 347caad4dc..162d268bb1 100644
--- a/tools/work/Papirus/emblems/_TEMPLATE@16x16.SVG
+++ b/tools/work/Papirus/emblems/_TEMPLATE@16x16.SVG
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16" width="16" height="16">
- <circle cy="8" cx="8" style="fill:#252a35;" r="7"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1">
+ <circle cx="8" cy="8" r="7" style="fill:#252a35"/>
 </svg>
diff --git a/tools/work/Papirus/emblems/_TEMPLATE@22x22.SVG b/tools/work/Papirus/emblems/_TEMPLATE@22x22.SVG
index 313a12c9e9..2cc1bda0f9 100644
--- a/tools/work/Papirus/emblems/_TEMPLATE@22x22.SVG
+++ b/tools/work/Papirus/emblems/_TEMPLATE@22x22.SVG
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 22 22" width="22" height="22">
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" version="1.1">
  <g transform="matrix(0.5,0,0,0.5,-1,-1)">
-  <circle r="20" style="fill:#252a35;" cx="24" cy="24"/>
+  <circle style="fill:#252a35" cx="24" cy="24" r="20"/>
  </g>
 </svg>
diff --git a/tools/work/Papirus/emblems/_TEMPLATE@24x24.SVG b/tools/work/Papirus/emblems/_TEMPLATE@24x24.SVG
index 62700cc285..2e62a09fc1 100644
--- a/tools/work/Papirus/emblems/_TEMPLATE@24x24.SVG
+++ b/tools/work/Papirus/emblems/_TEMPLATE@24x24.SVG
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 24 24" width="24" height="24">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.1">
  <g transform="scale(0.5,0.5)">
-  <circle r="20" style="fill:#252a35;" cx="24" cy="24"/>
+  <circle style="fill:#252a35" cx="24" cy="24" r="20"/>
  </g>
 </svg>
diff --git a/tools/work/Papirus/emblems/_TEMPLATE@32x32.SVG b/tools/work/Papirus/emblems/_TEMPLATE@32x32.SVG
index 22fa15c6ad..e489e3011a 100644
--- a/tools/work/Papirus/emblems/_TEMPLATE@32x32.SVG
+++ b/tools/work/Papirus/emblems/_TEMPLATE@32x32.SVG
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 32 32" width="32" height="32">
- <circle cy="16" cx="16" style="fill:#252a35;" r="14"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" version="1.1">
+ <circle cx="16" cy="16" r="14" style="fill:#252a35"/>
 </svg>
diff --git a/tools/work/Papirus/emblems/_TEMPLATE@48x48.SVG b/tools/work/Papirus/emblems/_TEMPLATE@48x48.SVG
index 69ffed74b8..109003cba9 100644
--- a/tools/work/Papirus/emblems/_TEMPLATE@48x48.SVG
+++ b/tools/work/Papirus/emblems/_TEMPLATE@48x48.SVG
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 48 48" width="48" height="48">
- <circle cy="24" cx="24" style="fill:#252a35;" r="20"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1.1">
+ <circle cx="24" cy="24" r="20" style="fill:#252a35"/>
 </svg>
diff --git a/tools/work/Papirus/status/_TEMPLATE@22x22.SVG b/tools/work/Papirus/status/_TEMPLATE@22x22.SVG
index 7cdb6d1dbe..25c2ac5412 100644
--- a/tools/work/Papirus/status/_TEMPLATE@22x22.SVG
+++ b/tools/work/Papirus/status/_TEMPLATE@22x22.SVG
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1">
- <rect transform="matrix(0,-1,-1,0,0,0)" rx="10" ry="10" height="20" width="20" y="-21" x="-21" fill="#db3c30"/>
- <path opacity=".2" d="m11 1c-5.54 0-10 4.46-10 10 0 0.084 0.004 0.166 0.0058 0.25 0.1324-5.423 4.5382-9.75 9.9942-9.75 5.4558 0 9.862 4.327 9.994 9.75 0.002-0.08343 0.0059-0.16606 0.0059-0.25 0-5.54-4.46-10-10-10z" fill="#ffffff"/>
- <path opacity=".3" d="m1.0058 11.25c-0.002 0.084-0.0058 0.166-0.0058 0.25 0 5.54 4.46 10 10 10s10-4.46 10-10c0-0.084-0.004-0.1665-0.006-0.25-0.132 5.423-4.538 9.75-9.994 9.75s-9.862-4.327-9.994-9.75z" fill="#000000"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" version="1.1">
+ <g transform="translate(-1,-1)">
+  <circle style="opacity:0.2" cx="12" cy="12.5" r="10"/>
+  <circle cx="12" cy="12" r="10" style="fill:#db3c30"/>
+  <path d="M 12,2 A 10,10 0 0 0 2,12 10,10 0 0 0 2.0098,12.293 10,10 0 0 1 12,2.5 10,10 0 0 1 21.99,12.207 10,10 0 0 0 22,12 10,10 0 0 0 12,2 Z" style="opacity:0.2;fill:#ffffff"/>
+ </g>
 </svg>
diff --git a/tools/work/Papirus/status/_TEMPLATE@24x24.SVG b/tools/work/Papirus/status/_TEMPLATE@24x24.SVG
index d90931350a..3cb94f724e 100644
--- a/tools/work/Papirus/status/_TEMPLATE@24x24.SVG
+++ b/tools/work/Papirus/status/_TEMPLATE@24x24.SVG
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1">
- <rect transform="matrix(0,-1,-1,0,0,0)" rx="10" ry="10" height="20" width="20" y="-22" x="-22" fill="#db3c30"/>
- <path opacity=".2" d="m12 2c-5.54 0-10 4.46-10 10 0 0.084 0.004 0.166 0.0058 0.25 0.1324-5.423 4.5382-9.75 9.9942-9.75 5.4558 0 9.862 4.327 9.994 9.75 0.002-0.08343 0.0059-0.16606 0.0059-0.25 0-5.54-4.46-10-10-10z" fill="#ffffff"/>
- <path opacity=".2" d="m2.0058 12.25c-0.002 0.084-0.0058 0.166-0.0058 0.25 0 5.54 4.46 10 10 10s10-4.46 10-10c0-0.084-0.004-0.1665-0.006-0.25-0.132 5.423-4.538 9.75-9.994 9.75s-9.862-4.327-9.994-9.75z" fill="#000000"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.1">
+ <circle cx="12" cy="12.5" r="10" style="opacity:0.2"/>
+ <circle style="fill:#db3c30" cx="12" cy="12" r="10"/>
+ <path style="opacity:0.2;fill:#ffffff" d="M 12 2 A 10 10 0 0 0 2 12 A 10 10 0 0 0 2.0098 12.293 A 10 10 0 0 1 12 2.5 A 10 10 0 0 1 21.99 12.207 A 10 10 0 0 0 22 12 A 10 10 0 0 0 12 2 z"/>
 </svg>
diff --git a/tools/work/Papirus/status/_TEMPLATE@32x32.SVG b/tools/work/Papirus/status/_TEMPLATE@32x32.SVG
index 00b5505251..4e0fb45b44 100644
--- a/tools/work/Papirus/status/_TEMPLATE@32x32.SVG
+++ b/tools/work/Papirus/status/_TEMPLATE@32x32.SVG
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1">
- <rect transform="matrix(0,-1,-1,0,0,0)" rx="14" ry="14" height="28" width="28" y="-30" x="-30" fill="#db3c30"/>
- <path opacity=".2" d="m16 2c-7.756 0-14 6.244-14 14 0 0.169 0.0195 0.333 0.0254 0.5 0.2637-7.5206 6.3874-13.5 13.975-13.5 7.587 0 13.711 5.9794 13.975 13.5 0.005-0.167 0.025-0.331 0.025-0.5 0-7.756-6.244-14-14-14z" fill="#ffffff"/>
- <path opacity=".2" d="m2.0254 16.5c-0.0059 0.167-0.0254 0.331-0.0254 0.5 0 7.756 6.244 14 14 14s14-6.244 14-14c0-0.16884-0.01952-0.33264-0.02539-0.5-0.264 7.521-6.388 13.5-13.975 13.5-7.5872 0-13.711-5.979-13.975-13.5z" fill="#000000"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" version="1.1">
+ <circle cx="16" cy="17" r="14" style="opacity:0.2"/>
+ <circle style="fill:#db3c30" cx="16" cy="16" r="14"/>
+ <path style="opacity:0.2;fill:#ffffff" d="M 16 2 A 14 14 0 0 0 2 16 A 14 14 0 0 0 2.0215 16.586 A 14 14 0 0 1 16 3 A 14 14 0 0 1 29.979 16.414 A 14 14 0 0 0 30 16 A 14 14 0 0 0 16 2 z"/>
 </svg>
diff --git a/tools/work/Papirus/status/_TEMPLATE@48x48.SVG b/tools/work/Papirus/status/_TEMPLATE@48x48.SVG
index e771793cd5..570ca2352a 100644
--- a/tools/work/Papirus/status/_TEMPLATE@48x48.SVG
+++ b/tools/work/Papirus/status/_TEMPLATE@48x48.SVG
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.1">
- <rect transform="matrix(0,-1,-1,0,0,0)" rx="20" ry="20" height="40" width="40" y="-44" x="-44" fill="#db3c30"/>
- <path opacity=".2" fill="#ffffff" d="m24 4c-11.08 0-20 8.92-20 20 0 0.168 0.008 0.333 0.0117 0.5 0.2647-10.846 9.0763-19.5 19.988-19.5s19.724 8.6539 19.988 19.5c0.004-0.16686 0.0117-0.33213 0.0117-0.5 0-11.08-8.92-20-20-20z"/>
- <path opacity=".2" d="m4.0117 24.5c-0.0041 0.167-0.0117 0.332-0.0117 0.5 0 11.08 8.92 20 20 20s20-8.92 20-20c0-0.168-0.008-0.333-0.012-0.5-0.264 10.846-9.076 19.5-19.988 19.5s-19.724-8.654-19.988-19.5z" fill="#000000"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1.1">
+ <circle cx="24" cy="25" r="20" style="opacity:0.2"/>
+ <circle style="fill:#db3c30" cx="24" cy="24" r="20"/>
+ <path style="opacity:0.2;fill:#ffffff" d="M 24 4 A 20 20 0 0 0 4 24 A 20 20 0 0 0 4.0215 24.582 A 20 20 0 0 1 24 5 A 20 20 0 0 1 43.979 24.418 A 20 20 0 0 0 44 24 A 20 20 0 0 0 24 4 z"/>
 </svg>