diff --git a/links/status/22/caffeine-plus-off.svg b/links/status/22/caffeine-plus-off.svg
new file mode 120000
index 00000000..e3c98f4f
--- /dev/null
+++ b/links/status/22/caffeine-plus-off.svg
@@ -0,0 +1 @@
+caffeine-cup-empty.svg
\ No newline at end of file
diff --git a/links/status/22/caffeine-plus-on.svg b/links/status/22/caffeine-plus-on.svg
new file mode 120000
index 00000000..ff1a5393
--- /dev/null
+++ b/links/status/22/caffeine-plus-on.svg
@@ -0,0 +1 @@
+caffeine-cup-full.svg
\ No newline at end of file
diff --git a/links/status/22/user-caffeine-plus-off.svg b/links/status/22/user-caffeine-plus-off.svg
new file mode 120000
index 00000000..e3c98f4f
--- /dev/null
+++ b/links/status/22/user-caffeine-plus-off.svg
@@ -0,0 +1 @@
+caffeine-cup-empty.svg
\ No newline at end of file
diff --git a/links/status/22/user-caffeine-plus-on.svg b/links/status/22/user-caffeine-plus-on.svg
new file mode 120000
index 00000000..ff1a5393
--- /dev/null
+++ b/links/status/22/user-caffeine-plus-on.svg
@@ -0,0 +1 @@
+caffeine-cup-full.svg
\ No newline at end of file
diff --git a/src/devices/24/input-touchpad.svg b/src/devices/24/input-touchpad.svg
index 01decb3d..b9b40e66 100644
--- a/src/devices/24/input-touchpad.svg
+++ b/src/devices/24/input-touchpad.svg
@@ -3,7 +3,7 @@
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text { color:#363636; } .ColorScheme-Highlight { color:#5294e2; }</style>
  </defs>
  <g class="ColorScheme-Text" transform="translate(1,1)" fill="currentColor">
-  <rect class="ColorScheme-Text" x="2" y="15" width="17" height="3" opacity=".15"/>
-  <path class="ColorScheme-Text" d="m3 3c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h15c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2zm0 1h15c0.554 0 1 0.446 1 1v9h-17v-9c0-0.554 0.446-1 1-1zm-1 11h8v3h-7c-0.554 0-1-0.446-1-1zm9 0h8v2c0 0.554-0.446 1-1 1h-7z"/>
+  <rect x="2" y="15" width="17" height="3" opacity=".15"/>
+  <path d="m3 3c-1.108 0-2 0.892-2 2v12c0 1.108 0.892 2 2 2h15c1.108 0 2-0.892 2-2v-12c0-1.108-0.892-2-2-2zm0 1h15c0.554 0 1 0.446 1 1v9h-17v-9c0-0.554 0.446-1 1-1zm-1 11h8v3h-7c-0.554 0-1-0.446-1-1zm9 0h8v2c0 0.554-0.446 1-1 1h-7z"/>
  </g>
 </svg>
diff --git a/src/status/16/system-suspend.svg b/src/status/16/system-suspend.svg
index 52253073..e26e40b8 100644
--- a/src/status/16/system-suspend.svg
+++ b/src/status/16/system-suspend.svg
@@ -6,5 +6,5 @@
       }
       </style>
   </defs>
- <path class="ColorScheme-Text" d="m5.0507 0.048829a7.995 8 0 0 0-4.0463 6.9512 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 6.9371-4.043 7.995 8 0 0 0 0.0098-0.0059l-0.73782-0.73828a6.9956 7 0 0 1-0.0039 0.0059 6.9956 7 0 0 1-3.207 0.78125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 0.78661-3.2129zm-0.74367 1.7715a7.995 8 0 0 0-0.3045 2.1797 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 2.1861-0.3125 6.9956 7 0 0 1-5.1842 2.3125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 2.3032-5.1797zm5.4077 3.2797h1.7147l-0.03217 0.9h-3.3973l1.7147-2.7h-1.7147v-0.9h3.4294zm4.5732-2.4h1.7165l-0.03222 0.9h-3.4008l1.7165-2.7h-1.7165v-0.9h3.433z" color="#363636" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m5.0507 0.048829a7.995 8 0 0 0-4.0463 6.9512 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 6.9371-4.043 7.995 8 0 0 0 0.0098-0.0059l-0.73782-0.73828a6.9956 7 0 0 1-0.0039 0.0059 6.9956 7 0 0 1-3.207 0.78125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 0.78661-3.2129zm-0.74367 1.7715a7.995 8 0 0 0-0.3045 2.1797 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 2.1861-0.3125 6.9956 7 0 0 1-5.1842 2.3125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 2.3032-5.1797zm5.4077 3.2797h1.7147l-0.03217 0.9h-3.3973l1.7147-2.7h-1.7147v-0.9h3.4294zm4.5732-2.4h1.7165l-0.03222 0.9h-3.4008l1.7165-2.7h-1.7165v-0.9h3.433z" fill="currentColor"/>
 </svg>
