diff --git a/data/classificator.txt b/data/classificator.txt
index 4db67828ab..ec8ee3506b 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -533,6 +533,22 @@ world  +
         lawyer  -
         telecommunication  -
         {}
+    olympics  +
+        attraction  -
+        bike_sport  -
+        live_site  -
+        official_building  -
+        stadium  -
+        stadium_main  -
+        transport_airport  -
+        transport_boat  -
+        transport_bus  -
+        transport_cable  -
+        transport_railway  -
+        transport_subway  -
+        transport_tram  -
+        water_sport  -
+        {}
     piste:lift  +
         j-bar  -
         magic_carpet  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index be4aad6b7c..9181c099ca 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 95afea11f7..fa4210d732 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -51644,6 +51644,1616 @@ cont {
     }
   }
 }
+cont {
+  name: "olympics-attraction"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-bike_sport"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-live_site"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-official_building"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-stadium"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-stadium_main"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_airport"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_boat"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_bus"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_cable"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_railway"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_subway"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_tram"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-water_sport"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
 cont {
   name: "piste:lift-j-bar"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index a47eda1918..a354041599 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 a3a0399640..65d5046e80 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -45400,6 +45400,1616 @@ cont {
     }
   }
 }
+cont {
+  name: "olympics-attraction"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-bike_sport"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-live_site"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-official_building"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-stadium"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-stadium_main"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_airport"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_boat"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_bus"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_cable"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_railway"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_subway"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_tram"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-water_sport"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
 cont {
   name: "piste:lift-j-bar"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 3d1c96b743..abc5ac0133 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 969c698d6b..fe6779313a 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -45400,6 +45400,1616 @@ cont {
     }
   }
 }
+cont {
+  name: "olympics-attraction"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-bike_sport"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-live_site"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-official_building"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-stadium"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-stadium_main"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_airport"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_boat"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_bus"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_cable"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_railway"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_subway"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-transport_tram"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "olympics-water_sport"
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16864
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
 cont {
   name: "piste:lift-j-bar"
   element {
diff --git a/data/types.txt b/data/types.txt
index 8d2e670f83..fd47d4abad 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1122,3 +1122,17 @@ wheelchair|yes
 wheelchair|no
 wheelchair|limited
 building|has_parts
+olympics|transport_airport
+olympics|transport_railway
+olympics|transport_boat
+olympics|transport_bus
+olympics|transport_tram
+olympics|transport_cable
+olympics|transport_subway
+olympics|official_building
+olympics|attraction
+olympics|live_site
+olympics|stadium_main
+olympics|stadium
+olympics|water_sport
+olympics|bike_sport
diff --git a/data/visibility.txt b/data/visibility.txt
index c0f4049f84..a02cc92987 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -533,6 +533,22 @@ world  00000000000000000000  +
         lawyer  00000000000000000111  -
         telecommunication  00000000000000000111  -
         {}
+    olympics  00000000000000000000  +
+        attraction  00000000000000000000  -
+        bike_sport  00000000000000000000  -
+        live_site  00000000000000000000  -
+        official_building  00000000000000000000  -
+        stadium  00000000000000000000  -
+        stadium_main  00000000000000000000  -
+        transport_airport  00000000000000000000  -
+        transport_boat  00000000000000000000  -
+        transport_bus  00000000000000000000  -
+        transport_cable  00000000000000000000  -
+        transport_railway  00000000000000000000  -
+        transport_subway  00000000000000000000  -
+        transport_tram  00000000000000000000  -
+        water_sport  00000000000000000000  -
+        {}
     piste:lift  00000000000000000000  +
         j-bar  00000000000000111111  -
         magic_carpet  00000000000000011111  -