diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 3e11fc5d55..0cb92e705e 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 7ea4745955..604b8a403b 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -5936,23 +5936,6 @@ cont {
 }
 cont {
   name: "amenity-loading_dock"
-  element {
-    scale: 18
-    symbol {
-      name: "entrance-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6381914
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -5963,7 +5946,6 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_x: 1
         offset_y: 1
         is_optional: true
       }
@@ -13882,7 +13864,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13897,7 +13879,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13912,7 +13894,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13927,7 +13909,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
 }
@@ -15293,15 +15275,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15310,23 +15289,6 @@ cont {
 }
 cont {
   name: "entrance-exit"
-  element {
-    scale: 18
-    symbol {
-      name: "exit-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6381914
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -15337,15 +15299,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15364,8 +15323,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
         is_optional: true
       }
       priority: -9780
@@ -15381,15 +15344,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -9780
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 081f0a5114..09021dd09f 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 1d02bd0649..37e04028d8 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5902,23 +5902,6 @@ cont {
 }
 cont {
   name: "amenity-loading_dock"
-  element {
-    scale: 18
-    symbol {
-      name: "entrance-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6381914
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -5929,7 +5912,6 @@ cont {
       primary {
         height: 10
         color: 4473924
-        offset_x: 1
         offset_y: 1
         is_optional: true
       }
@@ -13740,7 +13722,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13755,7 +13737,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13770,7 +13752,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13785,7 +13767,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
 }
@@ -15151,15 +15133,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15168,23 +15147,6 @@ cont {
 }
 cont {
   name: "entrance-exit"
-  element {
-    scale: 18
-    symbol {
-      name: "exit-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6381914
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -15195,15 +15157,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15222,8 +15181,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
         is_optional: true
       }
       priority: -9780
@@ -15239,15 +15202,12 @@ cont {
       primary {
         height: 10
         color: 6381914
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 6381914
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -9780
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 8f67935523..827c83d60f 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 657a410471..e0ddd9a26a 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5902,23 +5902,6 @@ cont {
 }
 cont {
   name: "amenity-loading_dock"
-  element {
-    scale: 18
-    symbol {
-      name: "entrance-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -5929,7 +5912,6 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_x: 1
         offset_y: 1
         is_optional: true
       }
@@ -13740,7 +13722,7 @@ cont {
         color: 5263440
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13755,7 +13737,7 @@ cont {
         color: 5263440
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13770,7 +13752,7 @@ cont {
         color: 5263440
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
   element {
@@ -13785,7 +13767,7 @@ cont {
         color: 5263440
         offset_y: 1
       }
-      priority: 200
+      priority: -9970
     }
   }
 }
@@ -15151,15 +15133,12 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 5592405
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15168,23 +15147,6 @@ cont {
 }
 cont {
   name: "entrance-exit"
-  element {
-    scale: 18
-    symbol {
-      name: "exit-s"
-      priority: -10000
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_x: 1
-        text: "ref"
-        is_optional: true
-      }
-      priority: -10000
-    }
-  }
   element {
     scale: 19
     symbol {
@@ -15195,15 +15157,12 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 5592405
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -10000
@@ -15222,8 +15181,12 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 5592405
         is_optional: true
       }
       priority: -9780
@@ -15239,15 +15202,12 @@ cont {
       primary {
         height: 10
         color: 5592405
-        offset_x: 1
-        text: "ref"
+        offset_y: 1
         is_optional: true
       }
       secondary {
-        height: 10
+        height: 8
         color: 5592405
-        offset_y: 10
-        text: "addr:flats"
         is_optional: true
       }
       priority: -9780
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 55f0739e25..a2a2dfe359 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 495d92ffc7..9ff7eba0bf 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -1689,6 +1689,25 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-loading_dock"
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
 cont {
   name: "amenity-motorcycle_parking"
   element {
@@ -6010,7 +6029,11 @@ cont {
       primary {
         height: 13
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 6381914
+        offset_y: 1
       }
       priority: 50
     }
@@ -6029,7 +6052,11 @@ cont {
       primary {
         height: 14
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 6381914
+        offset_y: 1
       }
       priority: 50
     }
@@ -6049,7 +6076,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 30
+      priority: 150
     }
   }
   element {
@@ -6064,7 +6091,7 @@ cont {
         color: 6645086
         offset_y: 1
       }
-      priority: 30
+      priority: 150
     }
   }
 }
@@ -6117,7 +6144,11 @@ cont {
       primary {
         height: 13
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 6381914
+        offset_y: 1
       }
       priority: 30
     }
@@ -6136,7 +6167,11 @@ cont {
       primary {
         height: 14
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 6381914
+        offset_y: 1
       }
       priority: 30
     }
@@ -6191,7 +6226,11 @@ cont {
       primary {
         height: 13
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 6381914
+        offset_y: 1
       }
       priority: 50
     }
@@ -6210,7 +6249,11 @@ cont {
       primary {
         height: 14
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 6381914
+        offset_y: 1
       }
       priority: 50
     }
@@ -6265,7 +6308,11 @@ cont {
       primary {
         height: 13
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 6381914
+        offset_y: 1
       }
       priority: 550
     }
@@ -6284,7 +6331,11 @@ cont {
       primary {
         height: 14
         color: 6381914
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 6381914
+        offset_y: 1
       }
       priority: 550
     }
@@ -6337,6 +6388,99 @@ cont {
     }
   }
 }
+cont {
+  name: "entrance"
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
+cont {
+  name: "entrance-exit"
+  element {
+    scale: 19
+    symbol {
+      name: "exit-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
+cont {
+  name: "entrance-main"
+  element {
+    scale: 18
+    symbol {
+      name: "main_entrance-s"
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
+        is_optional: true
+      }
+      priority: -9980
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "main_entrance-s"
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6381914
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 6381914
+        is_optional: true
+      }
+      priority: -9980
+    }
+  }
+}
 cont {
   name: "highway-bridleway"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index a81564af54..1555fb741a 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index c9d113e1aa..9308856d1a 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -1689,6 +1689,25 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-loading_dock"
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
 cont {
   name: "amenity-motorcycle_parking"
   element {
@@ -6010,7 +6029,11 @@ cont {
       primary {
         height: 13
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 7566195
+        offset_y: 1
       }
       priority: 50
     }
@@ -6029,7 +6052,11 @@ cont {
       primary {
         height: 14
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 7566195
+        offset_y: 1
       }
       priority: 50
     }
@@ -6049,7 +6076,7 @@ cont {
         color: 7105644
         offset_y: 1
       }
-      priority: 30
+      priority: 150
     }
   }
   element {
@@ -6064,7 +6091,7 @@ cont {
         color: 7105644
         offset_y: 1
       }
-      priority: 30
+      priority: 150
     }
   }
 }
@@ -6117,7 +6144,11 @@ cont {
       primary {
         height: 13
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 7566195
+        offset_y: 1
       }
       priority: 30
     }
@@ -6136,7 +6167,11 @@ cont {
       primary {
         height: 14
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 7566195
+        offset_y: 1
       }
       priority: 30
     }
@@ -6191,7 +6226,11 @@ cont {
       primary {
         height: 13
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 7566195
+        offset_y: 1
       }
       priority: 50
     }
@@ -6210,7 +6249,11 @@ cont {
       primary {
         height: 14
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 7566195
+        offset_y: 1
       }
       priority: 50
     }
@@ -6265,7 +6308,11 @@ cont {
       primary {
         height: 13
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 12
+        color: 7566195
+        offset_y: 1
       }
       priority: 550
     }
@@ -6284,7 +6331,11 @@ cont {
       primary {
         height: 14
         color: 7566195
-        text: "addr:housenumber"
+      }
+      secondary {
+        height: 13
+        color: 7566195
+        offset_y: 1
       }
       priority: 550
     }
@@ -6337,6 +6388,99 @@ cont {
     }
   }
 }
+cont {
+  name: "entrance"
+  element {
+    scale: 19
+    symbol {
+      name: "entrance-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 7566195
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
+cont {
+  name: "entrance-exit"
+  element {
+    scale: 19
+    symbol {
+      name: "exit-s"
+      priority: -10000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 7566195
+        is_optional: true
+      }
+      priority: -10000
+    }
+  }
+}
+cont {
+  name: "entrance-main"
+  element {
+    scale: 18
+    symbol {
+      name: "main_entrance-s"
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 7566195
+        is_optional: true
+      }
+      priority: -9980
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "main_entrance-s"
+      priority: 20
+    }
+    caption {
+      primary {
+        height: 13
+        color: 7566195
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 8
+        color: 7566195
+        is_optional: true
+      }
+      priority: -9980
+    }
+  }
+}
 cont {
   name: "highway-bridleway"
   element {
diff --git a/data/visibility.txt b/data/visibility.txt
index 9590bc1d44..782698947b 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -80,7 +80,7 @@ world  00000000000000000000  +
         kindergarten  00000000000000000000  -
         language_school  00000000000000000000  -
         library  00000000000000000000  -
-        loading_dock  00000000000000000000  -
+        loading_dock  00000000000000000001  -
         marketplace  00000000000000000000  -
         money_transfer  00000000000000000000  -
         motorcycle_parking  00000000000000000111  -
@@ -368,9 +368,9 @@ world  00000000000000000000  +
         fire_hydrant  00000000000000000000  -
         phone  00000000000000000000  -
         {}
-    entrance  00000000000000000000  +
-        exit  00000000000000000000  -
-        main  00000000000000000000  -
+    entrance  00000000000000000001  +
+        exit  00000000000000000001  -
+        main  00000000000000000011  -
         {}
     healthcare  00000000000000000000  +
         alternative  00000000000000000000  -