diff --git a/src/status/22/system-suspend.svg b/src/status/22/system-suspend.svg
index c6a97861..0ede6b61 100644
--- a/src/status/22/system-suspend.svg
+++ b/src/status/22/system-suspend.svg
@@ -5,5 +5,5 @@
         color:#ffffff;
       }</style>
  </defs>
- <path class="ColorScheme-Text" d="m8.0463 3.0488a7.995 8 0 0 0-4.0463 6.9512 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 6.9371-4.043 7.995 8 0 0 0 0.0098-0.0059l-0.73782-0.73828a6.9956 7 0 0 1-0.0039 0.0059 6.9956 7 0 0 1-3.207 0.78125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 0.78661-3.2129zm-0.74367 1.7715a7.995 8 0 0 0-0.3045 2.1797 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 2.1861-0.3125 6.9956 7 0 0 1-5.1842 2.3125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 2.3032-5.1797zm5.4077 3.2797h1.7147l-0.03217 0.9h-3.3973l1.7147-2.7h-1.7147v-0.9h3.4294zm4.5732-2.4h1.7165l-0.03222 0.9h-3.4008l1.7165-2.7h-1.7165v-0.9h3.433z" color="#363636" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m8.0463 3.0488a7.995 8 0 0 0-4.0463 6.9512 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 6.9371-4.043 7.995 8 0 0 0 0.0098-0.0059l-0.73782-0.73828a6.9956 7 0 0 1-0.0039 0.0059 6.9956 7 0 0 1-3.207 0.78125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 0.78661-3.2129zm-0.74367 1.7715a7.995 8 0 0 0-0.3045 2.1797 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 2.1861-0.3125 6.9956 7 0 0 1-5.1842 2.3125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 2.3032-5.1797zm5.4077 3.2797h1.7147l-0.03217 0.9h-3.3973l1.7147-2.7h-1.7147v-0.9h3.4294zm4.5732-2.4h1.7165l-0.03222 0.9h-3.4008l1.7165-2.7h-1.7165v-0.9h3.433z" fill="currentColor"/>
 </svg>
diff --git a/src/status/24/system-suspend.svg b/src/status/24/system-suspend.svg
index 8cdf36c9..91fd86d1 100644
--- a/src/status/24/system-suspend.svg
+++ b/src/status/24/system-suspend.svg
@@ -5,5 +5,5 @@
         color:#ffffff;
       }</style>
  </defs>
- <path class="ColorScheme-Text" d="m9.0463 4.0488a7.995 8 0 0 0-4.0463 6.9512 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 6.9371-4.043 7.995 8 0 0 0 0.0098-0.0059l-0.73782-0.73828a6.9956 7 0 0 1-0.0039 0.0059 6.9956 7 0 0 1-3.207 0.78125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 0.78661-3.2129zm-0.74367 1.7715a7.995 8 0 0 0-0.3045 2.1797 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 2.1861-0.3125 6.9956 7 0 0 1-5.1842 2.3125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 2.3032-5.1797zm5.4077 3.2797h1.7147l-0.03217 0.9h-3.3973l1.7147-2.7h-1.7147v-0.9h3.4294zm4.5732-2.4h1.7165l-0.03222 0.9h-3.4008l1.7165-2.7h-1.7165v-0.9h3.433z" color="#363636" fill="currentColor"/>
+ <path class="ColorScheme-Text" d="m9.0463 4.0488a7.995 8 0 0 0-4.0463 6.9512 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 6.9371-4.043 7.995 8 0 0 0 0.0098-0.0059l-0.73782-0.73828a6.9956 7 0 0 1-0.0039 0.0059 6.9956 7 0 0 1-3.207 0.78125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 0.78661-3.2129zm-0.74367 1.7715a7.995 8 0 0 0-0.3045 2.1797 7.995 8 0 0 0 7.995 8 7.995 8 0 0 0 2.1861-0.3125 6.9956 7 0 0 1-5.1842 2.3125 6.9956 7 0 0 1-6.9956-7 6.9956 7 0 0 1 2.3032-5.1797zm5.4077 3.2797h1.7147l-0.03217 0.9h-3.3973l1.7147-2.7h-1.7147v-0.9h3.4294zm4.5732-2.4h1.7165l-0.03222 0.9h-3.4008l1.7165-2.7h-1.7165v-0.9h3.433z" fill="currentColor"/>
 </svg>