diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index f5a7c5c11..cf207407e 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -642,7 +642,8 @@ sport|diving;520;
 #~270k uses.
 man_made|utility_pole;521;
 deprecated:boundary|administrative|suburb:04.2024;[boundary=administrative][border_type=suburb];x;name;int_name;522;
-deprecated|deprecated;523;x
+# Generic unspecified barrier, could be node (50k) or way (100k)
+barrier|yes;523;
 railway|monorail|tunnel;[railway=monorail][tunnel?];;name;int_name;524;
 railway|funicular|bridge;[railway=funicular][bridge?];;name;int_name;525;
 deprecated|deprecated;526;x
diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index 9336f72b8..1aba7acf3 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -672,12 +672,15 @@ area|z17-[waterway=dam],
 
 line|z16-[barrier=fence],
 line|z16-[barrier=wall],
+line|z16-[barrier=yes],
 {color: @fence; width: 1; opacity: 0.5;}
 line|z17[barrier=fence],
 line|z17[barrier=wall],
+line|z17[barrier=yes],
 {width: 1.3; opacity: 0.6;}
 line|z18-[barrier=fence],
 line|z18-[barrier=wall],
+line|z18-[barrier=yes],
 {width: 1.5; opacity: 0.8;}
 
 line|z17-[barrier=guard_rail],
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 0e71478a5..2a4ffb4c6 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -745,6 +745,7 @@ node|z16-[leisure=marina],
 node|z16-[leisure=water_park],
 node|z16-[barrier=block],
 node|z16-[barrier=bollard],
+node|z16-[barrier=yes],
 node|z16-[barrier=chain],
 node|z16-[barrier=entrance],
 node|z16-[barrier=gate],
@@ -1169,6 +1170,7 @@ node|z15-[barrier=border_control],
 
 node|z16-[barrier=block],
 node|z16-[barrier=bollard],
+node|z16-[barrier=yes],
 node|z16-[barrier=chain],
 node|z16-[barrier=stile],
 node|z16-[barrier=turnstile],
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 4884b9040..12ade7c81 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -58,6 +58,7 @@ barrier-fence                                       # line z16-
 barrier-guard_rail                                  # line z17-
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z16-
+barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
 railway-funicular                                   # line z12-
 railway-funicular-bridge                            # line z12-
 railway-funicular-tunnel                            # line z12-
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index c3f474d6a..0c3ba6ffb 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -875,6 +875,7 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
+barrier-yes                                         # icon z16- (also has caption(optional) z16-, line z16-)
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
@@ -1856,6 +1857,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
+# barrier-yes                                       # caption(optional) z16- (also has icon z16-, line z16-)
 # leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700
 
diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss
index 50d1a903b..61c53ce8a 100644
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -53,12 +53,15 @@ line|z18-[man_made=cutline],
 
 line|z15-[barrier=fence],
 line|z15-[barrier=wall],
+line|z15-[barrier=yes],
 {color: @fence; width: 1; opacity: 0.7;}
 line|z17[barrier=fence],
 line|z17[barrier=wall],
+line|z17[barrier=yes],
 {width: 1.3; opacity: 0.8;}
 line|z18-[barrier=fence],
 line|z18-[barrier=wall],
+line|z18-[barrier=yes],
 {width: 1.5; opacity: 1;}
 
 line|z16-[barrier=guard_rail],
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index e2b56fcbc..c7720d1c9 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -60,6 +60,7 @@ barrier-fence                                       # line z15-
 barrier-guard_rail                                  # line z16-
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z15-
+barrier-yes                                         # line z15- (also has icon z16-, caption(optional) z16-)
 railway-funicular                                   # line z12-
 railway-funicular-bridge                            # line z12-
 railway-funicular-tunnel                            # line z12-
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 2477a717d..3afef6471 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -875,6 +875,7 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
+barrier-yes                                         # icon z16- (also has caption(optional) z16-, line z15-)
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
@@ -1859,6 +1860,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
+# barrier-yes                                       # caption(optional) z16- (also has icon z16-, line z15-)
 # leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700
 
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 1d008da37..42dc2b0e7 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -465,9 +465,11 @@ area|z16-[waterway=dam],
 
 line|z17-[barrier=fence],
 line|z17-[barrier=wall],
+line|z17-[barrier=yes],
 {color: @fence; width: 1; opacity: 0.5;}
 line|z18-[barrier=fence],
 line|z18-[barrier=wall],
+line|z18-[barrier=yes],
 {width: 1.3; opacity:0.6;}
 
 line|z17-[barrier=guard_rail],
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index f04f8c2e3..fdb565d1c 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -30,6 +30,7 @@ barrier-fence                                       # line z17-
 barrier-guard_rail                                  # line z17-
 barrier-hedge                                       # line z18-
 barrier-wall                                        # line z17-
+barrier-yes                                         # line z17-
 railway-monorail                                    # line z14-
 railway-monorail-bridge                             # line z14-
 railway-monorail-tunnel                             # line z14-