diff --git a/data/classificator.txt b/data/classificator.txt
index f06b49867e..84fdc265aa 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -719,6 +719,7 @@ world  +
         tower  +
             communication  -
             {}
+        utility_pole  -
         wastewater_plant  -
         water_tap  +
             drinking_water_no  -
@@ -883,6 +884,7 @@ world  +
             solar  -
             wind  -
             {}
+        pole  -
         station  -
         substation  -
         tower  -
diff --git a/data/colors.txt b/data/colors.txt
index f970ee2285..5801c34d74 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -412,6 +412,7 @@
 1294740506
 1295200045
 1295200561
+1295201075
 1295397940
 1295429823
 1295523604
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 2d42a39b0e..a38049abc8 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 395dfbc17f..8001306a03 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -57141,6 +57141,51 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-utility_pole"
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+}
 cont {
   name: "man_made-water_tap"
   element {
@@ -73848,6 +73893,40 @@ cont {
 }
 cont {
   name: "power-line"
+  element {
+    scale: 13
+    lines {
+      width: 4.0
+      color: 2157352326
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 2576782726
+      priority: 350
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 4.0
+      color: 2157352326
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 2576782726
+      priority: 350
+    }
+  }
   element {
     scale: 15
     lines {
@@ -73951,6 +74030,123 @@ cont {
     }
   }
 }
+cont {
+  name: "power-minor_line"
+  element {
+    scale: 15
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+      cap: BUTTCAP
+    }
+  }
+}
 cont {
   name: "power-plant"
   element {
@@ -74210,6 +74406,51 @@ cont {
     }
   }
 }
+cont {
+  name: "power-pole"
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+}
 cont {
   name: "power-station"
   element {
@@ -74314,6 +74555,13 @@ cont {
 }
 cont {
   name: "power-tower"
+  element {
+    scale: 13
+    symbol {
+      name: "dot-m"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 06285bc01b..81804c3104 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 56f0edd1c7..2183650c31 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -57393,6 +57393,51 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-utility_pole"
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+}
 cont {
   name: "man_made-water_tap"
   element {
@@ -74441,9 +74486,9 @@ cont {
 cont {
   name: "power-line"
   element {
-    scale: 15
+    scale: 13
     lines {
-      width: 4.0
+      width: 3.4
       color: 2150839091
       dashdot {
         dd: 1.0
@@ -74453,11 +74498,49 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.0
+      width: 0.8
       color: 2150839091
       priority: 350
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 4.0
+      color: 1714631475
+      dashdot {
+        dd: 1.0
+        dd: 50.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.0
+      color: 1714631475
+      priority: 350
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 4.5
+      color: 1295201075
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.3
+      color: 1295201075
+      priority: 350
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -74470,17 +74553,17 @@ cont {
   element {
     scale: 16
     lines {
-      width: 4.0
-      color: 2150839091
+      width: 4.5
+      color: 1295201075
       dashdot {
         dd: 1.0
-        dd: 50.0
+        dd: 80.0
       }
       priority: 340
     }
     lines {
-      width: 1.0
-      color: 2150839091
+      width: 1.3
+      color: 1295201075
       priority: 350
     }
     path_text {
@@ -74496,7 +74579,7 @@ cont {
     scale: 17
     lines {
       width: 4.5
-      color: 1714631475
+      color: 1295201075
       dashdot {
         dd: 1.0
         dd: 80.0
@@ -74505,7 +74588,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 1714631475
+      color: 1295201075
       priority: 350
     }
     path_text {
@@ -74521,7 +74604,7 @@ cont {
     scale: 18
     lines {
       width: 4.5
-      color: 1714631475
+      color: 1295201075
       dashdot {
         dd: 1.0
         dd: 80.0
@@ -74530,7 +74613,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 1714631475
+      color: 1295201075
       priority: 350
     }
     path_text {
@@ -74546,7 +74629,7 @@ cont {
     scale: 19
     lines {
       width: 4.5
-      color: 1714631475
+      color: 1295201075
       dashdot {
         dd: 1.0
         dd: 80.0
@@ -74555,7 +74638,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 1714631475
+      color: 1295201075
       priority: 350
     }
     path_text {
@@ -74571,7 +74654,7 @@ cont {
     scale: 20
     lines {
       width: 4.5
-      color: 1714631475
+      color: 1295201075
       dashdot {
         dd: 1.0
         dd: 80.0
@@ -74580,7 +74663,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 1714631475
+      color: 1295201075
       priority: 350
     }
     path_text {
@@ -74593,6 +74676,113 @@ cont {
     }
   }
 }
+cont {
+  name: "power-minor_line"
+  element {
+    scale: 15
+    lines {
+      width: 4.0
+      color: 1714631475
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.0
+      color: 1714631475
+      priority: 350
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 4.0
+      color: 1714631475
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 1714631475
+      priority: 350
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 1714631475
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 1714631475
+      priority: 350
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 1714631475
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 1714631475
+      priority: 350
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 1714631475
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 1714631475
+      priority: 350
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 1714631475
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 1714631475
+      priority: 350
+    }
+  }
+}
 cont {
   name: "power-plant"
   element {
@@ -74852,6 +75042,51 @@ cont {
     }
   }
 }
+cont {
+  name: "power-pole"
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+}
 cont {
   name: "power-station"
   element {
@@ -74956,6 +75191,13 @@ cont {
 }
 cont {
   name: "power-tower"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index edc607b653..12c4d5840c 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index a9e01b2821..6d8275b3dc 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -57147,6 +57147,51 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-utility_pole"
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+}
 cont {
   name: "man_made-water_tap"
   element {
@@ -74226,9 +74271,9 @@ cont {
 cont {
   name: "power-line"
   element {
-    scale: 15
+    scale: 13
     lines {
-      width: 4.0
+      width: 3.4
       color: 2157352326
       dashdot {
         dd: 1.0
@@ -74238,11 +74283,49 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.0
+      width: 0.8
       color: 2157352326
       priority: 350
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 50.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 4.5
+      color: 1301714310
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.3
+      color: 1301714310
+      priority: 350
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -74255,17 +74338,17 @@ cont {
   element {
     scale: 16
     lines {
-      width: 4.0
-      color: 2157352326
+      width: 4.5
+      color: 1301714310
       dashdot {
         dd: 1.0
-        dd: 50.0
+        dd: 80.0
       }
       priority: 340
     }
     lines {
-      width: 1.0
-      color: 2157352326
+      width: 1.3
+      color: 1301714310
       priority: 350
     }
     path_text {
@@ -74281,7 +74364,7 @@ cont {
     scale: 17
     lines {
       width: 4.5
-      color: 1721144710
+      color: 1301714310
       dashdot {
         dd: 1.0
         dd: 80.0
@@ -74290,7 +74373,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 1721144710
+      color: 1301714310
       priority: 350
     }
     path_text {
@@ -74306,7 +74389,7 @@ cont {
     scale: 18
     lines {
       width: 4.5
-      color: 1721144710
+      color: 1301714310
       dashdot {
         dd: 1.0
         dd: 80.0
@@ -74315,7 +74398,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 1721144710
+      color: 1301714310
       priority: 350
     }
     path_text {
@@ -74331,7 +74414,7 @@ cont {
     scale: 19
     lines {
       width: 4.5
-      color: 1721144710
+      color: 1301714310
       dashdot {
         dd: 1.0
         dd: 80.0
@@ -74340,7 +74423,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 1721144710
+      color: 1301714310
       priority: 350
     }
     path_text {
@@ -74356,7 +74439,7 @@ cont {
     scale: 20
     lines {
       width: 4.5
-      color: 1721144710
+      color: 1301714310
       dashdot {
         dd: 1.0
         dd: 80.0
@@ -74365,7 +74448,7 @@ cont {
     }
     lines {
       width: 1.3
-      color: 1721144710
+      color: 1301714310
       priority: 350
     }
     path_text {
@@ -74378,6 +74461,113 @@ cont {
     }
   }
 }
+cont {
+  name: "power-minor_line"
+  element {
+    scale: 15
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 4.0
+      color: 1721144710
+      dashdot {
+        dd: 1.0
+        dd: 80.0
+      }
+      priority: 340
+    }
+    lines {
+      width: 1.0
+      color: 1721144710
+      priority: 350
+    }
+  }
+}
 cont {
   name: "power-plant"
   element {
@@ -74637,6 +74827,51 @@ cont {
     }
   }
 }
+cont {
+  name: "power-pole"
+  element {
+    scale: 15
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mast-m"
+      priority: 230
+    }
+  }
+}
 cont {
   name: "power-station"
   element {
@@ -74741,6 +74976,13 @@ cont {
 }
 cont {
   name: "power-tower"
+  element {
+    scale: 13
+    symbol {
+      name: "mast-m"
+      priority: 450
+    }
+  }
   element {
     scale: 14
     symbol {
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index 7f81cd97f8..e70b1cd90f 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -39,12 +39,12 @@ aerialway-t-bar                                     # line z13- (also has line::
 historic-citywalls                                  # line z14- (also has pathtext z16-)
 === 360
 
-power-line                                          # line z15- (also has line::dash z15-, pathtext z15-)
-power-minor_line
+power-line                                          # line z13- (also has line::dash z13-, pathtext z15-)
+power-minor_line                                    # line z15- (also has line::dash z15-)
 === 350
 
-power-line::dash                                    # line::dash z15- (also has line z15-, pathtext z15-)
-power-minor_line::dash
+power-line::dash                                    # line::dash z13- (also has line z13-, pathtext z15-)
+power-minor_line::dash                              # line::dash z15- (also has line z15-)
 === 340
 
 highway-cycleway                                    # line z11- (also has pathtext z13-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index e12f147911..a0743b8cc7 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1074,7 +1074,7 @@ natural-spring-drinking_water_no                    # icon z12- (also has captio
 
 isoline-step_10                                     # pathtext z16- (also has line z15-)
 isoline-zero                                        # pathtext z15- (also has line z15-)
-power-line                                          # pathtext z15- (also has line z15-, line::dash z15-)
+power-line                                          # pathtext z15- (also has line z13-, line::dash z13-)
 === 1000
 
 amenity-grave_yard                                  # icon z17- (also has caption(optional) z17-, area z14-)
@@ -1177,7 +1177,7 @@ man_made-mast                                       # icon z13- (also has captio
 man_made-silo                                       # icon z13- (also has caption(optional) z14-)
 man_made-storage_tank                               # icon z13- (also has caption(optional) z14-)
 man_made-water_tower                                # icon z13- (also has caption(optional) z14-)
-power-tower                                         # icon z14-
+power-tower                                         # icon z13-
 === 450
 
 amenity-parking                                     # icon z16- (also has caption(optional) z18-, area z15-)
@@ -1200,14 +1200,14 @@ emergency-emergency_ward_entrance                   # icon z18- (also has captio
 building                                            # caption z16- (also has area z14-)
 building-garage                                     # caption z16- (also has area z14-)
 building-has_parts                                  # caption z16- (also has area z14-)
-man_made-utility_pole
+man_made-utility_pole                               # icon z15-
 power-plant                                         # icon z17-
 power-plant-coal                                    # icon z17-
 power-plant-gas                                     # icon z17-
 power-plant-hydro                                   # icon z17-
 power-plant-solar                                   # icon z17-
 power-plant-wind                                    # icon z13- (also has caption(optional) z16-)
-power-pole
+power-pole                                          # icon z15-
 power-station                                       # icon z17- (also has caption(optional) z17-)
 === 230
 
diff --git a/data/types.txt b/data/types.txt
index 0e7bbc71f9..b0f8eb9b81 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -32,10 +32,10 @@ highway|road
 highway|track
 *natural|wetland
 highway|track
-mapswithme
+*power|minor_line
 *amenity|school
 *highway|cycleway
-landuse|farmland
+*power|pole
 amenity|place_of_worship
 highway|track
 *addr:interpolation|odd
@@ -201,7 +201,7 @@ landuse|forest|deciduous
 *amenity|charging_station|motorcar
 *leisure|golf_course
 *highway|service|bridge
-*power|minor_line
+mapswithme
 *natural|wetland|marsh
 *leisure|stadium
 *amenity|doctors
@@ -518,7 +518,7 @@ mapswithme
 mapswithme
 mapswithme
 *sport|diving
-mapswithme
+*man_made|utility_pole
 mapswithme
 mapswithme
 *railway|monorail|tunnel
diff --git a/data/visibility.txt b/data/visibility.txt
index 91579725a6..97bf8f6020 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -719,6 +719,7 @@ world  000000000000000000000  +
         tower  000000000000000000000  +
             communication  000000000000000000000  -
             {}
+        utility_pole  000000000000000000000  -
         wastewater_plant  000000000000000000000  -
         water_tap  000000000000000000000  +
             drinking_water_no  000000000000000000000  -
@@ -883,6 +884,7 @@ world  000000000000000000000  +
             solar  000000000000000000000  -
             wind  000000000000000000000  -
             {}
+        pole  000000000000000000000  -
         station  000000000000000000000  -
         substation  000000000000000000000  -
         tower  000000000000000000000  -