diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index becd090383..f03ac0bfe2 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -1360,7 +1360,7 @@ area|z15[amenity=food_court]
 {icon-image: fastfood-m.svg;icon-min-distance: 28;}
 node|z15[amenity=bar],
 area|z15[amenity=bar]
-{icon-image: beer-m.svg;icon-min-distance: 28;}
+{icon-image: bar-m.svg;icon-min-distance: 28;}
 node|z15[amenity=pub],
 area|z15[amenity=pub],
 node|z15[amenity=biergarten],
@@ -1380,7 +1380,7 @@ area|z16-[amenity=food_court]
 {icon-image: fastfood-m.svg;icon-min-distance: 12;}
 node|z16-[amenity=bar],
 area|z16-[amenity=bar]
-{icon-image: beer-m.svg;icon-min-distance: 12;}
+{icon-image: bar-m.svg;icon-min-distance: 12;}
 node|z16-[amenity=pub],
 area|z16-[amenity=pub],
 node|z16-[amenity=biergarten],
@@ -1915,7 +1915,7 @@ area|z18-[amenity=place_of_worship][religion=taoist]
 
 node|z16-[amenity=nightclub],
 area|z16-[amenity=nightclub]
-{icon-image: bar-m.svg;font-size: 11;}
+{icon-image: nightclub-m.svg;font-size: 11;}
 
 node|z16[amenity=bank],
 area|z16[amenity=bank]
diff --git a/data/styles/clear/style-clear/symbols/nightclub-m.svg b/data/styles/clear/style-clear/symbols/nightclub-m.svg
new file mode 100644
index 0000000000..08bd84e21f
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/nightclub-m.svg
@@ -0,0 +1,5 @@
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+   <circle id="Oval" cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
+  <path d="m18.289 5.5406c0.20956 0.15523 0.33374 0.40359 0.33374 0.6649v8.6928c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-3.7669l-6.6231 1.9869v5.3864c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-5.9142c0-0.36479 0.2406-0.68818 0.58987-0.79426l8.2789-2.4837c0.25095-0.075029 0.5226-0.02848 0.73216 0.12936z" fill="#fff"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/nightclub-m.svg b/data/styles/clear/style-night/symbols/nightclub-m.svg
new file mode 100644
index 0000000000..bab030d09e
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/nightclub-m.svg
@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+  <g opacity=".6">
+    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
+    <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+    <path d="m18.289 5.5406c0.20956 0.15523 0.33374 0.40359 0.33374 0.6649v8.6928c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-3.7669l-6.6231 1.9869v5.3864c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-5.9142c0-0.36479 0.2406-0.68818 0.58987-0.79426l8.2789-2.4837c0.25095-0.075029 0.5226-0.02848 0.73216 0.12936z" fill="#fff"/>
+  </g>
+</svg>