diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml
index f777b29ee..70ba8394a 100644
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -199,6 +199,7 @@
     <string name="type.natural.water.wastewater">Wastewater</string>
     <string name="type.barrier.entrance">Entrance</string>
     <string name="type.barrier.fence">Fence</string>
+    <string name="type.barrier.guard_rail">Guard Rail</string>
     <string name="type.barrier.gate">Gate</string>
     <string name="type.barrier.hedge">Hedge</string>
     <string name="type.barrier.kissing_gate">Kissing Gate</string>
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 6727e4c4b..af444de70 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -672,7 +672,7 @@ deprecated|deprecated;552;x
 deprecated|deprecated;553;x
 deprecated|deprecated;554;x
 deprecated:highway|footway|demanding_alpine_hiking:04.2024;[highway=footway][sac_scale=demanding_alpine_hiking];x;name;int_name;555;highway|path|expert
-deprecated|deprecated;556;x
+barrier|guard_rail;556;
 deprecated|deprecated;557;x
 deprecated|deprecated;558;x
 deprecated|deprecated;559;x
diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index e828a83f7..c4bfee98b 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -579,6 +579,13 @@ line|z18-[barrier=fence],
 line|z18-[barrier=wall],
 {width: 1.5; opacity: 0.8;}
 
+line|z16-[barrier=guard_rail],
+{color: @fence; width: 1; opacity: 0.3;}
+line|z17[barrier=guard_rail],
+{width: 1.3; opacity: 0.4;}
+line|z18-[barrier=guard_rail],
+{width: 1.5; opacity: 0.6;}
+
 
 line|z16-[barrier=hedge],
 {color: @hedge; width: 1.6; opacity: 0.4;}
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 2193f09b6..59f1ce3dc 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 @@ waterway-weir                                       # line z14- (also has pathte
 
 barrier-city_wall                                   # line z14- (also has pathtext z16-)
 barrier-fence                                       # line z16-
+barrier-guard_rail
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z16-
 railway-funicular                                   # line z12-
diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss
index c08192a9d..f8b12609f 100644
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -97,6 +97,13 @@ line|z18-[barrier=fence],
 line|z18-[barrier=wall],
 {width: 1.5; opacity: 1;}
 
+line|z15-[barrier=guard_rail],
+{color: @fence; width: 1; opacity: 0.5;}
+line|z17[barrier=guard_rail],
+{width: 1.3; opacity: 0.6;}
+line|z18-[barrier=guard_rail],
+{width: 1.5; opacity: 0.8;}
+
 line|z15-[barrier=ditch],
 {width: 1.8; opacity: 0.8; color: @cliff; dashes: 0.9,0.9;}
 
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index e70b1cd90..482819ee6 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 @@ waterway-weir                                       # line z14- (also has pathte
 
 barrier-city_wall                                   # line z14- (also has pathtext z16-)
 barrier-fence                                       # line z15-
+barrier-guard_rail
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z15-
 railway-funicular                                   # line z12-
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index b056c0eb1..6f89aa2d4 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -469,6 +469,10 @@ line|z18-[barrier=fence],
 line|z18-[barrier=wall],
 {width: 1.3; opacity:0.6;}
 
+line|z17-[barrier=guard_rail],
+{color: @fence; width: 1; opacity: 0.3;}
+line|z18-[barrier=guard_rail],
+{width: 1.3; opacity:0.4;}
 
 line|z18-[barrier=hedge],
 {color: @hedge; width: 2; opacity: 0.3;}
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index 348d25881..daebcbbdd 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -26,6 +26,7 @@ waterway-weir                                       # line z15-
 
 barrier-city_wall                                   # line z15-
 barrier-fence                                       # line z17-
+barrier-guard_rail
 barrier-hedge                                       # line z18-
 barrier-wall                                        # line z17-
 railway-monorail                                    # line z14-
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index e15b296e4..b6f4b4c22 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -209,6 +209,7 @@
 "type.natural.water.wastewater" = "Wastewater";
 "type.barrier.entrance" = "Entrance";
 "type.barrier.fence" = "Fence";
+"type.barrier.guard_rail" = "Guard Rail";
 "type.barrier.gate" = "Gate";
 "type.barrier.hedge" = "Hedge";
 "type.barrier.kissing_gate" = "Kissing Gate";