diff --git a/app/assets/images/browse/amenity_helipad.svg b/app/assets/images/browse/amenity_helipad.svg
index 259a464b079..8eb607a0e84 100644
--- a/app/assets/images/browse/amenity_helipad.svg
+++ b/app/assets/images/browse/amenity_helipad.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="16" height="16" viewBox="0 0 16 16">
-  <path d="m8,.5 a7.5,7.5 0 0 0 0,15 a7.5,7.5 0 0 0 0,-15 z m0,1 a6.5,6.5 0 0 1 0,13 a6.5,6.5 0 0 1 0,-13 z m-3,1.5 l-.75,.75 v8.5 l.75,.75 h1 v-4 h4 v4 h1 l.75,-.75 v-8.5 l-.75,-.75 h-1 v4 h-4 v-4 z"/>
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+<path d="M 7 0.4375 C 3.375 0.4375 0.4375 3.375 0.4375 7 C 0.4375 10.625 3.375 13.5625 7 13.5625 C 10.625 13.5625 13.5625 10.625 13.5625 7 C 13.5625 3.375 10.625 0.4375 7 0.4375 Z M 7 1.3125 C 10.140625 1.3125 12.6875 3.859375 12.6875 7 C 12.6875 10.140625 10.140625 12.6875 7 12.6875 C 3.859375 12.6875 1.3125 10.140625 1.3125 7 C 1.3125 3.859375 3.859375 1.3125 7 1.3125 Z M 4.375 2.625 L 3.71875 3.28125 L 3.71875 10.71875 L 4.375 11.375 L 5.25 11.375 L 5.25 7.875 L 8.75 7.875 L 8.75 11.375 L 9.625 11.375 L 10.28125 10.71875 L 10.28125 3.28125 L 9.625 2.625 L 8.75 2.625 L 8.75 6.125 L 5.25 6.125 L 5.25 2.625 Z M 4.375 2.625 "/>
 </svg>
diff --git a/app/assets/images/browse/barrier_gate.svg b/app/assets/images/browse/barrier_gate.svg
index 76f44883715..3d939111530 100644
--- a/app/assets/images/browse/barrier_gate.svg
+++ b/app/assets/images/browse/barrier_gate.svg
@@ -1,8 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   id="icon"
-   width="6"
-   height="5">
-  <path d="M 4 0 L 3.4003906 1 L 0 1 L 0 2 L 2.8007812 2 L 2.2011719 3 L 0 3 L 0 4 L 1.5996094 4 L 1 5 L 2 5 L 2.5996094 4 L 6 4 L 6 3 L 3.2011719 3 L 3.8007812 2 L 6 2 L 6 1 L 4.4003906 1 L 5 0 L 4 0 z " />
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 8.6290084,2.9274786 7.6522395,4.5564872 H 2.112974 V 6.1854958 H 6.6754706 L 5.698702,7.8145045 H 2.112974 V 9.4435129 H 4.7187515 L 3.7419827,11.072521 H 5.3709912 L 6.3477601,9.4435129 H 11.887026 V 7.8145045 H 7.3277106 L 8.3044793,6.1854958 H 11.887026 V 4.5564872 H 9.2812482 L 10.258017,2.9274786 Z" />
 </svg>
diff --git a/app/assets/images/browse/barrier_lift_gate.svg b/app/assets/images/browse/barrier_lift_gate.svg
index 8b55ef1be26..38b82e7da9e 100644
--- a/app/assets/images/browse/barrier_lift_gate.svg
+++ b/app/assets/images/browse/barrier_lift_gate.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="6" height="5" viewBox="0 0 6 5">
-  <path d="m0,0 v5 h2 v-3 h4 v-1 h-4 v-1 z" />
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 1.723824,2.6031868 V 11.396813 H 5.2412746 V 6.1206373 H 12.276176 V 4.361912 H 5.2412746 V 2.6031868 Z" />
 </svg>
