diff --git a/icons/shuffle.json b/icons/shuffle.json
index 0f2001c79..4a71a85a7 100644
--- a/icons/shuffle.json
+++ b/icons/shuffle.json
@@ -1,7 +1,9 @@
 {
   "$schema": "../icon.schema.json",
   "tags": [
-    "music"
+    "music",
+    "random",
+    "reorder"
   ],
   "categories": [
     "multimedia",
diff --git a/icons/shuffle.svg b/icons/shuffle.svg
index 45d94e75c..7b5e482c3 100644
--- a/icons/shuffle.svg
+++ b/icons/shuffle.svg
@@ -9,9 +9,9 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <polyline points="16 3 21 3 21 8" />
-  <line x1="4" x2="21" y1="20" y2="3" />
-  <polyline points="21 16 21 21 16 21" />
-  <line x1="15" x2="21" y1="15" y2="21" />
-  <line x1="4" x2="9" y1="4" y2="9" />
+  <path d="M2 18h1.4c1.3 0 2.5-.6 3.3-1.7l6.1-8.6c.7-1.1 2-1.7 3.3-1.7H22" />
+  <path d="m18 2 4 4-4 4" />
+  <path d="M2 6h1.9c1.5 0 2.9.9 3.6 2.2" />
+  <path d="M22 18h-5.9c-1.3 0-2.6-.7-3.3-1.8l-.5-.8" />
+  <path d="m18 14 4 4-4 4" />
 </svg>