diff --git a/icons/beer.svg b/icons/beer.svg
new file mode 100644
index 000000000..5a8a5757e
--- /dev/null
+++ b/icons/beer.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="M17 11h1a3 3 0 0 1 0 6h-1" />
+  <path d="M9 12v6" />
+  <path d="M13 12v6" />
+  <path d="M14 7.5c-1 0-1.44.5-3 .5s-2-.5-3-.5-1.72.5-2.5.5a2.5 2.5 0 0 1 0-5c.78 0 1.57.5 2.5.5S9.44 2 11 2s2 1.5 3 1.5 1.72-.5 2.5-.5a2.5 2.5 0 0 1 0 5c-.78 0-1.5-.5-2.5-.5Z" />
+  <path d="M5 8v12a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V8" />
+</svg>
diff --git a/icons/cup-soda.svg b/icons/cup-soda.svg
new file mode 100644
index 000000000..f745c7a23
--- /dev/null
+++ b/icons/cup-soda.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"
+>
+  <path d="m6 8 1.75 12.28a2 2 0 0 0 2 1.72h4.54a2 2 0 0 0 2-1.72L18 8" />
+  <path d="M5 8h14" />
+  <path d="M7 15a6.47 6.47 0 0 1 5 0 6.47 6.47 0 0 0 5 0" />
+  <path d="m12 8 1-6h2" />
+</svg>
diff --git a/icons/glass-water.svg b/icons/glass-water.svg
new file mode 100644
index 000000000..3db6743a5
--- /dev/null
+++ b/icons/glass-water.svg
@@ -0,0 +1,14 @@
+<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="M15.2 22H8.8a2 2 0 0 1-2-1.79L5 3h14l-1.81 17.21A2 2 0 0 1 15.2 22Z" />
+  <path d="M6 12a5 5 0 0 1 6 0 5 5 0 0 0 6 0" />
+</svg>
diff --git a/icons/martini.svg b/icons/martini.svg
new file mode 100644
index 000000000..31dc459f4
--- /dev/null
+++ b/icons/martini.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"
+>
+  <path d="M8 22h8" />
+  <path d="M12 11v11" />
+  <path d="m19 3-7 8-7-8Z" />
+</svg>
diff --git a/icons/wine.svg b/icons/wine.svg
new file mode 100644
index 000000000..fbddb1da2
--- /dev/null
+++ b/icons/wine.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"
+>
+  <path d="M8 22h8" />
+  <path d="M7 10h10" />
+  <path d="M12 15v7" />
+  <path d="M12 15a5 5 0 0 0 5-5c0-2-.5-4-2-8H9c-1.5 4-2 6-2 8a5 5 0 0 0 5 5Z" />
+</svg>
diff --git a/tags.json b/tags.json
index e564ec765..a1743c65d 100644
--- a/tags.json
+++ b/tags.json
@@ -396,6 +396,13 @@
   "beaker": [
     "cup"
   ],
+  "beer": [
+    "alcohol",
+    "bar",
+    "beverage",
+    "brewery",
+    "drink"
+  ],
   "bed": [
     "sleep",
     "hotel",
@@ -1040,6 +1047,14 @@
     "winner",
     "favourite"
   ],
+  "cup-soda": [
+    "beverage",
+    "cup",
+    "drink",
+    "soda",
+    "straw",
+    "water"
+  ],
   "currency": [
     "finance",
     "money"
@@ -1476,6 +1491,12 @@
     "logo",
     "version control"
   ],
+  "glass-water": [
+    "beverage",
+    "drink",
+    "glass",
+    "water"
+  ],
   "glasses": [
     "glasses",
     "spectacles"
@@ -1911,6 +1932,14 @@
     "travel",
     "marker"
   ],
+  "martini": [
+    "cocktail",
+    "alcohol",
+    "beverage",
+    "bar",
+    "drink",
+    "glass"
+  ],
   "maximize": [
     "fullscreen",
     "expand"
@@ -3217,6 +3246,16 @@
     "air",
     "blow"
   ],
+  "wine": [
+    "alcohol",
+    "beverage",
+    "bar",
+    "drink",
+    "glass",
+    "sommelier",
+    "vineyard",
+    "winery"
+  ],
   "wrap-text": [
     "words",
     "lines",