diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 0cb92e705e..a6515b1f36 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 604b8a403b..15f860a982 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -57427,106 +57427,44 @@ cont {
 }
 cont {
   name: "place-square"
-  element {
-    scale: 14
-    symbol {
-      name: "tourism-s"
-      priority: 5500
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4500
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 36
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4500
-    }
-  }
   element {
     scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 6710886
       }
-      priority: -4500
+      priority: 5500
     }
   }
   element {
     scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 6710886
       }
-      priority: -4500
+      priority: 5500
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 6710886
       }
-      priority: -4500
+      priority: 5500
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 6710886
       }
-      priority: -4500
+      priority: 5500
     }
   }
 }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 09021dd09f..5b52eb71af 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 37e04028d8..b71e626716 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -57119,106 +57119,44 @@ cont {
 }
 cont {
   name: "place-square"
-  element {
-    scale: 14
-    symbol {
-      name: "tourism-s"
-      priority: 5500
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4500
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 36
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4500
-    }
-  }
   element {
     scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 6710886
       }
-      priority: -4500
+      priority: 5500
     }
   }
   element {
     scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 6710886
       }
-      priority: -4500
+      priority: 5500
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 6710886
       }
-      priority: -4500
+      priority: 5500
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 6710886
       }
-      priority: -4500
+      priority: 5500
     }
   }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 827c83d60f..b3838b6ab2 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 e0ddd9a26a..b1dcf51523 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -57205,106 +57205,44 @@ cont {
 }
 cont {
   name: "place-square"
-  element {
-    scale: 14
-    symbol {
-      name: "tourism-s"
-      priority: 5500
-      min_distance: 12
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4500
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 36
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -4500
-    }
-  }
   element {
     scale: 16
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 10066329
       }
-      priority: -4500
+      priority: 5500
     }
   }
   element {
     scale: 17
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 10066329
       }
-      priority: -4500
+      priority: 5500
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 10066329
       }
-      priority: -4500
+      priority: 5500
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "tourism-m"
-      priority: 5500
-      min_distance: 24
-    }
     caption {
       primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
+        height: 11
+        color: 10066329
       }
-      priority: -4500
+      priority: 5500
     }
   }
 }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index a2a2dfe359..98e5471a3d 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 9ff7eba0bf..9bad30946a 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -35800,6 +35800,49 @@ cont {
     }
   }
 }
+cont {
+  name: "place-square"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+      }
+      priority: 1400
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+      }
+      priority: 1400
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+      }
+      priority: 1400
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 6710886
+      }
+      priority: 1400
+    }
+  }
+}
 cont {
   name: "place-state"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 1555fb741a..330e9aebcf 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 9308856d1a..45ec639628 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -36176,6 +36176,49 @@ cont {
     }
   }
 }
+cont {
+  name: "place-square"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 10066329
+      }
+      priority: 1400
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 10066329
+      }
+      priority: 1400
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 10
+        color: 10066329
+      }
+      priority: 1400
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 10
+        color: 10066329
+      }
+      priority: 1400
+    }
+  }
+}
 cont {
   name: "place-state"
   element {
diff --git a/data/visibility.txt b/data/visibility.txt
index 782698947b..ee3c216be2 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -815,7 +815,7 @@ world  00000000000000000000  +
         ocean  01111111111111111111  -
         region  00000000000000000000  -
         sea  00001111111111111111  -
-        square  00000000000000000000  -
+        square  00000000000000001111  -
         state  00000011111000000000  +
             USA  00000111111000000000  -
             {}