diff --git a/app/assets/images/browse/barrier_stile.svg b/app/assets/images/browse/barrier_stile.svg
index 4e0e5e89fbf..add26fd60be 100644
--- a/app/assets/images/browse/barrier_stile.svg
+++ b/app/assets/images/browse/barrier_stile.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="10" height="10" viewBox="0 0 10 10">
-  <path d="m2,.5 a.5,.5 0 0 1 1,0 v3.5 h4 v-3.5 a.5,.5 0 0 1 1,0 v9.5 h-1 v-1 h-4 v1 h-1 z m1,4.5 v1 h4 v-1 z m0,2 v1 h4 v-1 z"/>
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 3.1014393,1.1521592 a 0.64976012,0.64976012 0 0 1 1.2995201,0 V 5.7004801 H 9.5990405 V 1.1521592 a 0.64976025,0.64976025 0 0 1 1.2995205,0 V 13.497601 H 9.5990405 v -1.29952 H 4.4009594 v 1.29952 H 3.1014393 Z M 4.4009594,7.0000003 V 8.2995206 H 9.5990405 V 7.0000003 Z m 0,2.5990405 V 10.898561 H 9.5990405 V 9.5990408 Z" />
 </svg>
diff --git a/app/assets/images/browse/highway_traffic_light.svg b/app/assets/images/browse/highway_traffic_light.svg
index d88cf83a511..b1553804dad 100644
--- a/app/assets/images/browse/highway_traffic_light.svg
+++ b/app/assets/images/browse/highway_traffic_light.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="5" height="13" viewBox="0 0 5 13">
-  <path d="m0,2.5 a2.5,2.5 0 0 1 5,0 v8 a2.5,2.5 0 0 1 -5,0z m2.5,-1.5 a1.5,1.5 0 0 0 0,3 a1.5,1.5 0 0 0 0,-3z m0,4 a1.5,1.5 0 0 0 0,3 a1.5,1.5 0 0 0 0,-3z m0,4 a1.5,1.5 0 0 0 0,3 a1.5,1.5 0 0 0 0,-3z"/>
+<svg xmlns="http://www.w3.org/2000/svg" id="icon" width="14" height="14" viewBox="0 0 14 14">
+  <path d="m 4.5,3 a 2.5,2.5 0 0 1 5,0 v 8 a 2.5,2.5 0 0 1 -5,0 z M 7,1.5 a 1.5,1.5 0 0 0 0,3 1.5,1.5 0 0 0 0,-3 z m 0,4 a 1.5,1.5 0 0 0 0,3 1.5,1.5 0 0 0 0,-3 z m 0,4 a 1.5,1.5 0 0 0 0,3 1.5,1.5 0 0 0 0,-3 z" />
 </svg>
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index e65cc99a08f..75f0d8b02d0 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -958,20 +958,6 @@ img.trace_image {
     /*rtl:ignore*/ transform: translate(2px, 0px);
   }
 
-  .highway_traffic_light {
-    /*rtl:ignore*/ transform: translate(6px, 0px);
-  }
-
-  .barrier_stile {
-    /*rtl:ignore*/ transform: scale(1.1) translate(4px, 2px);
-  }
-
-  .barrier_swing_gate,
-  .barrier_gate,
-  .barrier_lift_gate {
-    /*rtl:ignore*/ transform: scale(1.5) translate(7px, 4px);
-  }
-
   .amenity_waste_basket,
   .man_made_cross {
     /*rtl:ignore*/ transform: scale(1.5) translate(6px, 4px);
diff --git a/config/browse_image.yml b/config/browse_image.yml
index c67a5c12ccc..6e86425d343 100644
--- a/config/browse_image.yml
+++ b/config/browse_image.yml
@@ -238,25 +238,21 @@ barrier_full-height_turnstile:
   fill: barrier
   image: barrier_full-height_turnstile.svg
 barrier_gate:
-  class: barrier_gate
   fill: barrier
   image: barrier_gate.svg
 barrier_kissing_gate:
   fill: barrier
   image: barrier_kissing_gate.svg
 barrier_lift_gate:
-  class: barrier_gate
   fill: barrier
   image: barrier_lift_gate.svg
 barrier_motorcycle_barrier:
   fill: barrier
   image: barrier_motorcycle_barrier.svg
 barrier_stile:
-  class: barrier_stile
   fill: barrier
   image: barrier_stile.svg
 barrier_swing_gate:
-  class: barrier_swing_gate
   fill: barrier
   image: barrier_lift_gate.svg
 barrier_toll_booth:
@@ -278,7 +274,6 @@ highway_mini_roundabout:
   fill: turning_circle
   image: highway_mini_roundabout.svg
 highway_traffic_signals:
-  class: highway_traffic_light
   fill: traffic-light
   image: highway_traffic_light.svg
 highway_turning_circle: