diff --git a/icons/audio-lines.json b/icons/audio-lines.json
new file mode 100644
index 000000000..97260ed69
--- /dev/null
+++ b/icons/audio-lines.json
@@ -0,0 +1,35 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "graphic equaliser",
+    "sound",
+    "noise",
+    "listen",
+    "hearing",
+    "hertz",
+    "frequency",
+    "wavelength",
+    "vibrate",
+    "sine",
+    "synthesizer",
+    "synthesiser",
+    "levels",
+    "track",
+    "music",
+    "playback",
+    "radio",
+    "broadcast",
+    "airwaves",
+    "voice",
+    "vocals",
+    "singer",
+    "song"
+  ],
+  "categories": [
+    "multimedia",
+    "communication"
+  ]
+}
\ No newline at end of file
diff --git a/icons/audio-lines.svg b/icons/audio-lines.svg
new file mode 100644
index 000000000..bb80d6e56
--- /dev/null
+++ b/icons/audio-lines.svg
@@ -0,0 +1,18 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M2 10v3" />
+  <path d="M6 6v11" />
+  <path d="M10 3v18" />
+  <path d="M14 8v7" />
+  <path d="M18 5v13" />
+  <path d="M22 10v3" />
+</svg>
diff --git a/icons/audio-waveform.json b/icons/audio-waveform.json
new file mode 100644
index 000000000..03c4725d6
--- /dev/null
+++ b/icons/audio-waveform.json
@@ -0,0 +1,34 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "sound",
+    "noise",
+    "listen",
+    "hearing",
+    "hertz",
+    "frequency",
+    "wavelength",
+    "vibrate",
+    "sine",
+    "synthesizer",
+    "synthesiser",
+    "levels",
+    "track",
+    "music",
+    "playback",
+    "radio",
+    "broadcast",
+    "airwaves",
+    "voice",
+    "vocals",
+    "singer",
+    "song"
+  ],
+  "categories": [
+    "multimedia",
+    "communication"
+  ]
+}
diff --git a/icons/audio-waveform.svg b/icons/audio-waveform.svg
new file mode 100644
index 000000000..6302ea8d9
--- /dev/null
+++ b/icons/audio-waveform.svg
@@ -0,0 +1,13 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M2 13a2 2 0 0 0 2-2V7a2 2 0 0 1 4 0v13a2 2 0 0 0 4 0V4a2 2 0 0 1 4 0v13a2 2 0 0 0 4 0v-4a2 2 0 0 1 2-2" />
+</svg>
diff --git a/icons/disc-album.json b/icons/disc-album.json
new file mode 100644
index 000000000..d85399b5c
--- /dev/null
+++ b/icons/disc-album.json
@@ -0,0 +1,30 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "album",
+    "music",
+    "songs",
+    "format",
+    "cd",
+    "dvd",
+    "vinyl",
+    "sleeve",
+    "cover",
+    "platinum",
+    "compilation",
+    "ep",
+    "recording",
+    "playback",
+    "spin",
+    "rotate",
+    "rpm",
+    "dj"    
+  ],
+  "categories": [
+    "devices",
+    "multimedia"
+  ]
+}
\ No newline at end of file
diff --git a/icons/disc-album.svg b/icons/disc-album.svg
new file mode 100644
index 000000000..ef349b44b
--- /dev/null
+++ b/icons/disc-album.svg
@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <rect width="18" height="18" x="3" y="3" rx="2" />
+  <circle cx="12" cy="12" r="5" />
+  <path d="M12 12h.01" />
+</svg>
diff --git a/icons/disc.json b/icons/disc.json
index 2efd26ea3..89c130d51 100644
--- a/icons/disc.json
+++ b/icons/disc.json
@@ -9,13 +9,22 @@
   "tags": [
     "album",
     "music",
+    "songs",
+    "format",
     "cd",
     "dvd",
-    "format",
-    "dj",
+    "vinyl",
+    "sleeve",
+    "cover",
+    "platinum",
+    "compilation",
+    "ep",
+    "recording",
+    "playback",
     "spin",
     "rotate",
-    "rpm"
+    "rpm",
+    "dj"
   ],
   "categories": [
     "devices",
diff --git a/icons/drum.json b/icons/drum.json
new file mode 100644
index 000000000..cf94b65f1
--- /dev/null
+++ b/icons/drum.json
@@ -0,0 +1,30 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "drummer",
+    "kit",
+    "sticks",
+    "instrument",
+    "beat",
+    "bang",
+    "bass",
+    "backing track",
+    "band",
+    "play",
+    "performance",
+    "concert",
+    "march",
+    "music",
+    "audio",
+    "sound",
+    "noise",
+    "loud"
+  ],
+  "categories": [
+    "multimedia",
+    "devices"
+  ]
+}
\ No newline at end of file
diff --git a/icons/drum.svg b/icons/drum.svg
new file mode 100644
index 000000000..5948439a8
--- /dev/null
+++ b/icons/drum.svg
@@ -0,0 +1,19 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m2 2 8 8" />
+  <path d="m22 2-8 8" />
+  <ellipse cx="12" cy="9" rx="10" ry="5" />
+  <path d="M7 13.4v7.9" />
+  <path d="M12 14v8" />
+  <path d="M17 13.4v7.9" />
+  <path d="M2 9v8a10 5 0 0 0 20 0V9" />
+</svg>
diff --git a/icons/file-music.json b/icons/file-music.json
new file mode 100644
index 000000000..6040dd416
--- /dev/null
+++ b/icons/file-music.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "audio",
+    "sound",
+    "noise",
+    "track",
+    "digital",
+    "recording",
+    "playback",
+    "piano",
+    "keyboard",
+    "keys",
+    "notes",
+    "chord",
+    "midi",
+    "octave"
+  ],
+  "categories": [
+    "files",
+    "multimedia"
+  ]
+}
\ No newline at end of file
diff --git a/icons/file-music.svg b/icons/file-music.svg
new file mode 100644
index 000000000..d500954c0
--- /dev/null
+++ b/icons/file-music.svg
@@ -0,0 +1,16 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <circle cx="14" cy="16" r="2" />
+  <circle cx="6" cy="18" r="2" />
+  <path d="M4 12.4V4a2 2 0 0 1 2-2h8.5L20 7.5V20a2 2 0 0 1-2 2h-7.5" />
+  <path d="M8 18v-7.7L16 9v7" />
+</svg>
diff --git a/icons/guitar.json b/icons/guitar.json
new file mode 100644
index 000000000..23755c51d
--- /dev/null
+++ b/icons/guitar.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "acoustic",
+    "instrument",
+    "strings",
+    "riff",
+    "rock",
+    "band",
+    "country",
+    "concert",
+    "performance",
+    "play",
+    "lead",
+    "loud",
+    "music",
+    "audio",
+    "sound",
+    "noise"
+  ],
+  "categories": [
+    "multimedia"
+  ]
+}
\ No newline at end of file
diff --git a/icons/guitar.svg b/icons/guitar.svg
new file mode 100644
index 000000000..d2f86707f
--- /dev/null
+++ b/icons/guitar.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m20 7 1.7-1.7a1 1 0 0 0 0-1.4l-1.6-1.6a1 1 0 0 0-1.4 0L17 4v3Z" />
+  <path d="m17 7-5.1 5.1" />
+  <circle cx="11.5" cy="12.5" r=".5" />
+  <path d="M6 12a2 2 0 0 0 1.8-1.2l.4-.9C8.7 8.8 9.8 8 11 8c2.8 0 5 2.2 5 5 0 1.2-.8 2.3-1.9 2.8l-.9.4A2 2 0 0 0 12 18a4 4 0 0 1-4 4c-3.3 0-6-2.7-6-6a4 4 0 0 1 4-4" />
+  <path d="m6 16 2 2" />
+</svg>
diff --git a/icons/keyboard-music.json b/icons/keyboard-music.json
new file mode 100644
index 000000000..5b6f43003
--- /dev/null
+++ b/icons/keyboard-music.json
@@ -0,0 +1,34 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "music",
+    "audio",
+    "sound",    
+    "noise",
+    "notes",
+    "keys",
+    "chord",
+    "octave",
+    "midi",
+    "controller",
+    "instrument",
+    "electric",
+    "signal",
+    "digital",
+    "studio",
+    "production",
+    "producer",
+    "pianist",
+    "piano",
+    "play",
+    "performance",
+    "concert"
+  ],
+  "categories": [
+    "multimedia",
+    "devices"
+  ]
+}
\ No newline at end of file
diff --git a/icons/keyboard-music.svg b/icons/keyboard-music.svg
new file mode 100644
index 000000000..2d434ab90
--- /dev/null
+++ b/icons/keyboard-music.svg
@@ -0,0 +1,21 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <rect width="20" height="16" x="2" y="4" rx="2" />
+  <path d="M6 8h4" />
+  <path d="M14 8h.01" />
+  <path d="M18 8h.01" />
+  <path d="M2 12h20" />
+  <path d="M6 12v4" />
+  <path d="M10 12v4" />
+  <path d="M14 12v4" />
+  <path d="M18 12v4" />
+</svg>
diff --git a/icons/piano.json b/icons/piano.json
new file mode 100644
index 000000000..c4ac9959f
--- /dev/null
+++ b/icons/piano.json
@@ -0,0 +1,26 @@
+{
+  "$schema": "../icon.schema.json",
+  "contributors": [
+    "danielbayley"
+  ],
+  "tags": [
+    "music",
+    "audio",
+    "sound",
+    "noise",
+    "notes",
+    "chord",
+    "keys",
+    "octave",
+    "acoustic",
+    "instrument",
+    "play",
+    "pianist",
+    "performance",
+    "concert"
+  ],
+  "categories": [
+    "multimedia",
+    "devices"
+  ]
+}
\ No newline at end of file
diff --git a/icons/piano.svg b/icons/piano.svg
new file mode 100644
index 000000000..658c28a88
--- /dev/null
+++ b/icons/piano.svg
@@ -0,0 +1,18 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M18.5 8c-1.4 0-2.6-.8-3.2-2A6.87 6.87 0 0 0 2 9v11a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2v-8.5C22 9.6 20.4 8 18.5 8" />
+  <path d="M2 14h20" />
+  <path d="M6 14v4" />
+  <path d="M10 14v4" />
+  <path d="M14 14v4" />
+  <path d="M18 14v4" />
+</svg>
diff --git a/icons/speaker.json b/icons/speaker.json
index d34c80905..96d7e1e6c 100644
--- a/icons/speaker.json
+++ b/icons/speaker.json
@@ -5,8 +5,15 @@
     "ericfennis"
   ],
   "tags": [
+    "sound",
     "audio",
-    "music"
+    "music",
+    "tweeter",
+    "subwoofer",
+    "bass",
+    "production",
+    "producer",
+    "dj"
   ],
   "categories": [
     "multimedia",
diff --git a/icons/speaker.svg b/icons/speaker.svg
index 5bf5430f6..387baab0e 100644
--- a/icons/speaker.svg
+++ b/icons/speaker.svg
@@ -9,7 +9,8 @@
   stroke-linecap="round"
   stroke-linejoin="round"
 >
-  <rect width="16" height="20" x="4" y="2" rx="2" ry="2" />
+  <rect width="16" height="20" x="4" y="2" rx="2" />
+  <path d="M12 6h.01" />
   <circle cx="12" cy="14" r="4" />
-  <line x1="12" x2="12.01" y1="6" y2="6" />
+  <path d="M12 14h.01" />
 </svg>