[openstreetmap-carto] 01/04: Imported Upstream version 2.45.0

Bas Couwenberg sebastic at debian.org
Mon Nov 28 23:38:01 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository openstreetmap-carto.

commit 66c9f50a7feae3ade646162915091cf36c9857d0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Nov 29 00:24:03 2016 +0100

    Imported Upstream version 2.45.0
---
 .gitignore                                         |   1 +
 CARTOGRAPHY.md                                     |  58 ++---
 CHANGELOG.md                                       |  17 +-
 CODE_OF_CONDUCT.md                                 |   2 +-
 CONTRIBUTING.md                                    |  16 ++
 INSTALL.md                                         |   6 +-
 README.md                                          |   3 +
 amenity-points.mss                                 | 270 ++++++++++-----------
 buildings.mss                                      |   3 +-
 landcover.mss                                      |  62 ++---
 preview.png                                        | Bin 85803 -> 310638 bytes
 project.mml                                        |  14 +-
 project.yaml                                       |  62 +----
 roads.mss                                          |   1 +
 scripts/shop_values.rb                             |  56 -----
 symbols/{aerodrome.svg => aerodrome.12.svg}        |   3 +-
 ...logical_site.16.svg => archaeological_site.svg} |   6 +-
 symbols/{artwork-14.svg => artwork.svg}            |   6 +-
 symbols/atm.16.svg                                 |  12 -
 symbols/atm.svg                                    |  20 ++
 symbols/bank.16.svg                                |  12 -
 symbols/bank.svg                                   |  20 ++
 symbols/bar.16.svg                                 |  12 -
 symbols/bar.svg                                    |  20 ++
 symbols/{bench.16.svg => bench.svg}                |  15 +-
 symbols/beverages-14.svg                           |  70 ------
 symbols/bicycle_parking.16.svg                     |  40 ---
 symbols/bicycle_parking.svg                        |  39 +++
 symbols/biergarten.16.svg                          |  12 -
 symbols/biergarten.svg                             |  20 ++
 symbols/buddhist.16.svg                            |  12 -
 symbols/buddhist.svg                               |  20 ++
 symbols/bus_stop.12.svg                            |   2 +-
 symbols/cafe.16.svg                                |  12 -
 symbols/cafe.svg                                   |  20 ++
 symbols/camping.16.svg                             |  12 -
 symbols/camping.svg                                |  20 ++
 symbols/{car_wash-14.svg => car_wash.svg}          |   9 +-
 symbols/{caravan_park.16.svg => caravan_park.svg}  |   6 +-
 symbols/{cave.14.svg => cave.svg}                  |   7 +
 ...harging_station.16.svg => charging_station.svg} |  24 +-
 symbols/christian.16.svg                           |  12 -
 symbols/christian.9.svg                            |  11 +-
 symbols/christian.svg                              |  20 ++
 symbols/cinema.16.svg                              |  12 -
 symbols/cinema.svg                                 |  37 +++
 symbols/communications.16.svg                      |  12 -
 symbols/communications.svg                         |  20 ++
 ...ommunity_centre-14.svg => community_centre.svg} |   4 +-
 symbols/computer-14.svg                            |  30 ---
 symbols/courthouse-16.svg                          |  40 ---
 symbols/{post_office-14.svg => courthouse.svg}     |   9 +-
 symbols/dentist.16.svg                             |  12 -
 symbols/dentist.svg                                |  20 ++
 symbols/department_store.p.16.svg                  |  36 ---
 symbols/doctors.16.svg                             |  12 -
 symbols/doctors.svg                                |  20 ++
 symbols/drinking_water.16.svg                      |  12 -
 symbols/drinking_water.svg                         |  20 ++
 symbols/{elevator-12.svg => elevator.12.svg}       |   2 +-
 symbols/embassy.16.svg                             |  12 -
 symbols/embassy.svg                                |  21 ++
 ...{emergency_phone.16.svg => emergency_phone.svg} |   6 +-
 symbols/entrance.10.svg                            |   4 +-
 symbols/fast_food.16.svg                           |  12 -
 symbols/fast_food.svg                              |  20 ++
 symbols/firestation.16.svg                         |  12 -
 symbols/firestation.svg                            |  20 ++
 symbols/{ford.16.svg => ford.svg}                  |   6 +-
 symbols/{fountain-14.svg => fountain.svg}          |   4 +-
 symbols/fuel.16.svg                                |  12 -
 symbols/fuel.svg                                   |  20 ++
 symbols/generating_patterns/scrub.md               |  10 +
 symbols/generating_patterns/scrub.svg              |   9 +
 symbols/{helipad.svg => helipad.16.svg}            |   9 +-
 symbols/hinduist.16.svg                            |  12 -
 symbols/hinduist.svg                               |  20 ++
 symbols/hospital.16.svg                            |  12 -
 symbols/hospital.svg                               |  20 ++
 symbols/hostel.16.svg                              |  40 ---
 symbols/{copyshop-14.svg => hostel.svg}            |   9 +-
 symbols/hotel.16.svg                               |  40 ---
 symbols/{post_office-14.svg => hotel.svg}          |   9 +-
 symbols/hunting-stand.16.svg                       |  40 ---
 symbols/{post_office-14.svg => hunting_stand.svg}  |   9 +-
 symbols/information.12.svg                         |   6 +-
 symbols/jewish.16.svg                              |  12 -
 symbols/jewish.svg                                 |  20 ++
 symbols/laundry-14.svg                             |  45 ----
 symbols/library.14.svg                             |  38 ---
 symbols/{post_office-14.svg => library.svg}        |  21 +-
 symbols/lighthouse.16.svg                          |  40 ---
 symbols/lighthouse.svg                             |  37 +++
 symbols/memorial.svg                               |  20 ++
 symbols/{monument.16.svg => monument.svg}          |  11 +-
 symbols/motel.16.svg                               |  40 ---
 symbols/motel.svg                                  |  39 +++
 symbols/{motorcycle-14.svg => motorcycle.svg}      |   2 +-
 symbols/motorcycle_parking.16.svg                  |  38 ---
 symbols/motorcycle_parking.svg                     |  38 +++
 symbols/museum.16.svg                              |  12 -
 symbols/museum.svg                                 |  20 ++
 symbols/muslim.16.svg                              |  12 -
 symbols/muslim.svg                                 |  20 ++
 symbols/newsagent-14.svg                           |  46 ----
 symbols/{nightclub.14.svg => nightclub.svg}        |   4 +-
 symbols/parking.svg                                |  40 ++-
 symbols/peak.svg                                   |   7 +
 symbols/pharmacy.16.svg                            |  12 -
 symbols/pharmacy.svg                               |  20 ++
 symbols/picnic.16.svg                              |  12 -
 symbols/picnic.svg                                 |  21 ++
 symbols/place_of_worship.16.svg                    |  12 -
 symbols/place_of_worship.svg                       |  20 ++
 symbols/playground.16.svg                          |  19 --
 symbols/playground.svg                             |  25 ++
 symbols/police.16.svg                              |  12 -
 symbols/police.svg                                 |  20 ++
 symbols/{post_box-12.svg => post_box.12.svg}       |   4 +-
 symbols/{post_office-14.svg => post_office.svg}    |   4 +-
 symbols/power_wind-16.svg                          |  40 ---
 symbols/power_wind.svg                             |  40 +++
 symbols/prison.16.svg                              |  12 -
 symbols/prison.svg                                 |  20 ++
 symbols/pub.16.svg                                 |  12 -
 symbols/pub.svg                                    |  21 ++
 symbols/recycling.16.svg                           |  12 -
 symbols/recycling.svg                              |  20 ++
 symbols/rental_bicycle.16.svg                      |  12 -
 symbols/rental_bicycle.svg                         |  20 ++
 symbols/rental_car.16.svg                          |  12 -
 symbols/rental_car.svg                             |  20 ++
 symbols/restaurant.16.svg                          |  12 -
 symbols/restaurant.svg                             |  20 ++
 symbols/saddle.svg                                 |   7 +
 symbols/scrub.png                                  | Bin 210 -> 13127 bytes
 symbols/{shelter-14.svg => shelter.svg}            |  11 +-
 symbols/shintoist.16.svg                           |  12 -
 symbols/shintoist.svg                              |  20 ++
 symbols/{shop_alcohol.16.svg => shop/alcohol.svg}  |   6 +-
 symbols/{art-14.svg => shop/art.svg}               |   1 +
 symbols/{bag-14.svg => shop/bag.svg}               |   4 +-
 symbols/shop/bakery.svg                            |  20 ++
 symbols/{beauty-14.svg => shop/beauty.svg}         |   4 +-
 symbols/{post_office-14.svg => shop/beverages.svg} |  24 +-
 symbols/shop/bicycle.svg                           |  39 +++
 symbols/{shop_butcher.png => shop/butcher.png}     | Bin
 symbols/shop/car.svg                               |  57 +++++
 symbols/{car_parts-14.svg => shop/car_parts.svg}   |   4 +-
 symbols/shop/car_repair.svg                        |  39 +++
 symbols/{chemist-14.svg => shop/chemist.svg}       |   4 +-
 symbols/{shop_clothes.16.svg => shop/clothes.svg}  |   6 +-
 symbols/{tobacco-14.svg => shop/computer.svg}      |  15 +-
 .../confectionery.svg}                             |  11 +-
 symbols/shop/convenience.svg                       |  85 +++++++
 symbols/{copyshop-14.svg => shop/copyshop.svg}     |   4 +-
 symbols/{deli-14.svg => shop/deli.svg}             |   7 +
 symbols/shop/department_store.svg                  |  38 +++
 symbols/{copyshop-14.svg => shop/diy.svg}          |   9 +-
 .../electronics.svg}                               |   6 +-
 symbols/{florist.16.svg => shop/florist.svg}       |  15 +-
 .../{shop_furniture.16.svg => shop/furniture.svg}  |   6 +-
 .../garden_centre.svg}                             |   4 +-
 symbols/{shop_gift.16.svg => shop/gift.svg}        |   6 +-
 .../{greengrocer-14.svg => shop/greengrocer.svg}   |   4 +-
 symbols/{copyshop-14.svg => shop/hairdresser.svg}  |   9 +-
 symbols/{hifi-14.svg => shop/hifi.svg}             |   4 +-
 symbols/{ice-cream-14.svg => shop/ice_cream.svg}   |   4 +-
 symbols/{shop_jewelry.16.svg => shop/jewelry.svg}  |   6 +-
 symbols/{outdoor-14.svg => shop/laundry.svg}       |  10 +-
 .../mobile_phone.svg}                              |   6 +-
 .../musical_instrument.svg}                        |  12 +-
 symbols/{outdoor-14.svg => shop/newsagent.svg}     |  14 +-
 .../{shop_optician.16.svg => shop/optician.svg}    |   6 +-
 symbols/{outdoor-14.svg => shop/outdoor.svg}       |   4 +-
 symbols/{perfumery-14.svg => shop/perfumery.svg}   |  11 +-
 symbols/shop/pet.svg                               |  39 +++
 symbols/{photo-14.svg => shop/photo.svg}           |  11 +-
 symbols/{seafood-14.svg => shop/seafood.svg}       |   9 +-
 symbols/{post_office-14.svg => shop/shoes.svg}     |   9 +-
 symbols/shop/sports.svg                            |  31 +++
 symbols/{stationery-14.svg => shop/stationery.svg} |  11 +-
 symbols/shop/supermarket.svg                       | 102 ++++++++
 symbols/shop/tea.svg                               |  65 +++++
 symbols/shop/tobacco.svg                           |  34 +++
 symbols/{toys-14.svg => shop/toys.svg}             |  27 +--
 .../travel_agency.svg}                             |  11 +-
 .../{post_office-14.svg => shop/variety_store.svg} |  15 +-
 symbols/shop_bakery.16.svg                         |  12 -
 symbols/shop_bicycle.16.svg                        |  40 ---
 symbols/shop_car.svg                               |  12 -
 symbols/shop_convenience.svg                       |  16 --
 symbols/shop_diy.16.svg                            |  40 ---
 symbols/shop_hairdresser.16.svg                    |  40 ---
 symbols/shop_pet.16.svg                            |  40 ---
 symbols/shop_shoes.16.svg                          |  40 ---
 symbols/shop_supermarket.svg                       |  20 --
 symbols/shopping_car_repair.16.svg                 |  40 ---
 symbols/sikhist.16.svg                             |  12 -
 symbols/sikhist.svg                                |  20 ++
 ...{social_facility-14.svg => social_facility.svg} |   4 +-
 symbols/sports-14.svg                              |  61 -----
 symbols/taoist.16.svg                              |  12 -
 symbols/taoist.svg                                 |  20 ++
 symbols/{taxi.16.svg => taxi.svg}                  |   6 +-
 symbols/tea-14.svg                                 |  67 -----
 symbols/{telephone.16.svg => telephone.svg}        |   6 +-
 symbols/theatre.16.svg                             |  40 ---
 symbols/theatre.svg                                |  39 +++
 symbols/toilets.16.svg                             |  12 -
 symbols/toilets.svg                                |  20 ++
 symbols/tourist_memorial.16.svg                    |  12 -
 symbols/town_hall.16.svg                           |  12 -
 symbols/town_hall.svg                              |  20 ++
 .../{traffic_light.svg => traffic_light.16.svg}    |   7 +
 symbols/variety_store-14.svg                       |  35 ---
 symbols/{veterinary-14.svg => veterinary.svg}      |   4 +-
 symbols/{viewpoint.16.svg => viewpoint.svg}        |   6 +-
 symbols/waste_basket.10.svg                        |   4 +-
 symbols/{water_park.16.svg => water_park.svg}      |   6 +-
 symbols/{water_tower.16.svg => water_tower.svg}    |  14 +-
 symbols/{windmill.16.svg => windmill.svg}          |   6 +-
 222 files changed, 2255 insertions(+), 2181 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4da5ad5..7269169 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ data/
 *.xml
 node_modules/
 localconfig.json
+localconfig.js
 
 # Generated at runtime by Python.
 *.pyc
diff --git a/CARTOGRAPHY.md b/CARTOGRAPHY.md
index 7e06410..e93597c 100644
--- a/CARTOGRAPHY.md
+++ b/CARTOGRAPHY.md
@@ -1,39 +1,39 @@
-# Cartography
 
-This is a style that serves multiple purposes, so here are some guidelines when considering cartographic changes.
+# Design goals and guidelines for this style
 
-## Purposes
+This is an attempt to outline the goals of this style and the principles under 
+which the maintainers make decisions.  These rules are not set in stone, they 
+can change and they may not be followed in all cases but contributors should 
+be able to expect that they are generally the guiding principles design wise.
 
-There are multiple primary purposes of the map style, which pull in different directions
+It does not make much sense to try following these principles blindly as a 
+contributor without understanding them, they are meant to guide you to develop 
+an intuition and understanding how to make design decisions to fit into the 
+overall concept of this style.
 
-* It's the primary feedback mechanism for mappers to validate their edits - so detail is useful
-* It's a major part of the impression visitors to osm.org receive - so clear design is useful
-* It's an examplar stylesheet for rendering OSM data - so easy customisation is useful
+## General purpose
 
-It must always be borne in mind that a map style cannot show every detail of the OSM data, and in many cases it is more appropriate to show the detail in other, more specialist styles.
+This style has multiple purposes:
 
-## Colours
+* It's an important feedback mechanism for mappers to validate their edits and helps to prevent unfavorable fragmentation of tag use.
+* It's a major part of the public face of OpenStreetMap, for many people the map on osm.org rendered with this style _is_ OpenStreetMap.
+* It's used in many map applications as a general purpose map.
+* It's an examplar stylesheet for rendering OSM data.
 
-Firstly, this is a map, not merely a colourful 2-dimensional visualisation of the database. Colours should be chosen based on their effectiveness and to make things look nice, not chosen for distinctiveness.
+There is no ranking of these purposes.  To allow serving all of them and to 
+avoid satisfying only some at the cost of the others the following main goals 
+have been identified.
 
-The colour palette should be moving towards pastel/light/desaturated for background layers, midtones for streets and save highlights/bolds/saturated for points of interest. If colourspace can be left unused, that enables overlays for third parties.
+## Main goals
 
-Colour definitions should, where useful, be put into variables at the top of the file, to enable easier customisation.
+The following goals need to be balanced against each other to serve the purposes 
+above.  There is no fixed order of priorities.  Apart from these goals there are 
+of course also technical constraints and requirements that need to be taken into 
+account.
 
-## Data manipulation
-
-OpenStreetMap data has to be manipulated for rendering, but since this style is intended for use by mappers to check their work, it should minimise any distortions. For example, line-smoothing improves the look of railways and rivers, but introduces confusion for mappers. Post processing of geometries can improve the cartographic results, but breaks the cause-and-effect between editing the data and seeing the results.
-
-For similar reasons, use of external non-OSM data should be avoided.
-
-## Legibility
-
-Legibility is not only about of font size, but also about the ability of users to be able to “read” the map style. For example, a user might not be familiar with our exact road colours, but should be able to understand their relative importance via intensity of colour, width or other attributes. Important features should be more easily spotted and understood than less important information. It should be possible to gain an understanding of the majority of the map without using a legend.
-
-Avoid font sizes smaller than 10.
-
-## The Mapper Feedback Loop
-
-If you thought that mappers were happy just to press "Save" on their editor, you'd be wrong. A key part of their feedback loop - to reassure them their work has been saved, and also to check that they have mapped 'correctly' - is waiting to see the results of their mapping on the main map layer on www.osm.org
-
-While this desire is in obvious conflict with the above comments on level of detail, it has a second impact on the map style. We need to, wherever possible, avoid accidentally encouraging mistakes - that is, avoiding the situation where a clearly misspelled or misused tag leads to the originally expected result. So `highway=mtorway` shouldn't show up as if it was `highway=motorway`, and so on. This has been a problem with "catch-all" rules in queries and filters, such as `where leisure i [...]
\ No newline at end of file
+* **Legibility and clarity** - The map should be intuitively readable by users with some general experience using maps without a map key, preferrably with relatively little effort.  A map key or more extensive experience using this map style can be required for clearly identifying minor differences or the exact meaning of certain features but in broad strokes orientation and identification of map elements should be possible on an intuitive level.  We also aim for the map appearance to be [...]
+* **Being understandable and supportive for mappers** - To serve as feedback for mappers and encourage correct mapping this style needs to render the data in a way that allows mappers to understand how the data produces a certain rendering result based on basic observation without in depth understanding how map rendering works or looking at the style implementation.
+* **Diversity** - The style should represent the diversity of the OSM community and geography in general.  The most obvious element to serve this goal is showing the local names everywhere on earth in their respective scripts.  This goal however goes beyond labels.  Both physical and cultural geography differs a lot globally and the aim is to represent this variety with equal determination - well mapped areas are not supposed to have more weight here than less mapped parts of the world.  [...]
+* **A rich map** - This style deliberately creating a fairly rich map showing a significant number of different features.  This way it shows the richness of OSM data and gives a broad recognition to the mappers' work.  The aim is not however to show all or even most of the OSM data.
+* **Maintainability** - The implementation of this style should not be too hard to maintain. This refers to both the volume and complexity of the code and how fast the style can be parsed when rendering it, which is very important for efficient development work. So the amount of code should be kept small and complex and fragile interdependencies should be avoided. If the code is difficult to maintain this would ultimately seriously affect all of the above goals.
+* **Adaptability and ease of use** - The style should be easy to customize, like for creating localized or special purpose maps. It is also important to keep demands on rendering infrastructure for serving the style low so it is not too difficult and costly to set up a tile server for this style or a specialized variant of it.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 306c0e9..608f136 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,22 @@
-## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.44.1...master)
+## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.45.0...master) 
 
-## [v2.44.1](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.44.1...v2.44.0) - 2016-10-12
+## [v2.45.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.44.1...v2.45.0) - 2016-11-28
+### Changes
+- Render all shops without a specific icon as a dot, not just a whitelist
+- Scrub pattern change to random
+- Change pitch and track color
+- Railway stations rendering as major buildings
+- Rendering the name of man_made=bridge inside the polygon
+- Documentation updates (including cartography design goals and icon design guidelines)
+- Icons general code cleaning
+- Various bug fixes
+
+## [v2.44.1](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.44.0...v2.44.1) - 2016-10-12
 ### Changes
 - Bug fixes to low zoom place rendering changes
 - Documentation improvements for fonts and non-latin rendering
 
-## [v2.44.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.44.0...v2.43.0) - 2016-09-26
+## [v2.44.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v2.43.0...v2.44.0) - 2016-09-26
 ### Major Changes
 - Rendering of restricted access roads and paths significantly changed
 - Changed to use Noto fonts for all languages
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 879b953..5be25d8 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -62,7 +62,7 @@ When using the OpenStreetMap Carto spaces you should act in the spirit of the va
 
 The OpenStreetMap Carto maintainers are responsible for handling conduct-related issues. Their goal is to de-escalate conflicts and try to resolve issues to the satisfaction of all parties.
 
-If you encounter a conduct-related issue, you should report it to the maintainers by sending them [all an email](mailto:openstreetmap-carto at gravitystorm.co.uk,penorman at mac.com,info at matthijsmelissen.nl,matkoniecz at gmail.com).
+If you encounter a conduct-related issue, you should report it to the maintainers by sending them [all an email](mailto:openstreetmap-carto at gravitystorm.co.uk,penorman at mac.com,info at matthijsmelissen.nl,matkoniecz at gmail.com,chris_hormann at gmx.de,daniel at xn--ko-wla.pl,nebulon42 at mailbox.org).
 
 **Note that the goal of the Code of Conduct and the maintainers is to resolve conflicts in the most harmonious way possible.** We hope that in most cases issues may be resolved through polite discussion and mutual agreement. Bans and other forceful measures are to be employed only as a last resort.
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4ccccd6..3ab255e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -138,6 +138,22 @@ Because SQL within JSON or YAML will not generally be syntax highlighted, indent
 * One space before and after = etc
 * Name SQL subqueries after the layer name (but use underscores)
 
+## Map Icon Guidelines
+
+* All new icons must be SVG format only.  The SVG must be saved as standards compliant SVG without any proprietary tags. In Inkscape software, you will need to "Save As..." and choose the format Optimized SVG (preferable) or Plain SVG.
+* Icons must use SVG fills only, not SVG strokes or any feature Mapnik does not support.
+* Use no color for the icon's fill if the icon is monochromatic. This allows the color to be set in the MSS.
+* Use a common canvas size, which is usually 14x14 px.
+* Draw a simple siloutte of the subject with an "on the shelf" perspective.
+* Align vectors to the pixel grid.
+* Make a clean design, so reduced complexity where possible.
+
+### External Icon Design Resources
+The project's goals and design philsophy are different from other projects, but some external resources with general information about icon design are:
+
+* [Maki Icons Design Guidelines](https://www.mapbox.com/maki-icons/guidelines/)
+* [GNOME Icon Design Guildelines](https://developer.gnome.org/hig/stable/icons-and-artwork.html.en)
+
 ## Pull requests
 
 Pull requests that change the cartography should contain a few images selected
diff --git a/INSTALL.md b/INSTALL.md
index 9a953f7..bd36cf9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -48,12 +48,16 @@ DejaVu Sans is used as an optional fallback font for systems without Noto Sans.
 
 Unifont is used as a last resort fallback, with it's excellent coverage, common presence on machines, and ugly look.
 
-On Ubuntu 16.04 or Debian Testing you can install all required fonts with
+On Ubuntu 16.04 or Debian Testing you can install the required fonts except Noto Emoji Regular with
 
 ```
 sudo apt-get install fonts-noto-cjk fonts-noto-hinted fonts-noto-unhinted ttf-unifont
 ```
 
+Noto Emoji Regular can be downloaded [from the Noto Emoji repository](https://github.com/googlei18n/noto-emoji).
+
+It might be useful to have a more recent version of the fonts for [rare non-latin scripts](#non-latin-scripts). This can be installed [from source](https://github.com/googlei18n/noto-fonts/blob/master/FAQ.md#where-are-the-fonts).
+
 DejaVu is packaged as `fonts-dejavu-core`.
 
 ### Non-latin scripts
diff --git a/README.md b/README.md
index 8b174cc..790f911 100644
--- a/README.md
+++ b/README.md
@@ -93,3 +93,6 @@ maps using Mapnik, many based on this project. Some alternatives are:
 * Matthijs Melissen [@math1985](https://github.com/math1985/)
 * Paul Norman [@pnorman](https://github.com/pnorman/)
 * Mateusz Konieczny [@matkoniecz](https://github.com/matkoniecz/)
+* Daniel Koć [@kocio-pl](https://github.com/kocio-pl)
+* Christoph Hormann [@imagico](https://github.com/imagico)
+* Michael Glanznig [@nebulon42](https://github.com/nebulon42)
diff --git a/amenity-points.mss b/amenity-points.mss
index 5ae3cef..348fab9 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -30,35 +30,35 @@
   }
 
   [feature = 'amenity_shelter'][zoom >= 16] {
-    marker-file: url('symbols/shelter-14.svg');
+    marker-file: url('symbols/shelter.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_atm'][zoom >= 17] {
-    marker-file: url('symbols/atm.16.svg');
+    marker-file: url('symbols/atm.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_bank'][zoom >= 17] {
-    marker-file: url('symbols/bank.16.svg');
+    marker-file: url('symbols/bank.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_bar'][zoom >= 17] {
-    marker-file: url('symbols/bar.16.svg');
+    marker-file: url('symbols/bar.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_bicycle_rental'][zoom >= 17] {
-    marker-file: url('symbols/rental_bicycle.16.svg');
+    marker-file: url('symbols/rental_bicycle.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
     marker-clip: false;
@@ -81,7 +81,7 @@
   [feature = 'highway_elevator'][zoom >= 18] {
     [access = null],
     [access = 'yes'] {
-      marker-file: url('symbols/elevator-12.svg');
+      marker-file: url('symbols/elevator.12.svg');
       marker-fill: @transportation-icon;
       marker-placement: interior;
     }
@@ -93,63 +93,63 @@
   }
 
   [feature = 'amenity_taxi'][zoom >= 17] {
-    marker-file: url('symbols/taxi.16.svg');
+    marker-file: url('symbols/taxi.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'highway_traffic_signals'][zoom >= 17] {
-    marker-file: url('symbols/traffic_light.svg');
+    marker-file: url('symbols/traffic_light.16.svg');
     marker-fill: #0a0a0a;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_cafe'][zoom >= 17] {
-    marker-file: url('symbols/cafe.16.svg');
+    marker-file: url('symbols/cafe.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_artwork'][zoom >= 17] {
-    marker-file: url('symbols/artwork-14.svg');
+    marker-file: url('symbols/artwork.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_camp_site'][zoom >= 16] {
-    marker-file: url('symbols/camping.16.svg');
+    marker-file: url('symbols/camping.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'highway_ford'][zoom >= 16] {
-    marker-file: url('symbols/ford.16.svg');
+    marker-file: url('symbols/ford.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_caravan_site'][zoom >= 16] {
-    marker-file: url('symbols/caravan_park.16.svg');
+    marker-file: url('symbols/caravan_park.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @transportation-icon;
   }
 
   [feature = 'amenity_car_rental'][zoom >= 17] {
-    marker-file: url('symbols/rental_car.16.svg');
+    marker-file: url('symbols/rental_car.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_car_wash'][zoom >= 17] {
-    marker-file: url('symbols/car_wash-14.svg');
+    marker-file: url('symbols/car_wash.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
@@ -161,21 +161,21 @@
   }
 
   [feature = 'amenity_cinema'][zoom >= 16] {
-    marker-file: url('symbols/cinema.16.svg');
+    marker-file: url('symbols/cinema.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_nightclub'][zoom >= 17] {
-    marker-file: url('symbols/nightclub.14.svg');
+    marker-file: url('symbols/nightclub.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_fire_station'][zoom >= 16] {
-    marker-file: url('symbols/firestation.16.svg');
+    marker-file: url('symbols/firestation.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
@@ -200,7 +200,7 @@
         nozzle/marker-height: 3;
       }
       [zoom >= 18] {
-        nozzle/marker-file: url('symbols/fountain-14.svg');
+        nozzle/marker-file: url('symbols/fountain.svg');
         nozzle/marker-fill: @marina-text;
         nozzle/marker-placement: interior;
         nozzle/marker-clip: false;
@@ -209,14 +209,14 @@
   }
 
   [feature = 'amenity_charging_station'][zoom >= 17] {
-    marker-file: url('symbols/charging_station.16.svg');
+    marker-file: url('symbols/charging_station.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_fuel'][zoom >= 17] {
-    marker-file: url('symbols/fuel.16.svg');
+    marker-file: url('symbols/fuel.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
     marker-clip: false;
@@ -228,35 +228,35 @@
   }
 
   [feature = 'amenity_hospital'][zoom >= 15] {
-    marker-file: url('symbols/hospital.16.svg');
+    marker-file: url('symbols/hospital.svg');
     marker-fill: @health-color;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_hostel'][zoom >= 17] {
-    marker-file: url('symbols/hostel.16.svg');
+    marker-file: url('symbols/hostel.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @transportation-icon;
   }
 
   [feature = 'tourism_hotel'][zoom >= 17] {
-    marker-file: url('symbols/hotel.16.svg');
+    marker-file: url('symbols/hotel.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @transportation-icon;
   }
 
   [feature = 'tourism_motel'][zoom >= 17] {
-    marker-file: url('symbols/motel.16.svg');
+    marker-file: url('symbols/motel.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @transportation-icon;
   }
 
   [feature = 'amenity_ice_cream'][zoom >= 17] {
-    marker-file: url('symbols/ice-cream-14.svg');
+    marker-file: url('symbols/shop/ice_cream.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
@@ -270,56 +270,56 @@
   }
 
   [feature = 'amenity_embassy'][zoom >= 17] {
-    marker-file: url('symbols/embassy.16.svg');
+    marker-file: url('symbols/embassy.svg');
     marker-fill: @transportation-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_library'][zoom >= 16] {
-    marker-file: url('symbols/library.14.svg');
+    marker-file: url('symbols/library.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_courthouse'][zoom >= 16] {
-    marker-file: url('symbols/courthouse-16.svg');
+    marker-file: url('symbols/courthouse.svg');
     marker-placement: interior;
     marker-fill: @amenity-brown;
     marker-clip: false;
   }
 
   [feature = 'amenity_community_centre'][zoom >= 17] {
-    marker-file: url('symbols/community_centre-14.svg');
+    marker-file: url('symbols/community_centre.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_social_facility'][zoom >= 17] {
-    marker-file: url('symbols/social_facility-14.svg');
+    marker-file: url('symbols/social_facility.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_townhall'][zoom >= 16] {
-    marker-file: url('symbols/town_hall.16.svg');
+    marker-file: url('symbols/town_hall.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'man_made_mast'][zoom >= 17] {
-    marker-file: url('symbols/communications.16.svg');
+    marker-file: url('symbols/communications.svg');
     marker-fill: @man-made-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_museum'][zoom >= 16] {
-    marker-file: url('symbols/museum.16.svg');
+    marker-file: url('symbols/museum.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
@@ -332,10 +332,10 @@
       marker-file: url('symbols/parking.svg');
     }
     [feature = 'amenity_bicycle_parking'] {
-      marker-file: url('symbols/bicycle_parking.16.svg');
+      marker-file: url('symbols/bicycle_parking.svg');
     }
     [feature = 'amenity_motorcycle_parking'] {
-      marker-file: url('symbols/motorcycle_parking.16.svg');
+      marker-file: url('symbols/motorcycle_parking.svg');
     }
     marker-placement: interior;
     marker-clip: false;
@@ -346,7 +346,7 @@
   }
 
   [feature = 'amenity_pharmacy'][zoom >= 17] {
-    marker-file: url('symbols/pharmacy.16.svg');
+    marker-file: url('symbols/pharmacy.svg');
     marker-fill: @health-color;
     marker-placement: interior;
     marker-clip: false;
@@ -354,57 +354,57 @@
 
   [feature = 'amenity_clinic'][zoom >= 16],
   [feature = 'amenity_doctors'][zoom >= 17] {
-    marker-file: url('symbols/doctors.16.svg');
+    marker-file: url('symbols/doctors.svg');
     marker-fill: @health-color;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_dentist'][zoom >= 17] {
-    marker-file: url('symbols/dentist.16.svg');
+    marker-file: url('symbols/dentist.svg');
     marker-fill: @health-color;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_veterinary'][zoom >= 17] {
-    marker-file: url('symbols/veterinary-14.svg');
+    marker-file: url('symbols/veterinary.svg');
     marker-fill: @health-color;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_place_of_worship'][zoom >= 16] {
-    marker-file: url('symbols/place_of_worship.16.svg');
+    marker-file: url('symbols/place_of_worship.svg');
     marker-fill: #000000;
     marker-placement: interior;
     marker-clip: false;
     [religion = 'christian'] {
-      marker-file: url('symbols/christian.16.svg');
+      marker-file: url('symbols/christian.svg');
       [denomination = 'jehovahs_witness']{
-        marker-file: url('symbols/place_of_worship.16.svg');
+        marker-file: url('symbols/place_of_worship.svg');
       }
     }
     [religion = 'muslim'] {
-      marker-file: url('symbols/muslim.16.svg');
+      marker-file: url('symbols/muslim.svg');
     }
     [religion = 'sikh'] {
-      marker-file: url('symbols/sikhist.16.svg');
+      marker-file: url('symbols/sikhist.svg');
     }
     [religion = 'jewish'] {
-      marker-file: url('symbols/jewish.16.svg');
+      marker-file: url('symbols/jewish.svg');
     }
     [religion = 'hindu'] {
-      marker-file: url('symbols/hinduist.16.svg');
+      marker-file: url('symbols/hinduist.svg');
     }
     [religion = 'buddhist'] {
-      marker-file: url('symbols/buddhist.16.svg');
+      marker-file: url('symbols/buddhist.svg');
     }
     [religion = 'shinto'] {
-      marker-file: url('symbols/shintoist.16.svg');
+      marker-file: url('symbols/shintoist.svg');
     }
     [religion = 'taoist'] {
-      marker-file: url('symbols/taoist.16.svg');
+      marker-file: url('symbols/taoist.svg');
     }
   }
 
@@ -417,42 +417,42 @@
   }
 
   [feature = 'amenity_police'][zoom >= 16] {
-    marker-file: url('symbols/police.16.svg');
+    marker-file: url('symbols/police.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_post_box'][zoom >= 17] {
-    marker-file: url('symbols/post_box-12.svg');
+    marker-file: url('symbols/post_box.12.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_post_office'][zoom >= 17] {
-    marker-file: url('symbols/post_office-14.svg');
+    marker-file: url('symbols/post_office.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_pub'][zoom >= 17] {
-    marker-file: url('symbols/pub.16.svg');
+    marker-file: url('symbols/pub.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_biergarten'][zoom >= 17] {
-    marker-file: url('symbols/biergarten.16.svg');
+    marker-file: url('symbols/biergarten.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_recycling'][zoom >= 17] {
-    marker-file: url('symbols/recycling.16.svg');
+    marker-file: url('symbols/recycling.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
@@ -463,77 +463,77 @@
 
   [feature = 'amenity_restaurant'][zoom >= 17],
   [feature = 'amenity_food_court'][zoom >= 17] {
-    marker-file: url('symbols/restaurant.16.svg');
+    marker-file: url('symbols/restaurant.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_fast_food'][zoom >= 17] {
-    marker-file: url('symbols/fast_food.16.svg');
+    marker-file: url('symbols/fast_food.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_telephone'][zoom >= 17] {
-    marker-file: url('symbols/telephone.16.svg');
+    marker-file: url('symbols/telephone.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_emergency_phone'][zoom >= 17] {
-    marker-file: url('symbols/emergency_phone.16.svg');
+    marker-file: url('symbols/emergency_phone.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_theatre'][zoom >= 16] {
-    marker-file: url('symbols/theatre.16.svg');
+    marker-file: url('symbols/theatre.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_toilets'][zoom >= 17] {
-    marker-file: url('symbols/toilets.16.svg');
+    marker-file: url('symbols/toilets.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_drinking_water'][zoom >= 17] {
-    marker-file: url('symbols/drinking_water.16.svg');
+    marker-file: url('symbols/drinking_water.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_prison'][zoom >= 17] {
-    marker-file: url('symbols/prison.16.svg');
+    marker-file: url('symbols/prison.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_viewpoint'][zoom >= 16] {
-    marker-file: url('symbols/viewpoint.16.svg');
+    marker-file: url('symbols/viewpoint.svg');
     marker-placement: interior;
     marker-fill: @amenity-brown;
     marker-clip: false;
   }
 
   [feature = 'man_made_water_tower'][zoom >= 17] {
-    marker-file: url('symbols/water_tower.16.svg');
+    marker-file: url('symbols/water_tower.svg');
     marker-fill: @man-made-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'historic_memorial'][zoom >= 17] {
-    marker-file: url('symbols/tourist_memorial.16.svg');
+    marker-file: url('symbols/memorial.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
@@ -541,14 +541,14 @@
 
   [feature = 'man_made_obelisk'][zoom >= 16],
   [feature = 'historic_monument'][zoom >= 16] {
-    marker-file: url('symbols/monument.16.svg');
+    marker-file: url('symbols/monument.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'historic_archaeological_site'][zoom >= 16] {
-    marker-file: url('symbols/archaeological_site.16.svg');
+    marker-file: url('symbols/archaeological_site.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
@@ -563,62 +563,62 @@
   }
 
   [feature = 'shop_supermarket'][zoom >= 16] {
-    marker-file: url('symbols/shop_supermarket.svg');
+    marker-file: url('symbols/shop/supermarket.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_art'][zoom >= 17] {
-    marker-file: url('symbols/art-14.svg');
+    marker-file: url('symbols/shop/art.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_bag'][zoom >= 17] {
-    marker-file: url('symbols/bag-14.svg');
+    marker-file: url('symbols/shop/bag.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_bakery'][zoom >= 17] {
-    marker-file: url('symbols/shop_bakery.16.svg');
+    marker-file: url('symbols/shop/bakery.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_beauty'][zoom >= 17] {
-    marker-file: url('symbols/beauty-14.svg');
+    marker-file: url('symbols/shop/beauty.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_beverages'][zoom >= 17] {
-    marker-file: url('symbols/beverages-14.svg');
+    marker-file: url('symbols/shop/beverages.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_books'][zoom >= 17] {
-    marker-file: url('symbols/library.14.svg');
+    marker-file: url('symbols/library.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_butcher'][zoom >= 17] {
-    marker-file: url('symbols/shop_butcher.png');
+    marker-file: url('symbols/shop/butcher.png');
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_chemist'][zoom >= 17] {
-    marker-file: url('symbols/chemist-14.svg');
+    marker-file: url('symbols/shop/chemist.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
@@ -627,7 +627,7 @@
   [feature = 'shop_clothes'],
   [feature = 'shop_fashion'] {
     [zoom >= 17] {
-      marker-file: url('symbols/shop_clothes.16.svg');
+      marker-file: url('symbols/shop/clothes.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -635,28 +635,28 @@
   }
 
   [feature = 'shop_computer'][zoom >= 17] {
-    marker-file: url('symbols/computer-14.svg');
+    marker-file: url('symbols/shop/computer.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_convenience'][zoom >= 17] {
-    marker-file: url('symbols/shop_convenience.svg');
+    marker-file: url('symbols/shop/convenience.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_confectionery'][zoom >= 17] {
-    marker-file: url('symbols/confectionery-14.svg');
+    marker-file: url('symbols/shop/confectionery.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_copyshop'][zoom >= 17] {
-    marker-file: url('symbols/copyshop-14.svg');
+    marker-file: url('symbols/shop/copyshop.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
@@ -665,7 +665,7 @@
   [feature = 'shop_cosmetics'],
   [feature = 'shop_perfumery'] {
     [zoom >= 17] {
-      marker-file: url('symbols/perfumery-14.svg');
+      marker-file: url('symbols/shop/perfumery.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -674,7 +674,7 @@
 
   [feature = 'shop_deli'] {
     [zoom >= 17] {
-      marker-file: url('symbols/deli-14.svg');
+      marker-file: url('symbols/shop/deli.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -682,7 +682,7 @@
   }
 
   [feature = 'shop_department_store'][zoom >= 16] {
-    marker-file: url('symbols/department_store.p.16.svg');
+    marker-file: url('symbols/shop/department_store.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
@@ -691,7 +691,7 @@
   [feature = 'shop_doityourself'],
   [feature = 'shop_hardware'] {
     [zoom >= 17] {
-      marker-file: url('symbols/shop_diy.16.svg');
+      marker-file: url('symbols/shop/diy.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -701,7 +701,7 @@
   [feature = 'shop_dry_cleaning'],
   [feature = 'shop_laundry'] {
     [zoom >= 17] {
-      marker-file: url('symbols/laundry-14.svg');
+      marker-file: url('symbols/shop/laundry.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -711,7 +711,7 @@
   [feature = 'shop_fishmonger'],
   [feature = 'shop_seafood'] {
     [zoom >= 17] {
-      marker-file: url('symbols/seafood-14.svg');
+      marker-file: url('symbols/shop/seafood.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -719,14 +719,14 @@
   }
 
   [feature = 'shop_florist'][zoom >= 17] {
-    marker-file: url('symbols/florist.16.svg');
+    marker-file: url('symbols/shop/florist.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_garden_centre'][zoom >= 17] {
-    marker-file: url('symbols/garden_centre-14.svg');
+    marker-file: url('symbols/shop/garden_centre.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
@@ -735,7 +735,7 @@
   [feature = 'shop_greengrocer'],
   [feature = 'shop_farm'] {
     [zoom >= 17] {
-      marker-file: url('symbols/greengrocer-14.svg');
+      marker-file: url('symbols/shop/greengrocer.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -743,56 +743,56 @@
   }
 
   [feature = 'shop_hairdresser'][zoom >= 17] {
-    marker-file: url('symbols/shop_hairdresser.16.svg');
+    marker-file: url('symbols/shop/hairdresser.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_hifi'][zoom >= 17] {
-    marker-file: url('symbols/hifi-14.svg');
+    marker-file: url('symbols/shop/hifi.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_ice_cream'][zoom >= 17] {
-    marker-file: url('symbols/ice-cream-14.svg');
+    marker-file: url('symbols/shop/ice_cream.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_car'][zoom >= 17] {
-    marker-file: url('symbols/shop_car.svg');
+    marker-file: url('symbols/shop/car.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_car_parts'][zoom >= 17] {
-    marker-file: url('symbols/car_parts-14.svg');
+    marker-file: url('symbols/shop/car_parts.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_car_repair'][zoom >= 17] {
-    marker-file: url('symbols/shopping_car_repair.16.svg');
+    marker-file: url('symbols/shop/car_repair.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @amenity-brown;
   }
 
   [feature = 'shop_bicycle'][zoom >= 17] {
-    marker-file: url('symbols/shop_bicycle.16.svg');
+    marker-file: url('symbols/shop/bicycle.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_pet'][zoom >= 17] {
-    marker-file: url('symbols/shop_pet.16.svg');
+    marker-file: url('symbols/shop/pet.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
@@ -802,7 +802,7 @@
   [feature = 'shop_photo_studio'],
   [feature = 'shop_photography'] {
     [zoom >= 17] {
-      marker-file: url('symbols/photo-14.svg');
+      marker-file: url('symbols/shop/photo.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -810,21 +810,21 @@
   }
 
   [feature = 'shop_shoes'][zoom >= 17] {
-    marker-file: url('symbols/shop_shoes.16.svg');
+    marker-file: url('symbols/shop/shoes.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_gift'][zoom >= 17] {
-    marker-file: url('symbols/shop_gift.16.svg');
+    marker-file: url('symbols/shop/gift.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
   
   [feature = 'shop_electronics'][zoom >= 17] {
-    marker-file: url('symbols/shop_electronics.16.svg');
+    marker-file: url('symbols/shop/electronics.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
@@ -833,7 +833,7 @@
   [feature = 'shop_alcohol'],
   [feature = 'shop_wine'] {
     [zoom >= 17] {
-      marker-file: url('symbols/shop_alcohol.16.svg');
+      marker-file: url('symbols/shop/alcohol.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -841,42 +841,42 @@
   }
   
   [feature = 'shop_optician'][zoom >= 17] {
-    marker-file: url('symbols/shop_optician.16.svg');
+    marker-file: url('symbols/shop/optician.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
   
   [feature = 'shop_outdoor'][zoom >= 17] {
-    marker-file: url('symbols/outdoor-14.svg');
+    marker-file: url('symbols/shop/outdoor.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
   
   [feature = 'shop_furniture'][zoom >= 17] {
-    marker-file: url('symbols/shop_furniture.16.svg');
+    marker-file: url('symbols/shop/furniture.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
   
   [feature = 'shop_mobile_phone'][zoom >= 17] {
-    marker-file: url('symbols/shop_mobile_phone.16.svg');
+    marker-file: url('symbols/shop/mobile_phone.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_motorcycle'][zoom >= 17] {
-    marker-file: url('symbols/motorcycle-14.svg');
+    marker-file: url('symbols/motorcycle.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_musical_instrument'][zoom >= 17] {
-    marker-file: url('symbols/musical_instrument-14.svg');
+    marker-file: url('symbols/shop/musical_instrument.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
@@ -885,7 +885,7 @@
   [feature = 'shop_kiosk'],
   [feature = 'shop_newsagent'] {
     [zoom >= 17] {
-      marker-file: url('symbols/newsagent-14.svg');
+      marker-file: url('symbols/shop/newsagent.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -895,7 +895,7 @@
   [feature = 'shop_jewelry'],
   [feature = 'shop_jewellery'] {
     [zoom >= 17] {
-      marker-file: url('symbols/shop_jewelry.16.svg');
+      marker-file: url('symbols/shop/jewelry.svg');
       marker-placement: interior;
       marker-clip: false;
       marker-fill: @shop-icon;
@@ -903,70 +903,70 @@
   }
 
   [feature = 'shop_toys'][zoom >= 17] {
-    marker-file: url('symbols/toys-14.svg');
+    marker-file: url('symbols/shop/toys.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_travel_agency'][zoom >= 17] {
-    marker-file: url('symbols/travel_agency-14.svg');
+    marker-file: url('symbols/shop/travel_agency.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_sports'][zoom >= 17] {
-    marker-file: url('symbols/sports-14.svg');
+    marker-file: url('symbols/shop/sports.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'shop_stationery'][zoom >= 17] {
-    marker-file: url('symbols/stationery-14.svg');
+    marker-file: url('symbols/shop/stationery.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_tobacco'][zoom >= 17] {
-    marker-file: url('symbols/tobacco-14.svg');
+    marker-file: url('symbols/shop/tobacco.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_tea'][zoom >= 17] {
-    marker-file: url('symbols/tea-14.svg');
+    marker-file: url('symbols/shop/tea.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'shop_variety_store'][zoom >= 17] {
-    marker-file: url('symbols/variety_store-14.svg');
+    marker-file: url('symbols/shop/variety_store.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @shop-icon;
   }
 
   [feature = 'leisure_water_park'][zoom >= 17] {
-    marker-file: url('symbols/water_park.16.svg');
+    marker-file: url('symbols/water_park.svg');
     marker-placement: interior;
     marker-fill: @amenity-brown;
     marker-clip: false;
   }
 
   [feature = 'leisure_dog_park'][zoom >= 17] {
-    marker-file: url('symbols/shop_pet.16.svg');
+    marker-file: url('symbols/shop/pet.svg');
     marker-placement: interior;
     marker-fill: @amenity-brown;
     marker-clip: false;
   }
 
   [feature = 'leisure_playground'][zoom >= 17] {
-    marker-file: url('symbols/playground.16.svg');
+    marker-file: url('symbols/playground.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
@@ -986,14 +986,14 @@
   }
 
   [feature = 'tourism_picnic_site'][zoom >= 16] {
-    marker-file: url('symbols/picnic.16.svg');
+    marker-file: url('symbols/picnic.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'leisure_picnic_table'][zoom >= 17] {
-    marker-file: url('symbols/picnic.16.svg');
+    marker-file: url('symbols/picnic.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
     marker-clip: false;
@@ -1005,21 +1005,21 @@
   }
 
   [feature = 'aeroway_helipad'][zoom >= 16] {
-    marker-file: url('symbols/helipad.svg');
+    marker-file: url('symbols/helipad.16.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @airtransport;
   }
 
   [feature = 'aeroway_aerodrome'][zoom >= 10][zoom < 14] {
-    marker-file: url('symbols/aerodrome.svg');
+    marker-file: url('symbols/aerodrome.12.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @airtransport;
   }
 
   [feature = 'man_made_lighthouse'][zoom >= 15] {
-    marker-file: url('symbols/lighthouse.16.svg');
+    marker-file: url('symbols/lighthouse.svg');
     marker-placement: interior;
     marker-clip: false;
     marker-fill: @transportation-icon;
@@ -1047,7 +1047,7 @@
   }
 
   [feature = 'natural_cave_entrance'][zoom >= 15] {
-    marker-file: url('symbols/cave.14.svg');
+    marker-file: url('symbols/cave.svg');
     marker-placement: interior;
     marker-clip: false;
   }
@@ -1061,7 +1061,7 @@
   [feature = 'power_generator']['generator:source' = 'wind'],
   [feature = 'power_generator'][power_source = 'wind'] {
     [zoom >= 15] {
-      marker-file: url('symbols/power_wind-16.svg');
+      marker-file: url('symbols/power_wind.svg');
       marker-placement: interior;
       marker-fill: black;
       marker-clip: false;
@@ -1069,14 +1069,14 @@
   }
 
   [feature = 'man_made_windmill'][zoom >= 16] {
-    marker-file: url('symbols/windmill.16.svg');
+    marker-file: url('symbols/windmill.svg');
     marker-placement: interior;
     marker-fill: @amenity-brown;
     marker-clip: false;
   }
 
   [feature = 'amenity_hunting_stand'][zoom >= 16] {
-    marker-file: url('symbols/hunting-stand.16.svg');
+    marker-file: url('symbols/hunting_stand.svg');
     marker-fill: @man-made-icon;
     marker-placement: interior;
     marker-clip: false;
@@ -1099,10 +1099,10 @@
       marker-file: url('symbols/parking.svg');
     }
     [feature = 'amenity_bicycle_parking'] {
-      marker-file: url('symbols/bicycle_parking.16.svg');
+      marker-file: url('symbols/bicycle_parking.svg');
     }
     [feature = 'amenity_motorcycle_parking'] {
-      marker-file: url('symbols/motorcycle_parking.16.svg');
+      marker-file: url('symbols/motorcycle_parking.svg');
     }
     marker-placement: interior;
     marker-clip: false;
@@ -1158,7 +1158,7 @@
   }
 
   [feature = 'amenity_bench'][zoom >= 19]::amenity {
-    marker-file: url('symbols/bench.16.svg');
+    marker-file: url('symbols/bench.svg');
     marker-fill: @amenity-brown;
     marker-placement: interior;
   }
diff --git a/buildings.mss b/buildings.mss
index 482633f..721e74d 100644
--- a/buildings.mss
+++ b/buildings.mss
@@ -33,7 +33,8 @@
         line-color: @building-aeroway-line;
       }
     }
-    [amenity = 'place_of_worship'] {
+    [amenity = 'place_of_worship'],
+    [building = 'train_station'] {
       polygon-fill: @building-major-fill;
       polygon-clip: false;
       [zoom >= 15] {
diff --git a/landcover.mss b/landcover.mss
index bd83fea..e69a04c 100644
--- a/landcover.mss
+++ b/landcover.mss
@@ -7,55 +7,57 @@
 @park: #c8facc;         // Lch(94,30,145) also recreation_ground
 @orchard: #aedfa3;
 
-// --- "base" landuses ---
+// --- "Base" landuses ---
 
 @residential: #e0dfdf;      // Lch(89,0,0)
- at residential-line: #B9B9B9; // Lch(75,0,0)
- at retail: #FFD6D1;           // Lch(89,16,30)
- at retail-line: #D99C95;      // Lch(70,25,30)
- at commercial: #F2DAD9;       // Lch(89,8.5,25)
- at commercial-line: #D1B2B0;  // Lch(75,12,25)
- at industrial: #EBDBE8;       // Lch(89,9,330)
- at industrial-line: #C6B3C3;  // Lch(75,11,330)
- at railway: @industrial;
- at railway-line: @industrial-line;
+ at residential-line: #b9b9b9; // Lch(75,0,0)
+ at retail: #ffd6d1;           // Lch(89,16,30)
+ at retail-line: #d99c95;      // Lch(70,25,30)
+ at commercial: #f2dad9;       // Lch(89,8.5,25)
+ at commercial-line: #d1b2b0;  // Lch(75,12,25)
+ at industrial: #ebdbe8;       // Lch(89,9,330) (Also used for railway)
+ at industrial-line: #c6b3c3;  // Lch(75,11,330) (Also used for railway-line)
 @farmland: #fbecd7;         // Lch(94,12,80) (Also used for farm)
 @farmland-line: #d6c4ab;    // Lch(80,15,80)
-
 @farmyard: #f5dcba;         // Lch(89,20,80)
- at farmyard-line: #D1B48C;    // Lch(75,25,80)
+ at farmyard-line: #d1b48c;    // Lch(75,25,80)
 
-// --- Other ----
+// --- Transport ----
 
 @aerodrome: #e9e7e2;
- at allotments: #eecfb3;       // Lch(85,19,70)
 @apron: #e9d1ff;
+ at garages: #dfddce;
+ at parking: #f7efb7;
+ at railway: @industrial;
+ at railway-line: @industrial-line;
+ at rest_area: #efc8c8; // also services
+ at station: #d4aaaa;
+
+// --- Other ----
+
+ at allotments: #eecfb3;       // Lch(85,19,70)
 @bare_ground: #eee5dc;
 @campsite: #def6c0; // also caravan_site, picnic_site
 @cemetery: #aacbaf; // also grave_yard
 @construction: #c7c7b4; // also brownfield
 @danger_area: pink;
- at garages: #dfddce;
 @heath: #d6d99f;
 @mud: rgba(203,177,154,0.3); // produces #e6dcd1 over @land
- at parking: #f7efb7;
 @place_of_worship: #cdccc9;
 @place_of_worship_outline: #111;
 @playground: lighten(@park, 5%);
 @power: darken(@industrial, 5%);
 @power-line: darken(@industrial-line, 5%);
- at rest_area: #efc8c8; // also services
 @sand: #f5e9c6;
 @societal_amenities: #f0f0d8;
- at station: #d4aaaa;
 @tourism: #734a08;
 @quarry: #c5c3c3;
 @military: #f55;
 @beach: #fff1ba;
 
-// --- sports ---
+// --- Sports ---
 
- at pitch: #80d7b5;
+ at pitch: #aae0cb; // also track
 @track: @pitch;
 @stadium: @societal_amenities; // also sports_centre
 @golf_course: #b5e3b5;
@@ -426,17 +428,10 @@
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
-  [feature = 'natural_scrub'] {
-    [zoom >= 10] {
-      polygon-fill: @scrub;
-      [way_pixels >= 4]  { polygon-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-gamma: 0.3;  }
-    }
-    [zoom >= 14] {
-      polygon-pattern-file: url('symbols/scrub.png');
-      [way_pixels >= 4]  { polygon-pattern-gamma: 0.75; }
-      [way_pixels >= 64] { polygon-pattern-gamma: 0.3;  }
-    }
+  [feature = 'natural_scrub'][zoom >= 10] {
+    polygon-fill: @scrub;
+    [way_pixels >= 4]  { polygon-gamma: 0.75; }
+    [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
  
   [feature = 'wetland_swamp'][zoom >= 8] {
@@ -625,7 +620,12 @@
         polygon-pattern-alignment: global;
       }
     }
+    [natural = 'scrub'] {
+      polygon-pattern-file: url('symbols/scrub.png');
+      polygon-pattern-alignment: global;
+    }
   }
+
   //Also landuse = forest, converted in the SQL
   [natural = 'wood'][zoom >= 13]::wood {
     polygon-pattern-file: url('symbols/forest.png'); // Lch(55,30,135)
diff --git a/preview.png b/preview.png
index d9b2fd1..4566c4c 100644
Binary files a/preview.png and b/preview.png differ
diff --git a/project.mml b/project.mml
index 64fcf42..f5b2feb 100644
--- a/project.mml
+++ b/project.mml
@@ -280,7 +280,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way, surface, \n    COALESCE(CASE WHEN landuse = 'forest' THEN 'wood' ELSE NULL END, \"natural\") AS \"natural\",\n    CASE WHEN \"natural\" IN ('marsh', 'mud') \n        THEN \"natural\" \n        ELSE CASE WHEN (\"natural\" = 'wetland' AND wetland IS NULL) \n          THEN 'wetland' \n          ELSE CASE WHEN (\"natural\" = 'wetland')\n            THEN wetland\n            ELSE NULL\n            END \n        END\n      END AS int_wetland\n  FROM planet_o [...]
+        "table": "(SELECT\n    way, surface, \n    COALESCE(CASE WHEN landuse = 'forest' THEN 'wood' ELSE NULL END, \"natural\") AS \"natural\",\n    CASE WHEN \"natural\" IN ('marsh', 'mud') \n        THEN \"natural\" \n        ELSE CASE WHEN (\"natural\" = 'wetland' AND wetland IS NULL) \n          THEN 'wetland' \n          ELSE CASE WHEN (\"natural\" = 'wetland')\n            THEN wetland\n            ELSE NULL\n            END \n        END\n      END AS int_wetland\n  FROM planet_o [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -562,7 +562,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    building,\n    amenity,\n    aeroway\n  FROM planet_osm_polygon\n  WHERE building IS NOT NULL\n    AND building != 'no'\n    AND (aeroway = 'terminal' OR amenity = 'place_of_worship')\n    AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real\n  ORDER BY z_order, way_area DESC)\nAS buildings_major",
+        "table": "(SELECT\n    way,\n    building,\n    amenity,\n    aeroway\n  FROM planet_osm_polygon\n  WHERE building IS NOT NULL\n    AND building != 'no'\n    AND (aeroway = 'terminal' OR amenity = 'place_of_worship' OR building = 'train_station')\n    AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real\n  ORDER BY z_order, way_area DESC)\nAS buildings_major",
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -641,7 +641,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way, COALESCE(historic, barrier) AS feature\n  FROM (SELECT way,\n    ('barrier_' || (CASE WHEN barrier IN ('chain', 'city_wall', 'embankment', 'ditch', 'fence', 'guard_rail',\n          'handrail', 'hedge', 'kerb', 'retaining_wall', 'wall') THEN barrier ELSE NULL END)) AS barrier,\n    ('historic_' || (CASE WHEN historic = 'citywalls' THEN historic ELSE NULL END)) AS historic\n    FROM planet_osm_line\n    WHERE barrier IN ('chain', 'city_wall', 'embankmen [...]
+        "table": "(SELECT\n    way, COALESCE(historic, barrier) AS feature\n  FROM (SELECT way,\n    ('barrier_' || (CASE WHEN barrier IN ('chain', 'city_wall', 'embankment', 'ditch', 'fence', 'guard_rail',\n          'handrail', 'hedge', 'kerb', 'retaining_wall', 'wall') THEN barrier ELSE NULL END)) AS barrier,\n    ('historic_' || (CASE WHEN historic = 'citywalls' THEN historic ELSE NULL END)) AS historic\n    FROM planet_osm_line\n    WHERE barrier IN ('chain', 'city_wall', 'embankmen [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -1425,7 +1425,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    COALESCE(\n      'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', \n                                          'hostel', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n      'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle [...]
+        "table": "(SELECT\n    way,\n    COALESCE(\n      'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', \n                                          'hostel', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n      'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -1451,7 +1451,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    COALESCE(\n      'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel', \n                                          'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n      'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle [...]
+        "table": "(SELECT\n    way,\n    COALESCE(\n      'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel', \n                                          'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n      'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -1739,7 +1739,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n    COALESCE(\n      'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', \n                                          'theme_park', 'museum', 'zoo', 'information', 'picnic_s [...]
+        "table": "(SELECT\n    way,\n    way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n    COALESCE(\n      'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n      'tourism_' || CASE WHEN tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', \n                                          'theme_park', 'museum', 'zoo', 'information', 'picnic_s [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
@@ -1791,7 +1791,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508",
-        "table": "(SELECT\n    way,\n    way_pixels,\n    feature,\n    access,\n    CONCAT(\n        name,\n        CASE WHEN name IS NOT NULL AND elevation IS NOT NULL THEN E'\\n' ELSE NULL END,\n        CASE WHEN elevation IS NOT NULL THEN CONCAT(REPLACE(ROUND(elevation)::TEXT, '-', U&'\\2212'), U&'\\00A0', 'm') ELSE NULL END\n    ) AS name,\n    CASE\n      WHEN \"natural\" IN ('peak', 'volcano', 'saddle') THEN elevation\n      ELSE NULL\n    END AS score,\n    operator,\n    ref,\n  [...]
+        "table": "(SELECT\n    way,\n    way_pixels,\n    feature,\n    access,\n    CONCAT(\n        name,\n        CASE WHEN name IS NOT NULL AND elevation IS NOT NULL THEN E'\\n' ELSE NULL END,\n        CASE WHEN elevation IS NOT NULL THEN CONCAT(REPLACE(ROUND(elevation)::TEXT, '-', U&'\\2212'), U&'\\00A0', 'm') ELSE NULL END\n    ) AS name,\n    CASE\n      WHEN \"natural\" IN ('peak', 'volcano', 'saddle') THEN elevation\n      ELSE NULL\n    END AS score,\n    operator,\n    ref,\n  [...]
         "geometry_field": "way",
         "type": "postgis",
         "key_field": "",
diff --git a/project.yaml b/project.yaml
index c1ab649..09e96bd 100644
--- a/project.yaml
+++ b/project.yaml
@@ -294,7 +294,7 @@ Layer:
                 END
               END AS int_wetland
           FROM planet_osm_polygon
-          WHERE ("natural" IN ('marsh', 'mud', 'wetland', 'wood', 'beach', 'shoal', 'reef') OR landuse = 'forest')
+          WHERE ("natural" IN ('marsh', 'mud', 'wetland', 'wood', 'beach', 'shoal', 'reef', 'scrub') OR landuse = 'forest')
             AND building IS NULL
             AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real
           ORDER BY z_order, way_area DESC
@@ -488,7 +488,7 @@ Layer:
           FROM planet_osm_polygon
           WHERE building IS NOT NULL
             AND building != 'no'
-            AND (aeroway = 'terminal' OR amenity = 'place_of_worship')
+            AND (aeroway = 'terminal' OR amenity = 'place_of_worship' OR building = 'train_station')
             AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real
           ORDER BY z_order, way_area DESC)
         AS buildings_major
@@ -670,7 +670,7 @@ Layer:
             FROM planet_osm_line
             WHERE barrier IN ('chain', 'city_wall', 'embankment', 'ditch', 'fence', 'guard_rail',
                   'handrail', 'hedge', 'kerb', 'retaining_wall', 'wall')
-              OR historic = 'city_wall'
+              OR historic = 'citywalls'
               AND (waterway IS NULL OR waterway NOT IN ('river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi'))
           ) AS features
         ) AS line_barriers
@@ -1720,19 +1720,7 @@ Layer:
                                             'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 
                                             'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 
                                             'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea') THEN shop 
-                              WHEN shop IN ('accessories', 'antiques', 'appliance', 'baby_goods', 'bathroom_furnishing', 
-                                            'bed', 'boat', 'bookmaker', 'boutique', 'builder', 'building_materials', 'camera', 'car_service', 
-                                            'carpet', 'charity', 'cheese', 'chocolate', 'coffee', 'communication', 'craft', 'curtain', 'dairy', 
-                                            'discount', 'e-cigarette', 'electrical', 'energy', 'erotic', 'estate_agent', 
-                                            'fabric', 'fishing', 'flooring', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 
-                                            'gallery', 'games', 'gas', 'general', 'glaziery', 'grocery', 'health', 'health_food', 'hearing_aids', 
-                                            'herbalist', 'hobby', 'household', 'houseware', 'hunting', 'interior_decoration', 'kitchen', 
-                                            'leather', 'lighting', 'locksmith', 'lottery', 'market', 'massage', 'medical', 'medical_supply', 'money_lender', 
-                                            'motorcycle_repair', 'music', 'office_supplies', 'organic', 'paint', 'pastry', 'pawnbroker', 
-                                            'phone', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 
-                                            'scuba_diving', 'second_hand', 'sewing', 'shoe_repair', 'shopping_centre', 'solarium', 'souvenir',  
-                                            'tailor', 'tanning', 'tattoo', 'ticket', 'tiles', 'trade', 'tyres', 'vacuum_cleaner', 'video', 
-                                            'video_games', 'watches', 'wholesale', 'yes') THEN 'other' ELSE NULL END,
+                              WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
               'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table') THEN leisure ELSE NULL END,
               'man_made_' || CASE WHEN man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill', 'obelisk') THEN man_made ELSE NULL END,
               'natural_' || CASE WHEN "natural" IN ('spring') THEN "natural" ELSE NULL END,
@@ -1801,18 +1789,7 @@ Layer:
                                             'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys', 
                                             'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 
                                             'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea') THEN shop 
-                              WHEN shop IN ('accessories', 'antiques', 'appliance', 'baby_goods', 'bathroom_furnishing', 'bed',  
-                                            'boat', 'bookmaker', 'boutique', 'builder', 'building_materials', 'camera', 'car_service', 'carpet', 'charity', 
-                                            'cheese', 'chocolate', 'coffee', 'communication', 'craft', 'curtain', 'dairy',   
-                                            'discount', 'e-cigarette', 'electrical', 'energy', 'erotic', 'estate_agent', 'fabric', 'fishing', 
-                                            'flooring', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'gallery', 'games', 'gas',  
-                                            'general', 'glaziery', 'grocery', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hobby', 'household',  
-                                            'houseware', 'hunting', 'interior_decoration', 'kitchen', 'leather', 'lighting', 'locksmith', 'lottery',  
-                                            'market', 'massage', 'medical', 'medical_supply', 'money_lender', 'motorcycle_repair', 'music', 'office_supplies',  
-                                            'organic', 'paint', 'pastry', 'pawnbroker', 'phone', 'pottery', 'printing', 'radiotechnics', 
-                                            'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'second_hand', 'sewing', 'shoe_repair', 'shopping_centre', 
-                                            'solarium', 'souvenir', 'tailor', 'tanning', 'tattoo', 'ticket', 'tiles', 'trade', 'tyres', 
-                                            'vacuum_cleaner', 'video', 'video_games', 'watches', 'wholesale', 'yes') THEN 'other' ELSE NULL END,
+                              WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
               'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway',
                                                   'dog_park') THEN leisure ELSE NULL END,
               'man_made_' || CASE WHEN man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill', 'obelisk') THEN man_made ELSE NULL END,
@@ -2141,19 +2118,7 @@ Layer:
                                             'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys', 
                                             'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 
                                             'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea') THEN shop 
-                              WHEN shop IN ('accessories', 'antiques', 'appliance', 'baby_goods', 'bathroom_furnishing', 'bed', 
-                                            'boat', 'bookmaker', 'boutique', 'builder', 'building_materials', 'camera', 'car_service', 'carpet', 'charity', 
-                                            'cheese', 'chocolate', 'coffee', 'communication', 'craft', 'curtain', 'dairy', 
-                                            'discount', 'e-cigarette', 'electrical', 'energy', 'erotic', 'estate_agent', 'fabric', 'fishing', 
-                                            'flooring', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'gallery', 'games', 'gas', 
-                                            'general', 'glaziery', 'grocery', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hobby', 'household', 
-                                            'houseware', 'hunting', 'interior_decoration', 'kitchen', 'leather', 'lighting', 'locksmith', 
-                                            'lottery', 'market', 'massage', 'medical', 'medical_supply', 'money_lender', 'motorcycle_repair', 'music', 
-                                            'office_supplies', 'organic', 'paint', 'pastry', 'pawnbroker', 'phone', 'pottery', 
-                                            'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'second_hand', 
-                                            'sewing', 'shoe_repair', 'shopping_centre', 'solarium', 'souvenir', 'tailor', 'tanning', 'tattoo',
-                                            'ticket', 'tiles', 'trade', 'tyres', 'vacuum_cleaner', 'video', 'video_games', 'watches', 'wholesale', 
-                                            'yes') THEN 'other' ELSE NULL END,
+                              WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
               'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 'track', 
                                                   'pitch', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 
                                                   'picnic_table', 'dog_park') THEN leisure ELSE NULL END,
@@ -2283,20 +2248,7 @@ Layer:
                                                 'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts', 
                                                 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 
                                                 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea') THEN shop 
-                                  WHEN shop IN ('accessories', 'antiques', 'appliance',
-                                                'baby_goods', 'bathroom_furnishing', 'bed', 'boat', 'bookmaker', 'boutique', 'builder', 
-                                                'building_materials', 'camera', 'car_service', 'carpet', 'charity', 'cheese', 'chocolate', 'coffee', 
-                                                'communication', 'craft', 'curtain', 'dairy', 'discount',  
-                                                'e-cigarette', 'electrical', 'energy', 'erotic', 'estate_agent', 'fabric', 'fishing', 'flooring', 
-                                                'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'gallery', 'games', 'gas', 
-                                                'general', 'glaziery', 'grocery', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hobby', 'household', 
-                                                'houseware', 'hunting', 'interior_decoration', 'kitchen', 'leather', 'lighting', 'locksmith', 
-                                                'lottery', 'market', 'massage', 'medical', 'medical_supply', 'money_lender', 'motorcycle_repair', 'music', 
-                                                'office_supplies', 'organic', 'paint', 'pastry', 'pawnbroker', 'phone', 'pottery', 
-                                                'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'second_hand', 
-                                                'sewing', 'shoe_repair', 'shopping_centre', 'solarium', 'souvenir', 'tailor', 'tanning', 'tattoo', 
-                                                'ticket', 'tiles', 'trade', 'tyres', 'vacuum_cleaner', 'video', 'video_games', 'watches', 
-                                                'wholesale', 'yes') THEN 'other' ELSE NULL END,
+                                  WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
                   'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 'track',  
                                                       'pitch','playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina',  
                                                       'slipway', 'picnic_table', 'dog_park') THEN leisure ELSE NULL END,
diff --git a/roads.mss b/roads.mss
index da793ec..6e638be 100644
--- a/roads.mss
+++ b/roads.mss
@@ -2448,6 +2448,7 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
       text-halo-fill: @standard-halo-fill;
       text-min-distance: 2;
       text-wrap-width: 30;
+      text-placement: interior;
       [way_pixels > 250] {
         text-size: 9;
       }
diff --git a/scripts/shop_values.rb b/scripts/shop_values.rb
deleted file mode 100755
index 5dec9a8..0000000
--- a/scripts/shop_values.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/ruby
-
-#this script generates list of popular shop values - more than MIN_COUNT occurences in OpenStreetMap database according to taginfo
-#it is useful during creating/updating list of shops displayed with generic dot icon
-
-require 'net/http'
-require 'json'
-require 'pp'
-
-MIN_COUNT = 100
-EXCEPTIONS = [
-   "no",
-   "vacant",
-   "empty",
-   "disused",
-   "unknown",
-   "closed",
-   "fixme",
-   "FIXME",
-   "FixMe",
-   "other",
-   "*",
-   "winery", #see discussion in https://github.com/gravitystorm/openstreetmap-carto/pull/1632
-   "antique", #see https://github.com/gravitystorm/openstreetmap-carto/pull/1900
-   "betting", #see https://github.com/gravitystorm/openstreetmap-carto/pull/1900
-   "delicatessen", #see https://github.com/gravitystorm/openstreetmap-carto/pull/1900
-   "dive", #see https://github.com/gravitystorm/openstreetmap-carto/pull/1900
-   "fish", #see https://github.com/gravitystorm/openstreetmap-carto/pull/1900
-   "gambling", #see https://github.com/gravitystorm/openstreetmap-carto/pull/1900
-   "insurance", #see https://github.com/gravitystorm/openstreetmap-carto/pull/1900
-   "pharmacy", #see https://github.com/gravitystorm/openstreetmap-carto/pull/1900
-   "street_vendor", #see https://github.com/gravitystorm/openstreetmap-carto/issues/2090
-   "storage_rental", #see https://github.com/gravitystorm/openstreetmap-carto/issues/2090
-]
-
-
-url = URI.parse('http://taginfo.openstreetmap.org/api/4/key/values?key=shop&sortname=count&sortorder=desc')
-req = Net::HTTP::Get.new(url.to_s)
-res = Net::HTTP.start(url.host, url.port) {|http|
-   http.request(req)
-}
-
-data = JSON.parse(res.body)["data"]
-
-
-
-# Get an array of values that only includes values with more than MIN_COUNT occurrences
-counted = data.select { |h| h["count"] > MIN_COUNT }.map { |h| h["value"] } 
-# Filter out empty strings
-no_empty = counted.reject { |h| h.strip.empty? } 
-# Filter out exceptions in EXCEPTIONS
-filtered = no_empty - EXCEPTIONS
-
-# Output in SQL style
-puts "(" + filtered.map{ |val| "'#{val}'" }.sort.join(", ") + ")"
-
diff --git a/symbols/aerodrome.svg b/symbols/aerodrome.12.svg
similarity index 59%
rename from symbols/aerodrome.svg
rename to symbols/aerodrome.12.svg
index aacb174..3eb6309 100644
--- a/symbols/aerodrome.svg
+++ b/symbols/aerodrome.12.svg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 12 12">
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+	<rect width="12" height="12" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
 	<path fill-rule="evenodd" d="M 6 0 C 5.254644 0 5 2 5 2 L 5 3.96875 L 0 7.5 L 0 8.5 L 5 7.25 L 5 9.65625 L 3 11 L 3 12 L 6 11.25 L 9 12 L 9 11 L 7 9.65625 L 7 7.25 L 12 8.5 L 12 7.5 L 7 3.96875 L 7 2 C 7 2 6.745356 0 6 0 z"/>
 </svg>
diff --git a/symbols/archaeological_site.16.svg b/symbols/archaeological_site.svg
similarity index 90%
rename from symbols/archaeological_site.16.svg
rename to symbols/archaeological_site.svg
index 3431811..19fc272 100644
--- a/symbols/archaeological_site.16.svg
+++ b/symbols/archaeological_site.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 3,0 3,1 4,1 C 4.5988688,1 4.8411383,2.0430706 4.9375,2.90625 3.9652283,2.1499026 3.0249855,1.8795933 2.21875,2.03125 1.1884439,2.2250555 0.5,3.1743045 0.5,4.25 c 0,0.8419164 0.31211643,1.5788561 0.84375,2.34375 0.464621,0.6684787 1.1198438,1.4400576 1.9375,2.375 C 3.6476993,10.327756 4.3223039,11.572304 5,12.25 L 5,13 4,13.5 4,14 10,14 10,13.5 9,13 9,12.25 c 0.6776961,-0.677696 1.352301,-1.922244 1.71875,-3.28125 0.817656,-0.9349424 1.472879,-1.7065213 1.9375,-2.375 C 13.187 [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 3,0 3,1 4,1 C 4.5988688,1 4.8411383,2.0430706 4.9375,2.90625 3.9652283,2.1499026 3.0249855,1.8795933 2.21875,2.03125 1.1884439,2.2250555 0.5,3.1743045 0.5,4.25 c 0,0.8419164 0.31211643,1.5788561 0.84375,2.34375 0.464621,0.6684787 1.1198438,1.4400576 1.9375,2.375 C 3.6476993,10.327756 4.3223039,11.572304 5,12.25 L 5,13 4,13.5 4,14 10,14 10,13.5 9,13 9,12.25 c 0.6776961,-0.677696 1.352301,-1.922244 1.71875,-3.28125 0.817656,-0.9349424 1.472879,-1.7065213 1.9375,-2.375 C 13.187 [...]
 </svg>
diff --git a/symbols/artwork-14.svg b/symbols/artwork.svg
similarity index 97%
rename from symbols/artwork-14.svg
rename to symbols/artwork.svg
index b1cec10..0143481 100644
--- a/symbols/artwork-14.svg
+++ b/symbols/artwork.svg
@@ -27,10 +27,10 @@
   <rect
      style="visibility:hidden;fill:none;stroke:none"
      id="canvas"
-     y="-2"
+     y="0"
      x="0"
-     height="16"
-     width="16" />
+     height="14"
+     width="14" />
   <path
      id="monument"
      d="M 7 -0.009765625 C 6.3372585 -0.009765625 5.8007812 0.50741207 5.8007812 1.1464844 C 5.8007812 1.7855567 6.3372585 2.3027344 7 2.3027344 C 7.6627417 2.3027344 8.1992187 1.7855567 8.1992188 1.1464844 C 8.1992188 0.50741207 7.6627417 -0.009765625 7 -0.009765625 z M 5.8007812 3 C 5.378914 3 5 3.374187 5 3.7792969 C 5 4.5590588 6.4003906 6.9105056 6.4003906 7.6777344 L 6.4003906 10.017578 L 7.5996094 10.017578 L 7.5996094 7.6777344 C 7.5996094 6.9256876 9 4.5590588 9 3.7792969 C 9 3. [...]
diff --git a/symbols/atm.16.svg b/symbols/atm.16.svg
deleted file mode 100644
index 36a74f8..0000000
--- a/symbols/atm.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 2,1 C 1.4576271,1 1,1.4576271 1,2 l 0,2 c 0,0.559322 0.4886174,1 1,1 l 0,-2 12,0 0,2 c 0.511382,0 1,-0.4857094 1,-1 L 15,2 C 15,1.4576271 14.508475,1 14,1 z m 1,3 0,8 c 0,0.599243 0.400757,1 1,1 l 8,0 c 0.527334,0 1,-0.448696 1,-1 l 0,-8 -1,0 0,6 c -1,0 -2,1 -2,2 L 6,12 C 6,11 5,10 4,10 L 4,4 z M 8,5 C 6.4292037,5 5,5.9528024 5,7 5,8.0471976 6.4292037,9 8,9 9.5707963,9 11,8.0471976 11,7 11,5.9528024 9.5707963,5 8,5 z M 3,13.5 C 3,14.554668 3.4247267,15 4,15 l 8,0 c 0.527334,0 1 [...]
-</svg>
diff --git a/symbols/atm.svg b/symbols/atm.svg
new file mode 100644
index 0000000..cd9333e
--- /dev/null
+++ b/symbols/atm.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 1,0 C 0.457627,0 0,0.4576271 0,1 l 0,2 c 0,0.559322 0.488617,1 1,1 l 0,-2 12,0 0,2 c 0.511382,0 1,-0.4857094 1,-1 L 14,1 C 14,0.4576271 13.508475,0 13,0 z m 1,3 0,8 c 0,0.599243 0.400757,1 1,1 l 8,0 c 0.527334,0 1,-0.448696 1,-1 l 0,-8 -1,0 0,6 C 10,9 9,10 9,11 L 5,11 C 5,10 4,9 3,9 L 3,3 z M 7,4 C 5.429204,4 4,4.9528024 4,6 4,7.047198 5.429204,8 7,8 8.570796,8 10,7.047198 10,6 10,4.9528024 8.570796,4 7,4 z M 2,12.5 C 2,13.554668 2.424727,14 3,14 l 8,0 c 0.527334,0 1,-0.445332  [...]
+     id="atm" />
+</svg>
diff --git a/symbols/bank.16.svg b/symbols/bank.16.svg
deleted file mode 100644
index ea8c60a..0000000
--- a/symbols/bank.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 1,3 0,7 c 0,0.627119 0.4237288,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 15,3 1,3 z m 3,1 8,0 c 0,1 1,2 2,2 l 0,2 c -1,0 -2,1 -2,2 L 4,10 C 4,9 3,8 2,8 L 2,6 C 3,6 4,5 4,4 z M 8,5 C 6.3431459,5 5,5.8954305 5,7 5,8.1045695 6.3431459,9 8,9 9.6568547,9 11,8.1045695 11,7 11,5.8954305 9.6568547,5 8,5 z M 1,11.5 C 1,12.626577 1.4486964,13 2,13 l 12,0 c 0.551304,0 1,-0.445333 1,-1.5 -0.288136,0.271186 -0.559322,0.5 -1,0.5 L 2,12 C 1.559322,12 1.2711864,11.754237 1,11.5 z" />
-</svg>
diff --git a/symbols/bank.svg b/symbols/bank.svg
new file mode 100644
index 0000000..0782323
--- /dev/null
+++ b/symbols/bank.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 0,2 0,7 c 0,0.627119 0.423729,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 14,2 0,2 z m 3,1 8,0 c 0,1 1,2 2,2 l 0,2 C 12,7 11,8 11,9 L 3,9 C 3,8 2,7 1,7 L 1,5 C 2,5 3,4 3,3 z M 7,4 C 5.343146,4 4,4.8954305 4,6 4,7.10457 5.343146,8 7,8 8.656855,8 10,7.10457 10,6 10,4.8954305 8.656855,4 7,4 z M 0,10.5 C 0,11.626577 0.448696,12 1,12 l 12,0 c 0.551304,0 1,-0.445333 1,-1.5 -0.288136,0.271186 -0.559322,0.5 -1,0.5 L 1,11 C 0.559322,11 0.271186,10.754237 0,10.5 z"
+     id="bank" />
+</svg>
diff --git a/symbols/bar.16.svg b/symbols/bar.16.svg
deleted file mode 100644
index 0b361ab..0000000
--- a/symbols/bar.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 2,2 5.5,6 0,4 C 7.5,12 3,13 3,14 l 10,0 C 13,13 8.5,12 8.5,12 L 8.5,8 14,2 z" />
-</svg>
diff --git a/symbols/bar.svg b/symbols/bar.svg
new file mode 100644
index 0000000..a3e42fc
--- /dev/null
+++ b/symbols/bar.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 1,1 5.5,6 0,4 C 6.5,11 2,12 2,13 l 10,0 C 12,12 7.5,11 7.5,11 L 7.5,7 13,1 z"
+     id="bar" />
+</svg>
diff --git a/symbols/bench.16.svg b/symbols/bench.svg
similarity index 73%
rename from symbols/bench.16.svg
rename to symbols/bench.svg
index 110d303..1fea29e 100644
--- a/symbols/bench.16.svg
+++ b/symbols/bench.svg
@@ -8,9 +8,9 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
    id="svg2">
   <metadata
      id="metadata8">
@@ -27,14 +27,13 @@
   <defs
      id="defs6" />
   <rect
-     width="16"
-     height="16"
+     width="14"
+     height="14"
      x="0"
      y="0"
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
-     d="M 2,6 C 1,6 1,7.5 2,7.5 l 12,0 C 15,7.5 15,6 14,6 L 2,6 z m 1,2 0,3 1.5,0 0,-3 L 3,8 z m 8.5,0 0,3 1.5,0 0,-3 -1.5,0 z"
-     id="bench"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+     d="M 1,5 C 0,5 0,6.5 1,6.5 l 12,0 C 14,6.5 14,5 13,5 L 1,5 z m 1,2 0,3 1.5,0 0,-3 L 2,7 z m 8.5,0 0,3 1.5,0 0,-3 -1.5,0 z"
+     id="bench" />
 </svg>
diff --git a/symbols/beverages-14.svg b/symbols/beverages-14.svg
deleted file mode 100644
index 2cedc52..0000000
--- a/symbols/beverages-14.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 14 14"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="beverages-14.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1855"
-     inkscape:window-height="1056"
-     id="namedview7"
-     showgrid="true"
-     inkscape:zoom="47.6792"
-     inkscape:cx="11.845001"
-     inkscape:cy="6.1610598"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2984" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="14"
-     height="14"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     style="fill:#000000;fill-opacity:1;stroke:none"
-     d="M 3,0 C 2,0 2,0.50227551 2,2 2,3 0,7 0,8 l 0,5 c 0,0.566252 0.467057,1 1,1 l 4,0 c 0.599561,0 1,-0.400439 1,-1 L 6,8 C 6,7 4,3 4,2 4,0.46896661 4,0 3,0 z m 7.875,1 -1,4 L 11,5 11.75,2 14,2 14,1 z M 7,6 8,13 c 0,0 0,1 1,1 l 2,0 c 1,0 1,-1 1,-1 l 1,-7 z"
-     id="beverages"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="sssssssssscccccccccssccc" />
-</svg>
diff --git a/symbols/bicycle_parking.16.svg b/symbols/bicycle_parking.16.svg
deleted file mode 100644
index 54235d9..0000000
--- a/symbols/bicycle_parking.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="m 2,1 0,10 2,0 0,-3.5 2.5,0 c 1.9760775,3e-7 3.5,-1 3.5,-3.25 C 10,2 8.4868489,1.0000002 6.96875,1 z M 4,3 6.5,3 C 7.4635709,3 8,3.5254308 8,4.25 8,4.9745692 7.3682202,5.5 6.5,5.5 L 4,5.5 z m 7.5,5.5 0,1.25 -3,0 0,-0.25 0.5,0 C 9.4793944,9.5 9.4554247,9 9,9 L 7.5,9 C 7,9 7,9.4520606 7.5,9.5 L 8,9.5 8,9.75 7.4375,11.03125 C 7.2961795,11.001436 7.1477575,11 7,11 c -1.0217808,0 -2,0.793929 -2,2 0,1.206071 0.9782192,2 2,2 1.0217808,0 1.9375,-0.856429 1.9375,-2.0625 0,-0.150759 -0.003 [...]
-     id="parking-bicycle"
-     style="fill:#1a1a1a;fill-rule:evenodd" />
-</svg>
diff --git a/symbols/bicycle_parking.svg b/symbols/bicycle_parking.svg
new file mode 100644
index 0000000..441187a
--- /dev/null
+++ b/symbols/bicycle_parking.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 0,0 0,10 2.000077,0 0,-3.5 2.500097,0 c 1.976154,3e-7 3.500135,-1 3.500135,-3.25 C 8.000309,1 6.4871,2e-7 4.968942,0 z m 2.000077,2 2.500097,0 c 0.963608,0 1.500058,0.5254308 1.500058,1.25 0,0.7245692 -0.631804,1.25 -1.500058,1.25 l -2.500097,0 z M 9,7 9,7.5938559 9.500367,8 l 0,0.75 -3.000116,0 0,-0.25 0.50002,0 c 0.479412,0 0.455442,-0.5 0,-0.5 L 5.500213,8 c -0.50002,0 -0.50002,0.452061 0,0.5 l 0.500019,0 0,0.25 -0.562522,1.28125 C 5.296384,10.001436 5.147956,10 5.000193,10  [...]
+     id="parking-bicycle" />
+</svg>
diff --git a/symbols/biergarten.16.svg b/symbols/biergarten.16.svg
deleted file mode 100644
index 0fd4973..0000000
--- a/symbols/biergarten.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 4,1 C 3,1 2,2 2,3 l 0,10 c 0,1 -1,2 -1,2 l 11,0 c 0,0 -1,-1 -1,-2 l 3,0 c 1,0 1,-1 1,-1 L 15,6 C 15,5 14,4 13,4 L 11,4 11,3 C 11,1.7603028 10.263667,1 9,1 z M 5,2 8,2 C 9.3809813,2 10,2.3528175 10,3 7,3 4.85459,3.19773 5,6 5,8 3,8 3,6 L 3,4 C 3,2.4966359 3.4966359,2 5,2 z m 6,3.5 1,0 c 0.690253,0 1.5,0.027334 1.5,1.5 l 0,4.5 -2.5,0 z m -8,7.5 7,0 0,1 -7,0 z" />
-</svg>
diff --git a/symbols/biergarten.svg b/symbols/biergarten.svg
new file mode 100644
index 0000000..1a1f4fa
--- /dev/null
+++ b/symbols/biergarten.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 3,0 C 2,0 1,1 1,2 l 0,10 c 0,1 -1,2 -1,2 l 11,0 c 0,0 -1,-1 -1,-2 l 3,0 c 1,0 1,-1 1,-1 L 14,5 C 14,4 13,3 12,3 L 10,3 10,2 C 10,0.7603028 9.263667,0 8,0 z M 4,1 7,1 C 8.380981,1 9,1.3528175 9,2 6,2 3.85459,2.19773 4,5 4,7 2,7 2,5 L 2,3 C 2,1.4966359 2.496636,1 4,1 z m 6,3.5 1,0 c 0.690253,0 1.5,0.027334 1.5,1.5 l 0,4.5 -2.5,0 z m -8,7.5 7,0 0,1 -7,0 z"
+     id="biergarten" />
+</svg>
diff --git a/symbols/buddhist.16.svg b/symbols/buddhist.16.svg
deleted file mode 100644
index e82c2aa..0000000
--- a/symbols/buddhist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,1.03125 C 7.7538575,1.0291155 7.51543,1.3562643 7.5,2 4.6029845,2.2545513 2.2563153,4.6023818 2,7.5 c -1.2703952,0 -1.28747145,0.96914 0,1 0.2283193,2.916563 2.584827,5.219256 5.5,5.46875 0,1.404649 1,1.356045 1,0 2.935396,-0.222296 5.24644,-2.531918 5.46875,-5.46875 1.394629,0 1.355936,-1 0,-1 C 13.719146,4.5822447 11.417031,2.2268292 8.5,2 8.5,1.3648024 8.2461425,1.0333845 8,1.03125 z m -0.5,2.28125 0,3.5 L 5.03125,4.34375 C 5.7197423,3.7836121 6.5677817,3.4152092 7.5,3.312 [...]
-</svg>
diff --git a/symbols/buddhist.svg b/symbols/buddhist.svg
new file mode 100644
index 0000000..3f1b190
--- /dev/null
+++ b/symbols/buddhist.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 7.0002108,0.02315904 c -0.246143,-0.00213 -0.48457,0.3250143 -0.5,0.96875 -2.897016,0.25455126 -5.243685,2.60238176 -5.5,5.49999996 -1.27039499,0 -1.28747199,0.96914 0,1 0.228319,2.916564 2.584827,5.219257 5.5,5.468751 0,1.404649 1,1.356045 1,0 2.9353962,-0.222296 5.2464402,-2.531918 5.4687502,-5.468751 1.394629,0 1.355936,-1 0,-1 -0.249604,-2.9177553 -2.551719,-5.2731708 -5.4687502,-5.49999996 0,-0.6351976 -0.253858,-0.9666155 -0.5,-0.96875 z m -0.5,2.28124996 0,3.5 -2.46875,- [...]
+     id="buddhist" />
+</svg>
diff --git a/symbols/bus_stop.12.svg b/symbols/bus_stop.12.svg
index ca49798..f4ade01 100644
--- a/symbols/bus_stop.12.svg
+++ b/symbols/bus_stop.12.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 12 12" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="12" height="12" viewBox="0 0 12 12" id="svg2">
   <metadata id="metadata9">
     <rdf:RDF>
       <cc:Work rdf:about="">
diff --git a/symbols/cafe.16.svg b/symbols/cafe.16.svg
deleted file mode 100644
index d6060f4..0000000
--- a/symbols/cafe.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 2,2 0,6 c 0,2 2,3 4.5,3 C 9,11 11,10 11,8 l 2,0 c 1,0 2,-1 2,-2 L 15,5 C 15,4 14,3 13,3 l -2,0 0,-1 z m 9,2.25 1.75,0 c 0.667788,0 1,0.5628359 1,1.25 0,0.6871641 -0.388201,1.25 -1,1.25 L 11,6.75 z M 1,12 c 0,1 1,2 2,2 l 7,0 c 1,0 2,-1 2,-2 z" />
-</svg>
diff --git a/symbols/cafe.svg b/symbols/cafe.svg
new file mode 100644
index 0000000..4beaabf
--- /dev/null
+++ b/symbols/cafe.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 1,1 1,7 C 1,9 3,10 5.5,10 8,10 10,9 10,7 l 2,0 c 1,0 2,-1 2,-2 L 14,4 C 14,3 13,2 12,2 l -2,0 0,-1 z m 9,2.25 1.75,0 c 0.667788,0 1,0.5628359 1,1.25 0,0.6871641 -0.388201,1.25 -1,1.25 L 10,5.75 z M 0,11 c 0,1 1,2 2,2 l 7,0 c 1,0 2,-1 2,-2 z"
+     id="cafe" />
+</svg>
diff --git a/symbols/camping.16.svg b/symbols/camping.16.svg
deleted file mode 100644
index 12e40a4..0000000
--- a/symbols/camping.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 15,15 9.0000011,3.9999992 10.000001,1 9.0000011,1 8.0000012,2.9999995 7.0000003,1 6.0000005,1 7.0000003,3.9999992 1,15 z m -6.9999988,-7.0000008 2.9999998,6.0000018 -6.0000005,0 z" />
-</svg>
diff --git a/symbols/camping.svg b/symbols/camping.svg
new file mode 100644
index 0000000..21bf7c9
--- /dev/null
+++ b/symbols/camping.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 14,14 8.000001,2.9999992 9.000001,0 l -1,0 -1,1.9999995 L 6,0 5,0 6,2.9999992 0,14 z m -6.999999,-7.0000008 3,6.0000018 -6.000001,0 z"
+     id="camping" />
+</svg>
diff --git a/symbols/car_wash-14.svg b/symbols/car_wash.svg
similarity index 89%
rename from symbols/car_wash-14.svg
rename to symbols/car_wash.svg
index 6703e46..96ce720 100644
--- a/symbols/car_wash-14.svg
+++ b/symbols/car_wash.svg
@@ -6,7 +6,7 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
-   viewBox="-240 0 0 16"
+   viewBox="0 0 14 14"
    height="14"
    width="14"
    version="1.1">
@@ -24,6 +24,13 @@
   </metadata>
   <defs
      id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
   <path
      d="M 5,2 3,5 2,5 4,2 Z m 4,0 2,3 1,0 -2,-3 z m -2.5,0 1,0 0,3 -1,0 z M 6,0 4,1 10,1 8,0 Z M 4,6 3,9 C 2.527334,9 2,9.3842954 2,10 l 0,3 1,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 4,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 1,0 0,-3 C 12,9.4793944 11.544575,9 11,9 L 10,6 4,6 Z M 5,7 9,7 9.625,9 4.375,9 5,7 Z m -1,3.25 c 0.414214,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 z m 6,0 c 0.414214,0 0.75,0.335786  [...]
      style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
diff --git a/symbols/caravan_park.16.svg b/symbols/caravan_park.svg
similarity index 83%
rename from symbols/caravan_park.16.svg
rename to symbols/caravan_park.svg
index 27868b2..c581e26 100644
--- a/symbols/caravan_park.16.svg
+++ b/symbols/caravan_park.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 2,2 C 1,2 0,3 0,4 l 0,4 c 0,1 1,2 2,2 l 1.0625,0 C 3.295616,8.860792 4.291877,8 5.5,8 6.708123,8 7.704384,8.860792 7.9375,10 L 14,10 c 0,0 0,-1 -1,-1 l -1.5,0 0,-5 c 0,-0.9606645 -1.024338,-2 -2,-2 z M 2.84375,4 C 2.9375,3.984375 3,4 3,4 L 5,4 C 5,4 6,4 6,5 6,6 5,6 5,6 L 3,6 C 3,6 2,6 2,5 2,4.25 2.5625,4.046875 2.84375,4 z M 8,4 8.5,4 c 0,0 1,0 1,1 0,1 -1,1 -1,1 L 8,6 C 8,6 7,6 7,5 7,4 8,4 8,4 z M 5.5,9 C 4.671573,9 4,9.671573 4,10.5 4,11.328427 4.671573,12 5.5,12 6.328427,1 [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 2,2 C 1,2 0,3 0,4 l 0,4 c 0,1 1,2 2,2 l 1.0625,0 C 3.295616,8.860792 4.291877,8 5.5,8 6.708123,8 7.704384,8.860792 7.9375,10 L 14,10 c 0,0 0,-1 -1,-1 l -1.5,0 0,-5 c 0,-0.9606645 -1.024338,-2 -2,-2 z M 2.84375,4 C 2.9375,3.984375 3,4 3,4 L 5,4 C 5,4 6,4 6,5 6,6 5,6 5,6 L 3,6 C 3,6 2,6 2,5 2,4.25 2.5625,4.046875 2.84375,4 z M 8,4 8.5,4 c 0,0 1,0 1,1 0,1 -1,1 -1,1 L 8,6 C 8,6 7,6 7,5 7,4 8,4 8,4 z M 5.5,9 C 4.671573,9 4,9.671573 4,10.5 4,11.328427 4.671573,12 5.5,12 6.328427,1 [...]
 </svg>
diff --git a/symbols/cave.14.svg b/symbols/cave.svg
similarity index 87%
rename from symbols/cave.14.svg
rename to symbols/cave.svg
index d4eabc1..2082382 100644
--- a/symbols/cave.14.svg
+++ b/symbols/cave.svg
@@ -24,6 +24,13 @@
   </metadata>
   <defs
      id="defs7" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
   <path
      d="M 3,10 C 3,9 5,6 6.9763711,6.0000697 9,6 11,9 11,10 L 7,10 Z M 7,3 C 4,3 0,7 0,10 l 1,0 C 1,7 5,4 7,4 c 2,0 6,3 6,6 l 1,0 C 14,7 10,3 7,3 Z"
      style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
diff --git a/symbols/charging_station.16.svg b/symbols/charging_station.svg
similarity index 56%
rename from symbols/charging_station.16.svg
rename to symbols/charging_station.svg
index 7053fdb..e30856f 100644
--- a/symbols/charging_station.16.svg
+++ b/symbols/charging_station.svg
@@ -5,11 +5,11 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   id="svg2">
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -25,14 +25,14 @@
   <defs
      id="defs6" />
   <rect
-     width="14"
-     height="14"
-     x="1"
-     y="1"
+     style="visibility:hidden;fill:none;stroke:none"
      id="canvas"
-     style="visibility:hidden;fill:none;stroke:none" />
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
   <path
-     d="M 3,2 C 1.8344723,2 1,2.7955215 1,4 L 1,15 8,15 8,7.125 C 8,7.125 8.875,7 8.875,8 l 0,4 c 0,2 1.864698,2.125 2.125,2.125 0.275652,0 2.125,-0.124975 2.125,-2.125 l 0,-4 c 0,0 1.387558,0.017377 1.375,-2.96875 l -0.75,0 0,-2 C 13.75,2.4640917 13,2.4675079 13,3 l 0,2 -1,0 0,-2 C 12,2.4538157 11.25,2.4548128 11.25,3 l 0,2 -0.75,0 c 0.01252,2.9863904 1.375,3 1.375,3 l 0,4 c 0,0.874159 -0.767136,0.875 -0.875,0.875 -0.107864,0 -0.875,-0.04279 -0.875,-0.875 l 0,-4 C 10.125,6.7190916 9,5.8 [...]
+     style="fill:#000000;fill-opacity:1;stroke:none"
      id="charging-station"
-     style="fill:#000000;fill-opacity:1;stroke:none" />
+     d="M 2,1 C 0.8344723,1 0,1.7955215 0,3 L 0,14 7,14 7,6.125 C 7,6.125 7.875,6 7.875,7 l 0,4 c 0,2 1.864698,2.125 2.125,2.125 0.275652,0 2.125,-0.124975 2.125,-2.125 l 0,-4 c 0,0 1.387558,0.017377 1.375,-2.96875 l -0.75,0 0,-2 C 12.75,1.4640917 12,1.4675079 12,2 l 0,2 -1,0 0,-2 C 11,1.4538157 10.25,1.4548128 10.25,2 l 0,2 -0.75,0 c 0.01252,2.9863904 1.375,3 1.375,3 l 0,4 c 0,0.874159 -0.767136,0.875 -0.875,0.875 -0.107864,0 -0.875,-0.04279 -0.875,-0.875 l 0,-4 C 9.125,5.7190916 8,4.87 [...]
 </svg>
diff --git a/symbols/christian.16.svg b/symbols/christian.16.svg
deleted file mode 100644
index da6b146..0000000
--- a/symbols/christian.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7.999999,1 C 6.999998,1 7,2 7,2 l -1e-6,3 -4,0 0,2 4,0 L 7,15 9.000001,15 9,7 13,7 13,5 9,5 9,2 C 9,2 9,1 7.999999,1 z" />
-</svg>
diff --git a/symbols/christian.9.svg b/symbols/christian.9.svg
index ca1a84f..5d33b51 100644
--- a/symbols/christian.9.svg
+++ b/symbols/christian.9.svg
@@ -4,9 +4,16 @@
 <svg
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="9"
+   height="9"
    viewBox="0 0 9 9">
+  <rect
+     width="9"
+     height="9"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
   <path
      d="M 4.5,1 C 3.9882,1 4,1.5 4,1.5 L 4,3 2,3 2,4 4,4 4,8 5,8 5,4 7,4 7,3 5,3 5,1.5 C 5,1.5 5.0119,1 4.5,1 z"
      id="path3038" />
diff --git a/symbols/christian.svg b/symbols/christian.svg
new file mode 100644
index 0000000..8461e9c
--- /dev/null
+++ b/symbols/christian.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,0 C 5.999999,0 6.000001,1 6.000001,1 L 6,4 2,4 l 0,2 4,0 1e-6,8 2.000001,0 -1e-6,-8 4,0 0,-2 -4,0 0,-3 c 0,0 0,-1 -1.000001,-1 z"
+     id="christian" />
+</svg>
diff --git a/symbols/cinema.16.svg b/symbols/cinema.16.svg
deleted file mode 100644
index c383d87..0000000
--- a/symbols/cinema.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 2,2 C 1.446,2 1,2.446 1,3 l 0,11 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 L 15,3 C 15,2.446 14.554,2 14,2 L 2,2 z m 0.25,1 0.5,0 C 2.8885,3 3,3.1115 3,3.25 l 0,0.5 C 3,3.8885 2.8885,4 2.75,4 L 2.25,4 C 2.1115,4 2,3.8885 2,3.75 L 2,3.25 C 2,3.1115 2.1115,3 2.25,3 z M 5,3 11,3 11,8 5,8 5,3 z m 8.25,0 0.5,0 C 13.8885,3 14,3.1115 14,3.25 l 0,0.5 C 14,3.8885 13.8885,4 13.75,4 l -0.5,0 C 13.1115,4 13,3.8885 13,3.75 l 0,-0.5 C 13,3.1115 13.1115,3 13.25,3 z m -11,2 0.5,0 C  [...]
-</svg>
diff --git a/symbols/cinema.svg b/symbols/cinema.svg
new file mode 100644
index 0000000..2915a00
--- /dev/null
+++ b/symbols/cinema.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     id="path4"
+     d="M 1,1 C 0.446,1 0,1.446 0,2 l 0,11 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 L 14,2 C 14,1.446 13.554,1 13,1 L 1,1 Z m 0.25,1 0.5,0 C 1.8885,2 2,2.1115 2,2.25 l 0,0.5 C 2,2.8885 1.8885,3 1.75,3 L 1.25,3 C 1.1115,3 1,2.8885 1,2.75 L 1,2.25 C 1,2.1115 1.1115,2 1.25,2 Z M 4,2 10,2 10,7 4,7 4,2 Z m 8.25,0 0.5,0 C 12.8885,2 13,2.1115 13,2.25 l 0,0.5 C 13,2.8885 12.8885,3 12.75,3 l -0.5,0 C 12.1115,3 12,2.8885 12,2.75 l 0,-0.5 C 12,2.1115 12.1115,2 12.25,2 Z m -11,2 0.5,0 C  [...]
+</svg>
diff --git a/symbols/communications.16.svg b/symbols/communications.16.svg
deleted file mode 100644
index 58f31eb..0000000
--- a/symbols/communications.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 5,1.40625 C 3.2327602,2.1855669 1.96875,3.9521023 1.96875,6 1.96875,8.0478977 3.2327602,9.8144331 5,10.59375 L 5,9.4375 C 3.8044698,8.7467087 3,7.4881502 3,6 3,4.5118498 3.8044698,3.2532914 5,2.5625 L 5,1.40625 z m 6,0 0,1.15625 C 12.19553,3.2532914 13,4.5118498 13,6 13,7.4881502 12.19553,8.7467087 11,9.4375 l 0,1.15625 C 12.76724,9.8144331 14.03125,8.0478977 14.03125,6 14.03125,3.9521023 12.76724,2.1855669 11,1.40625 z M 6,3.1875 C 4.8429537,3.6043642 4,4.7033306 4,6 4,7.29666 [...]
-</svg>
diff --git a/symbols/communications.svg b/symbols/communications.svg
new file mode 100644
index 0000000..3a8b10a
--- /dev/null
+++ b/symbols/communications.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 4.00025,0.40625 C 2.23301,1.1855669 0.969,2.9521023 0.969,5 c 0,2.047898 1.26401,3.814433 3.03125,4.59375 l 0,-1.15625 c -1.19553,-0.690791 -2,-1.9493498 -2,-3.4375 0,-1.4881502 0.80447,-2.7467086 2,-3.4375 l 0,-1.15625 z m 6,0 0,1.15625 c 1.19553,0.6907914 2,1.9493498 2,3.4375 0,1.4881502 -0.80447,2.746709 -2,3.4375 l 0,1.15625 C 11.76749,8.814433 13.0315,7.047898 13.0315,5 c 0,-2.0478977 -1.26401,-3.8144331 -3.03125,-4.59375 z m -5,1.78125 c -1.157046,0.4168642 -2,1.5158306 - [...]
+     id="mast-communications" />
+</svg>
diff --git a/symbols/community_centre-14.svg b/symbols/community_centre.svg
similarity index 97%
rename from symbols/community_centre-14.svg
rename to symbols/community_centre.svg
index bd6e94e..62094f3 100644
--- a/symbols/community_centre-14.svg
+++ b/symbols/community_centre.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 14 14"
-   height="100%"
-   width="100%"
+   height="14"
+   width="14"
    version="1.1">
   <metadata
      id="metadata8">
diff --git a/symbols/computer-14.svg b/symbols/computer-14.svg
deleted file mode 100644
index bfb3583..0000000
--- a/symbols/computer-14.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   id="svg2"
-   x="0px"
-   y="0px"
-   width="14"
-   height="14"
-   viewBox="0 0 14 14"
-   enable-background="new 0 0 580 580"
-   xml:space="preserve"><metadata
-     id="metadata13"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs11" /><path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero [...]
-     d="M 2,10 C 1.7492735,10 1.6784845,10.148136 1.5531212,10.398862 L 0.46484375,13.529297 C 0.27854468,13.779151 0.74927346,14 1,14 l 12,0 c 0.250727,0 0.619365,-0.250316 0.535156,-0.470703 L 12.416408,10.36644 C 12.291045,10.147054 12.250727,10 12,10 Z"
-     id="path4142" /><path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero [...]
-     d="M 3,1 C 2.5154074,1 2,1.5166276 2,2 l 0,6 c 0,0.4833725 0.5166276,1.0000001 1,1.0000001 l 8,0 c 0.483372,0 1,-0.5166276 1,-1.0000001 L 12,2 C 12,1.5166127 11.483372,1 11,1 L 3,1 Z m 0,1 8,0 0,6 -8,0 0,-6 z"
-     id="path4140" /><g
-     id="g3658"
-     transform="matrix(35.361376,0,0,35.361376,-287.04938,-189.95613)" /><g
-     id="g3626-4"
-     transform="matrix(31.340817,0,0,31.340817,-243.79003,-170.92361)" /></svg>
\ No newline at end of file
diff --git a/symbols/courthouse-16.svg b/symbols/courthouse-16.svg
deleted file mode 100644
index ead0149..0000000
--- a/symbols/courthouse-16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="M 8,1 C 7,1 7,2 7,2 L 3.25,3 3.25,4 1,9 c 0,1 0.792008,2 2.5,2 C 5.207992,11 6,10 6,9 L 3.75,4 7,4 7,14 3,14 2,15 14,15 13,14 9,14 9,4 12.25,4 10,9 c 0,1 0.77294,2 2.5,2 1.72706,0 2.5,-1 2.5,-2 L 12.75,4 12.75,3 9,2 C 9,2 9,1 8,1 z M 3.5,5 5.25,9 1.75,9 z m 9,0 1.75,4 -3.5,0 z"
-     id="courthouse"
-     style="fill:#1a1a1a;fill-opacity:1" />
-</svg>
diff --git a/symbols/post_office-14.svg b/symbols/courthouse.svg
similarity index 72%
copy from symbols/post_office-14.svg
copy to symbols/courthouse.svg
index 82268ef..182b2b0 100644
--- a/symbols/post_office-14.svg
+++ b/symbols/courthouse.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
@@ -34,7 +34,6 @@
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
-     d="m 0,2 0,1 7,4 7,-4 0,-1 z m 0,3 0,7 14,0 0,-7 -7,4 z"
-     id="post-office"
-     style="fill:#000000;fill-opacity:1;stroke:none" />
+     d="M 7,0 C 6,0 6,1 6,1 L 2.25,2 2.25,3 0,8 C 0,9 0.792008,10 2.5,10 4.207992,10 5,9 5,8 L 2.75,3 6,3 6,13 2,13 1,14 13,14 12,13 8,13 8,3 11.25,3 9,8 c 0,1 0.77294,2 2.5,2 C 13.22706,10 14,9 14,8 L 11.75,3 11.75,2 8,1 C 8,1 8,0 7,0 z M 2.5,4 4.25,8 0.75,8 z m 9,0 1.75,4 -3.5,0 z"
+     id="courthouse" />
 </svg>
diff --git a/symbols/dentist.16.svg b/symbols/dentist.16.svg
deleted file mode 100644
index 8cae7f5..0000000
--- a/symbols/dentist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 8,9 c 2,0 2,1 2,3 0,1 -1.0091211,3 0,3 1,0 1.751359,-1.142963 2,-3 0.248641,-1.857037 0,-3 0,-4 C 12,6 13,4 13,3 13,2 12.599761,1.21742 12,1 10,1 10,2 8,2 6,2 6,1 4,1 3.400799,1.21742 3,2 3,3 c 0,1 1,3 1,5 0,1 -0.1223902,2.57334 0,4 0.1223902,1.42666 1,3 2,3 1.008702,0 0,-2 0,-3 0,-2 0,-3 2,-3 z" />
-</svg>
diff --git a/symbols/dentist.svg b/symbols/dentist.svg
new file mode 100644
index 0000000..43cfc3b
--- /dev/null
+++ b/symbols/dentist.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 7,8 c 2,0 2,1 2,3 0,1 -1.009121,3 0,3 1,0 1.751359,-1.142963 2,-3 C 11.248641,9.142963 11,8 11,7 11,5 12,3 12,2 12,1 11.599761,0.21742 11,0 9,0 9,1 7,1 5,1 5,0 3,0 2.400799,0.21742 2,1 2,2 2,3 3,5 3,7 3,8 2.87761,9.57334 3,11 3.12239,12.42666 4,14 5,14 6.008702,14 5,12 5,11 5,9 5,8 7,8 z"
+     id="dentist" />
+</svg>
diff --git a/symbols/department_store.p.16.svg b/symbols/department_store.p.16.svg
deleted file mode 100644
index d1cbd47..0000000
--- a/symbols/department_store.p.16.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   id="svg2"
-   viewBox="0 0 12.131796 14"
-   height="3.9511111mm"
-   width="3.4238625mm">
-  <defs
-     id="defs4" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-47.54492,-1002.3066)"
-     id="layer1">
-    <path
-       id="rect3477"
-       transform="translate(47.54492,1002.3066)"
-       d="M 6.0996094 0 C 5.4632694 0 4.8273554 0.16062188 4.2558594 0.48242188 C 3.1356934 1.1133219 2.4263235 2.2802344 2.3984375 3.5527344 L 0.53125 3.5527344 L 0.033203125 12.972656 L 0.033203125 14 L 12.097656 14 L 11.544922 3.5527344 L 9.8007812 3.5527344 C 9.7728812 2.2802344 9.0635344 1.1133219 7.9433594 0.48242188 C 7.3718644 0.16062187 6.7359504 0 6.0996094 0 z M 6.0996094 1.5273438 C 6.4782704 1.5273438 6.8572935 1.6223 7.1953125 1.8125 C 7.8477355 2.18 8.2462705 2.8365344 8.2 [...]
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/symbols/doctors.16.svg b/symbols/doctors.16.svg
deleted file mode 100644
index 484b399..0000000
--- a/symbols/doctors.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,2 C 6.83929,2 5.6678336,2.5047052 4.875,3.5 4.1875142,4.3630449 4,5 3.90625,6.0000004 1.01009,6.0238004 1,7.0817104 1,14 l 14,0 C 15,7.0817104 14.9899,6.0237504 12.09375,6.0000004 12,5 11.795537,4.3460958 11.125,3.5 10.334655,2.5027279 9.16071,2 8,2 z m 0,2 c 1.281412,-0.00489 2,1 2.0625,2.0000004 l -4.125,0 C 6,5 6.718588,4.0048937 8,4 z m -1,3.0000004 2,0 L 9,9 l 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z" />
-</svg>
diff --git a/symbols/doctors.svg b/symbols/doctors.svg
new file mode 100644
index 0000000..f428f4e
--- /dev/null
+++ b/symbols/doctors.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,1 C 5.83929,1 4.667834,1.5047052 3.875,2.5 3.187514,3.3630449 3,4 2.90625,5.0000004 0.01009,5.0238004 0,6.0817104 0,13 l 14,0 C 14,6.0817104 13.9899,5.0237504 11.09375,5.0000004 11,4 10.795537,3.3460958 10.125,2.5 9.334655,1.5027279 8.16071,1 7,1 z M 7,3 C 8.281412,2.99511 9,4 9.0625,5.0000004 l -4.125,0 C 5,4 5.718588,3.0048937 7,3 z m -1,3.0000004 2,0 L 8,8 l 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z"
+     id="doctor" />
+</svg>
diff --git a/symbols/drinking_water.16.svg b/symbols/drinking_water.16.svg
deleted file mode 100644
index 7e7b0af..0000000
--- a/symbols/drinking_water.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 2,7 1.5,8 5,0 L 10,7 z M 3.18,8 8.81,8 8.44,10 3.55,10 M 5,6 C 5,4 6,3 8,3 L 9,3 9,2 8,2 C 7,2 7,1 8,1 l 3,0 c 1,0 1,1 0,1 l -1,0 0,1 4,0 0,1.5 -6,0 C 6.9152599,4.4911116 6.5,4.9824765 6.5,6 z" />
-</svg>
diff --git a/symbols/drinking_water.svg b/symbols/drinking_water.svg
new file mode 100644
index 0000000..702ce54
--- /dev/null
+++ b/symbols/drinking_water.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 1,6 1.5,8 5,0 L 9,6 z M 2.18,7 7.81,7 7.44,9 2.55,9 M 4,5 C 4,3 5,2 7,2 L 8,2 8,1 7,1 C 6,1 6,0 7,0 l 3,0 c 1,0 1,1 0,1 l -1,0 0,1 4,0 0,1.5 -6,0 C 5.91526,3.49111 5.5,3.9824765 5.5,5 z"
+     id="drinking-water" />
+</svg>
diff --git a/symbols/elevator-12.svg b/symbols/elevator.12.svg
similarity index 97%
rename from symbols/elevator-12.svg
rename to symbols/elevator.12.svg
index 8f3af94..20b4d07 100644
--- a/symbols/elevator-12.svg
+++ b/symbols/elevator.12.svg
@@ -8,7 +8,7 @@
    version="1.1"
    width="12"
    height="12"
-   viewBox="-110 0 0 10"
+   viewBox="0 0 12 12"
    id="svg2">
   <metadata
      id="metadata8">
diff --git a/symbols/embassy.16.svg b/symbols/embassy.16.svg
deleted file mode 100644
index 0d23500..0000000
--- a/symbols/embassy.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 9,2 C 6,4 4,2 4,2 l 0,7 c 0,0 2,2 5,0 3,-2 5,0 5,0 L 14,2 C 14,2 12,0 9,2 z M 2.5,1.25 C 2.25,1.25 2,1.5 2,2 l 0,12 c 0,1 1,1 1,0 L 3,2 C 3,1.5 2.75,1.25 2.5,1.25 z" />
-</svg>
diff --git a/symbols/embassy.svg b/symbols/embassy.svg
new file mode 100644
index 0000000..4f02ae1
--- /dev/null
+++ b/symbols/embassy.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 8,1 C 5,3 3,1 3,1 l 0,7 c 0,0 2,2 5,0 3,-2 5,0 5,0 L 13,1 C 13,1 11,-1 8,1 z M 1.5,0.25 C 1.25,0.25 1,0.5 1,1 l 0,12 c 0,1 1,1 1,0 L 2,1 C 2,0.5 1.75,0.25 1.5,0.25 z"
+     id="embassy"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/symbols/emergency_phone.16.svg b/symbols/emergency_phone.svg
similarity index 87%
rename from symbols/emergency_phone.16.svg
rename to symbols/emergency_phone.svg
index 3699f7e..5e916df 100644
--- a/symbols/emergency_phone.16.svg
+++ b/symbols/emergency_phone.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 2,1 C 1,1 0,2 0,3 l 0,1 4,0 1,-1 4,0 1,1 4,0 0,-1 C 14,2 13,1 12,1 z M 0,4.75 0,5.25 C 0,5.25 0.37037551,6 1,6 L 3,6 C 3.5663545,5.9811215 4,5.25 4,5.25 l 0,-0.5 z m 10,0 0,0.5 c 0,0 0.433715,0.75 1,0.75 l 2,0 c 0.566673,0 1,-0.75 1,-0.75 l 0,-0.5 z M 1.5,8 C 0.70762712,8 0,8.573533 0,9.5 0,10.478901 0.72245763,11 1.5,11 l 1,0 C 2.5,11 3,11 3,11.5 3,12 2.5,12 2.5,12 l -2,0 0,1 2,0 C 3.2775424,13 4,12.396919 4,11.46875 4,10.593015 3.2627119,10 2.5,10 l -1,0 C 1.5,10 1,10 1,9. [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 2,1 C 1,1 0,2 0,3 l 0,1 4,0 1,-1 4,0 1,1 4,0 0,-1 C 14,2 13,1 12,1 z M 0,4.75 0,5.25 C 0,5.25 0.37037551,6 1,6 L 3,6 C 3.5663545,5.9811215 4,5.25 4,5.25 l 0,-0.5 z m 10,0 0,0.5 c 0,0 0.433715,0.75 1,0.75 l 2,0 c 0.566673,0 1,-0.75 1,-0.75 l 0,-0.5 z M 1.5,8 C 0.70762712,8 0,8.573533 0,9.5 0,10.478901 0.72245763,11 1.5,11 l 1,0 C 2.5,11 3,11 3,11.5 3,12 2.5,12 2.5,12 l -2,0 0,1 2,0 C 3.2775424,13 4,12.396919 4,11.46875 4,10.593015 3.2627119,10 2.5,10 l -1,0 C 1.5,10 1,10 1,9. [...]
 </svg>
diff --git a/symbols/entrance.10.svg b/symbols/entrance.10.svg
index 9f5e7b6..e8d3cfb 100644
--- a/symbols/entrance.10.svg
+++ b/symbols/entrance.10.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="10"
+   height="10"
    viewBox="0 0 10 10"
    id="svg2">
   <metadata
diff --git a/symbols/fast_food.16.svg b/symbols/fast_food.16.svg
deleted file mode 100644
index f537708..0000000
--- a/symbols/fast_food.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 6,4 C 3,4 1.960032,6.000799 2,7 L 2,8 14,8 14,7 C 14,6 13,4 10,4 z M 2,9 c -1,0 -1,1 0,1 l 12,0 c 1,0 1,-1 0,-1 z m 0,2.03125 0,0.625 C 2,12.34045 2.81579,13 3.5,13 l 9,0 c 0.68421,0 1.5,-0.65955 1.5,-1.34375 l 0,-0.625 z" />
-</svg>
diff --git a/symbols/fast_food.svg b/symbols/fast_food.svg
new file mode 100644
index 0000000..46d4ed6
--- /dev/null
+++ b/symbols/fast_food.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 5,3 C 2,3 0.960032,5.000799 1,6 L 1,7 13,7 13,6 C 13,5 12,3 9,3 z M 1,8 C 0,8 0,9 1,9 l 12,0 c 1,0 1,-1 0,-1 z m 0,2.03125 0,0.625 C 1,11.34045 1.81579,12 2.5,12 l 9,0 c 0.68421,0 1.5,-0.65955 1.5,-1.34375 l 0,-0.625 z"
+     id="fast-food" />
+</svg>
diff --git a/symbols/firestation.16.svg b/symbols/firestation.16.svg
deleted file mode 100644
index 2b9a626..0000000
--- a/symbols/firestation.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,1 C 4.4241613,2.2414283 3,6 3,9 3,12 4.7449329,14.259763 7,15 5,11.741416 5,9 8,7 c -0.5049218,1.3528175 0,4 1,5 0.431455,-0.400757 1,-1.424727 1,-2 2,2 0.562898,3.633261 0,5 1.08818,-0.559102 3,-2 3,-5 C 13,7 11,6 11,3 9.6164844,3.5992431 9,5 9,6 8.0479394,5.4434404 7,3.2464256 8,1 z" />
-</svg>
diff --git a/symbols/firestation.svg b/symbols/firestation.svg
new file mode 100644
index 0000000..68d6ac9
--- /dev/null
+++ b/symbols/firestation.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,0 C 3.424161,1.2414283 2,5 2,8 2,11 3.744933,13.259763 6,14 4,10.741416 4,8 7,6 6.495078,7.352818 7,10 8,11 8.431455,10.599243 9,9.575273 9,9 c 2,2 0.562898,3.633261 0,5 1.08818,-0.559102 3,-2 3,-5 C 12,6 10,5 10,2 8.616484,2.5992431 8,4 8,5 7.047939,4.4434404 6,2.2464256 7,0 z"
+     id="fire-station" />
+</svg>
diff --git a/symbols/ford.16.svg b/symbols/ford.svg
similarity index 82%
rename from symbols/ford.16.svg
rename to symbols/ford.svg
index d86d5bb..7bc597f 100644
--- a/symbols/ford.16.svg
+++ b/symbols/ford.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 4.5,1 1,4 l 3.5,3 0,-2 5,0 0,2 3.5,-3 -3.5,-3 0,2 -5,0 z M 3,7.5 c -0.5338983,0 -1.4922852,1 -2,1 L 1,10 c 0.5371839,0 1.5254237,-1 2,-1 0.5042373,0 1.4661017,1 2,1 0.4755023,0 1.4922852,-1 2,-1 0.5042373,0 1.5217305,1 2,1 0.5042373,0 1.525424,-1 2,-1 0.474576,0 1.495763,1 2,1 l 0,-1.5 c -0.415254,0 -1.466102,-1.029661 -2,-1 -0.47827,0 -1.4652784,1 -2,1 -0.4449153,0 -1.4957627,-1 -2,-1 -0.5042373,0 -1.5540971,1 -2,1 -0.4755023,0 -1.4661017,-1 -2,-1 z m 0,3 c -0.5338983,0 -1. [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 4.5,1 1,4 l 3.5,3 0,-2 5,0 0,2 3.5,-3 -3.5,-3 0,2 -5,0 z M 3,7.5 c -0.5338983,0 -1.4922852,1 -2,1 L 1,10 c 0.5371839,0 1.5254237,-1 2,-1 0.5042373,0 1.4661017,1 2,1 0.4755023,0 1.4922852,-1 2,-1 0.5042373,0 1.5217305,1 2,1 0.5042373,0 1.525424,-1 2,-1 0.474576,0 1.495763,1 2,1 l 0,-1.5 c -0.415254,0 -1.466102,-1.029661 -2,-1 -0.47827,0 -1.4652784,1 -2,1 -0.4449153,0 -1.4957627,-1 -2,-1 -0.5042373,0 -1.5540971,1 -2,1 -0.4755023,0 -1.4661017,-1 -2,-1 z m 0,3 c -0.5338983,0 -1. [...]
 </svg>
diff --git a/symbols/fountain-14.svg b/symbols/fountain.svg
similarity index 98%
rename from symbols/fountain-14.svg
rename to symbols/fountain.svg
index 3bded4f..79f7595 100644
--- a/symbols/fountain-14.svg
+++ b/symbols/fountain.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 14 14"
-   height="100%"
-   width="100%"
+   height="14"
+   width="14"
    version="1.1">
   <metadata
      id="metadata8">
diff --git a/symbols/fuel.16.svg b/symbols/fuel.16.svg
deleted file mode 100644
index fcacd89..0000000
--- a/symbols/fuel.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 11.78125,1 -0.625,0.71875 1.1875,1.09375 c 0.03621,0.036212 0.0856,0.084693 0.125,0.125 l -0.25,0.28125 C 11.818532,3.6189681 12.105689,4.1369332 12.25,4.28125 L 13,5.03125 13,11 c 0,1 -0.392136,1 -0.5,1 C 12.392136,12 12,12 12,11 L 12,7 C 12,5.7190916 11,5 10,5 L 10,3 C 10,2.4486964 9.5752733,2 9,2 L 3,2 C 2.400757,2 2,2.4247267 2,3 l 0,12 8,0 0,-9 c 0,0 1,0 1,1 l 0,4 c 0,2 1.239698,2 1.5,2 0.275652,0 1.5,0 1.5,-2 L 14,4 C 14,3 13.713983,2.7907839 13.375,2.46875 L 11.78125,1 z [...]
-</svg>
diff --git a/symbols/fuel.svg b/symbols/fuel.svg
new file mode 100644
index 0000000..b6125ec
--- /dev/null
+++ b/symbols/fuel.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 10.78125,0 -0.625,0.71875 1.1875,1.09375 c 0.03621,0.036212 0.0856,0.084693 0.125,0.125 l -0.25,0.28125 C 10.818532,2.6189681 11.105689,3.1369332 11.25,3.28125 L 12,4.03125 12,10 c 0,1 -0.392136,1 -0.5,1 C 11.392136,11 11,11 11,10 L 11,6 C 11,4.7190916 10,4 9,4 L 9,2 C 9,1.4486964 8.575273,1 8,1 L 2,1 C 1.400757,1 1,1.4247267 1,2 l 0,12 8,0 0,-9 c 0,0 1,0 1,1 l 0,4 c 0,2 1.239698,2 1.5,2 0.275652,0 1.5,0 1.5,-2 L 13,3 C 13,2 12.713983,1.7907839 12.375,1.46875 L 10.78125,0 z M 2 [...]
+     id="fuel" />
+</svg>
diff --git a/symbols/generating_patterns/scrub.md b/symbols/generating_patterns/scrub.md
new file mode 100644
index 0000000..9327bdc
--- /dev/null
+++ b/symbols/generating_patterns/scrub.md
@@ -0,0 +1,10 @@
+The scrub pattern is generated by visiting http://www.imagico.de/map/jsdotpattern.php and using the following options:
+
+- regular snub square ('5' button)
+- distance = 45
+- radius = 64
+- radius y = 64
+- metric = 2
+- about 10-20 relax clicks
+- 'scrub2' image
+- use the "render (px aligned)" option 
diff --git a/symbols/generating_patterns/scrub.svg b/symbols/generating_patterns/scrub.svg
new file mode 100644
index 0000000..85ea639
--- /dev/null
+++ b/symbols/generating_patterns/scrub.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Svg" width="512" height="512">
+				<defs>
+					<clipPath id="clipPath">
+						
+					<rect x="0" y="0" width="512" height="512"/></clipPath>
+				<g fill="#8ece8f" transform="matrix(1,0,0,1,-5,-12)" id="gSivlr6zbr5z1"><g><path d="M 4,9 4,13.125 2.40625,10.7188 1.59375,11.2813 3.40625,14 1,14 l 0,1 3,0 1,0 3,0 0,-1 -2.40625,0 1.8125,-2.7187 L 6.59375,10.7188 5,13.125 5,9 4,9 z"/></g></g></defs>
+				<g id="Pattern" style="clip-path: url(#clipPath);">
+				<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#gSivlr6zbr5z1" x="390" y="403"/><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#gSivlr6zbr5z1" x="171" y="109"/><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#gSivlr6zbr5z1" x="31" y="295"/><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#gSivlr6zbr5z1" x="543" y="295"/><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#gSivlr6zbr5z1" x="460" y="319"/><use xmlns:xlink="http:/ [...]
+			<desc>Created with Snap</desc></svg>
\ No newline at end of file
diff --git a/symbols/helipad.svg b/symbols/helipad.16.svg
similarity index 71%
rename from symbols/helipad.svg
rename to symbols/helipad.16.svg
index eceb8e9..97e13e2 100644
--- a/symbols/helipad.svg
+++ b/symbols/helipad.16.svg
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+	<rect
+     width="16"
+     height="16"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
 	<path fill-rule="evenodd" d="M 8 0.5 C 3.8578644 0.5 0.5 3.8579 0.5 8 C 0.5 12.1421 3.8578644 15.5 8 15.5 C 12.142136 15.5 15.5 12.1421 15.5 8 C 15.5 3.8579 12.142136 0.5 8 0.5 z M 8 1.5 C 11.589851 1.5 14.5 4.4101491 14.5 8 C 14.5 11.589851 11.589851 14.5 8 14.5 C 4.4101491 14.5 1.5 11.589851 1.5 8 C 1.5 4.4101491 4.4101491 1.5 8 1.5 z M 5 3 L 4.25 3.75 L 4.25 12.25 C 4.25 12.2501 4.9999904 13 5 13 L 6 13 L 6 9 L 10 9 L 10 13 L 11 13 L 11.75 12.25 L 11.75 3.75 L 11 3 L 10 3 L 10 7 L 6  [...]
 </svg>
diff --git a/symbols/hinduist.16.svg b/symbols/hinduist.16.svg
deleted file mode 100644
index 113725b..0000000
--- a/symbols/hinduist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7,3 C 7,3 8.598346,5.8202261 11,3.5 11.330985,4 12,5 12,5 12,5 8.5566276,7.3559064 7,3 z M 2,5 C 2.2886214,5.6087858 2.6605301,6.357316 3,7 3.5044529,6 5,6 5,6 6,6 6.7338601,6.3918109 6.7338601,7.0271271 6.7338601,7.6624433 6,8 5,8 5,8 5,9 5,9.5 6.3108541,9.251282 7.0026347,10.289559 6.6821476,11.006988 6.074951,12.36634 2.5039264,12.526644 1,10 c 0,3.987823 3.4414924,4 4,4 2,0 3,-2 3,-4 0.5208035,0.543036 1.354855,0.545623 2,0 0.904803,-0.7652747 1.258697,-2.0101204 2.5,-2 1.5 [...]
-</svg>
diff --git a/symbols/hinduist.svg b/symbols/hinduist.svg
new file mode 100644
index 0000000..fcaf03c
--- /dev/null
+++ b/symbols/hinduist.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 6,1.9999996 c 0,0 1.598346,2.8202261 4,0.5 0.330985,0.5 1,1.5 1,1.5 0,0 -3.443372,2.3559064 -5,-2 z m -5,2 c 0.288621,0.6087858 0.66053,1.357316 1,2 0.504453,-1 2,-1 2,-1 1,0 1.73386,0.3918109 1.73386,1.0271271 C 5.73386,6.6624429 5,6.9999996 4,6.9999996 c 0,0 0,1 0,1.4999997 1.310854,-0.248718 2.002635,0.789559 1.682148,1.5069877 C 5.074951,11.366339 1.503926,11.526643 0,8.9999993 c 0,3.9878227 3.441492,3.9999997 4,3.9999997 2,0 3,-2 3,-3.9999997 0.520803,0.543036 1.354855,0.5 [...]
+     id="hinduist" />
+</svg>
diff --git a/symbols/hospital.16.svg b/symbols/hospital.16.svg
deleted file mode 100644
index 21b5e9c..0000000
--- a/symbols/hospital.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,0.96875 C 4.1945765,0.96875 1.03125,4.0714285 1.03125,8 c 0,3.928572 3.1633265,7.03125 6.96875,7.03125 3.805424,0 6.96875,-3.102679 6.96875,-7.03125 C 14.96875,4.0714285 11.805424,0.96875 8,0.96875 z m 0,1.0625 c 3.374278,0 6.03125,2.7176196 6.03125,5.96875 0,3.251131 -2.656972,5.96875 -6.03125,5.96875 C 4.6257218,13.96875 1.96875,11.251131 1.96875,8 1.96875,4.7488696 4.6257218,2.03125 8,2.03125 z M 6,3 6,6 3,6 l 0,4 3,0 0,3 4,0 0,-3 3,0 0,-4 -3,0 0,-3 -4,0 z" />
-</svg>
diff --git a/symbols/hospital.svg b/symbols/hospital.svg
new file mode 100644
index 0000000..66e5fc5
--- /dev/null
+++ b/symbols/hospital.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,0 C 3.177512,0 0,3.0888888 0,7 c 0,3.911112 3.177512,7 7,7 3.822489,0 7,-3.088889 7,-7 C 14,3.0888888 10.822489,0 7,0 z m 0,1.0577778 c 3.389409,0 6.058296,2.7055413 6.058296,5.9422222 0,3.236682 -2.668887,5.942222 -6.058296,5.942222 C 3.610591,12.942222 0.941704,10.236682 0.941704,7 0.941704,3.7633191 3.610591,1.0577778 7,1.0577778 z m -2.008969,0.9644444 0,2.9866667 -3.013452,0 0,3.9822221 3.013452,0 0,2.986667 4.017938,0 0,-2.986667 3.013453,0 0,-3.9822221 -3.013453,0 0,-2 [...]
+     id="hospital" />
+</svg>
diff --git a/symbols/hostel.16.svg b/symbols/hostel.16.svg
deleted file mode 100644
index 91b70e6..0000000
--- a/symbols/hostel.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="M 1.625,1 C 1.25,1 1,1.25 1,1.75 L 1,15 l 1.25,0 0,-2 11.5,0 0,2 1.25,0 C 15.02275,15 15,1.75 15,1.75 15,1.25 14.75,1 14.375,1 14,1 13.75,1.25 13.75,1.75 l 0,4.25 -11.5,0 0,-4.25 C 2.25,1.25 2,1 1.625,1 z M 4.5,2 C 3.671573,2 3,2.671573 3,3.5 3,4.328427 3.671573,5 4.5,5 5.328427,5 6,4.328427 6,3.5 6,2.671573 5.328427,2 4.5,2 z m 2,1 0,2 6.5,0 C 13,4 11.963825,3 11,3 z m -4.25,4 11.5,0 0,5 -11.5,0 c 0.02355,0 0,-5 0,-5 z M 4.5,8 C 3.671573,8 3,8.671573 3,9.5 3,10.328427 3.671573,1 [...]
-     id="hostel"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/copyshop-14.svg b/symbols/hostel.svg
similarity index 57%
copy from symbols/copyshop-14.svg
copy to symbols/hostel.svg
index e45a608..f95d467 100644
--- a/symbols/copyshop-14.svg
+++ b/symbols/hostel.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
@@ -34,7 +34,6 @@
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
-     d="M 9.03125,-0.03125 1,0 1,10 4,10 4,9 2,9 2,1 l 6,0 0,2 1.03125,0 0,-3.03125 z M 3,2 3,2.5 7,2.5 7,2 3,2 z M 3,3 3,3.5 4,3.5 4,3 3,3 z M 3,4 3,4.5 4,4.5 4,4 3,4 z M 5,4 5,14 13,14 13,7.28125 9.71875,4 5,4 z M 3,5 3,5.5 4,5.5 4,5 3,5 z m 3,0 3,0 0,3 3,0 0,5 -6,0 0,-8 z M 10,5.6875 11.3125,7 10,7 10,5.6875 z M 3,6 3,6.5 4,6.5 4,6 3,6 z M 7,6 7,6.5 8,6.5 8,6 7,6 z M 3,7 3,7.5 4,7.5 4,7 3,7 z M 7,7 7,7.5 8,7.5 8,7 7,7 z M 7,8 7,8.5 8,8.5 8,8 7,8 z m 0,1 0,0.5 4,0 L 11,9 7,9 z m 0,1 0, [...]
-     id="copyshop"
-     style="fill:#000000;fill-opacity:1" />
+     d="M 0.625,0 C 0.25,0 0,0.25 0,0.75 L 0,14 l 1.25,0 0,-2 11.5,0 0,2 1.25,0 C 14.02275,14 14,0.75 14,0.75 14,0.25 13.75,0 13.375,0 13,0 12.75,0.25 12.75,0.75 l 0,4.25 -11.5,0 0,-4.25 C 1.25,0.25 1,0 0.625,0 z M 3.5,1 C 2.671573,1 2,1.671573 2,2.5 2,3.328427 2.671573,4 3.5,4 4.328427,4 5,3.328427 5,2.5 5,1.671573 4.328427,1 3.5,1 z m 2,1 0,2 6.5,0 C 12,3 10.963825,2 10,2 z m -4.25,4 11.5,0 0,5 -11.5,0 c 0.02355,0 0,-5 0,-5 z M 3.5,7 C 2.671573,7 2,7.671573 2,8.5 2,9.328427 2.671573,10 [...]
+     id="hostel" />
 </svg>
diff --git a/symbols/hotel.16.svg b/symbols/hotel.16.svg
deleted file mode 100644
index ee2361a..0000000
--- a/symbols/hotel.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="M 1.625,4 C 1.25,4 1,4.25 1,4.75 l 0,7.25 1.25,0 0,-1.75 c 0,0 10.380697,0.01892 11.5,0 L 13.75,12 15,12 15,9.625 15,5.75 C 15,5.4202582 14.86199,5 14.375,5 13.88801,5 13.75,5.4202582 13.75,5.75 l 0,3.25 -11.5,0 0,-4.25 C 2.25,4.25 2,4 1.625,4 z M 4.5,5 C 3.671573,5 3,5.671573 3,6.5 3,7.328427 3.671573,8 4.5,8 5.328427,8 6,7.328427 6,6.5 6,5.671573 5.328427,5 4.5,5 z m 2,1 0,2 6.5,0 C 13,7 11.963825,6 11,6 z"
-     id="hotel"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/post_office-14.svg b/symbols/hotel.svg
similarity index 65%
copy from symbols/post_office-14.svg
copy to symbols/hotel.svg
index 82268ef..471c524 100644
--- a/symbols/post_office-14.svg
+++ b/symbols/hotel.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
@@ -34,7 +34,6 @@
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
-     d="m 0,2 0,1 7,4 7,-4 0,-1 z m 0,3 0,7 14,0 0,-7 -7,4 z"
-     id="post-office"
-     style="fill:#000000;fill-opacity:1;stroke:none" />
+     d="M 0.625,3 C 0.25,3 0,3.25 0,3.75 l 0,7.25 1.25,0 0,-1.75 c 0,0 10.380697,0.01892 11.5,0 L 12.75,11 14,11 14,8.625 14,4.75 C 14,4.4202582 13.86199,4 13.375,4 12.88801,4 12.75,4.4202582 12.75,4.75 l 0,3.25 -11.5,0 0,-4.25 C 1.25,3.25 1,3 0.625,3 z M 3.5,4 C 2.671573,4 2,4.671573 2,5.5 2,6.328427 2.671573,7 3.5,7 4.328427,7 5,6.328427 5,5.5 5,4.671573 4.328427,4 3.5,4 z m 2,1 0,2 6.5,0 C 12,6 10.963825,5 10,5 z"
+     id="hotel" />
 </svg>
diff --git a/symbols/hunting-stand.16.svg b/symbols/hunting-stand.16.svg
deleted file mode 100644
index f05bec9..0000000
--- a/symbols/hunting-stand.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="m 4,1 0,1.25 8,2 L 12,3 z M 5,3.5 5,8 11,8 11,5 z M 4,9 l 0,1 1,0 -1,5 1.5,0 1,-5 3,0 1.03125,5 1.5,0 L 11,10 l 1,0 0,-1 z"
-     id="hunting-stand"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
\ No newline at end of file
diff --git a/symbols/post_office-14.svg b/symbols/hunting_stand.svg
similarity index 82%
copy from symbols/post_office-14.svg
copy to symbols/hunting_stand.svg
index 82268ef..a5add91 100644
--- a/symbols/post_office-14.svg
+++ b/symbols/hunting_stand.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
@@ -34,7 +34,6 @@
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
-     d="m 0,2 0,1 7,4 7,-4 0,-1 z m 0,3 0,7 14,0 0,-7 -7,4 z"
-     id="post-office"
-     style="fill:#000000;fill-opacity:1;stroke:none" />
+     d="m 3,0 0,1.25 8,2 L 11,2 z M 4,2.5 4,7 10,7 10,4 z M 3,8 l 0,1 1,0 -1,5 1.5,0 1,-5 3,0 1.03125,5 1.5,0 L 10,9 11,9 11,8 z"
+     id="hunting-stand" />
 </svg>
diff --git a/symbols/information.12.svg b/symbols/information.12.svg
index f07bc40..6dc82e5 100644
--- a/symbols/information.12.svg
+++ b/symbols/information.12.svg
@@ -37,10 +37,10 @@
   <rect
      style="visibility:hidden;fill:none;stroke:none"
      id="canvas"
-     y="-2"
+     y="0"
      x="0"
-     height="14"
-     width="14" />
+     height="12"
+     width="12" />
   <path
      id="information"
      d="M 6 0 A 1 1 0 0 0 5 1 A 1 1 0 0 0 6 2 A 1 1 0 0 0 7 1 A 1 1 0 0 0 6 0 z M 7 4 L 4 5 L 4 6 L 4.921875 6 L 5 11 L 4 11 L 4 12 L 8 12 L 8 11 L 7 11 L 7 4 z "
diff --git a/symbols/jewish.16.svg b/symbols/jewish.16.svg
deleted file mode 100644
index ab0db96..0000000
--- a/symbols/jewish.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8.03125,1.34375 6,4.875 l -4,0 2,3.5 -2,3.5 4,0 2.03125,3.53125 2,-3.53125 3.96875,0 -1.96875,-3.5 1.96875,-3.5 -3.96875,0 -2,-3.53125 z m 0,2.5 0.59375,1.03125 -1.1875,0 0.59375,-1.03125 z m -3.90625,2.1875 1.21875,0 -0.625,1.0625 L 4.125,6.03125 z m 2.65625,0 2.5,0 1.3125,2.34375 -1.3125,2.34375 -2.5,0 L 5.46875,8.375 6.78125,6.03125 z m 3.90625,0 1.25,0 -0.625,1.09375 -0.625,-1.09375 z m 0.625,3.59375 0.625,1.09375 -1.25,0 0.625,-1.09375 z m -6.59375,0.03125 0.625,1.0625 -1. [...]
-</svg>
diff --git a/symbols/jewish.svg b/symbols/jewish.svg
new file mode 100644
index 0000000..b70d00d
--- /dev/null
+++ b/symbols/jewish.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7.03125,0 5,3.46875 l -4,0 2,3.5 -2,3.5 4,0 L 7.03125,14 l 2,-3.53125 3.96875,0 -1.96875,-3.5 1.96875,-3.5 -3.96875,0 z m 0,2.4375 0.59375,1.03125 -1.1875,0 z M 3.125,4.625 l 1.21875,0 -0.625,1.0625 z m 2.65625,0 2.5,0 1.3125,2.34375 -1.3125,2.34375 -2.5,0 -1.3125,-2.34375 z m 3.90625,0 1.25,0 -0.625,1.09375 z m 0.625,3.59375 0.625,1.09375 -1.25,0 z M 3.71875,8.25 l 0.625,1.0625 -1.21875,0 z m 2.71875,2.21875 1.1875,0 L 7.03125,11.5 z"
+     id="jewish" />
+</svg>
diff --git a/symbols/laundry-14.svg b/symbols/laundry-14.svg
deleted file mode 100644
index bc7d3ef..0000000
--- a/symbols/laundry-14.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 14 14"
-   id="svg2">
-  <defs
-     id="defs3053" />
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     width="14"
-     height="14"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="m 8.3484087,7.8911223 a 1.477387,1.442211 0 0 1 -3.19e-5,0.00947"
-     id="path3855"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-  <path
-     d="M 20,6.5 C 20,7.8807119 18.880712,9 17.5,9 16.119509,9 15.000312,7.8810564 15,6.5005654 M 11.5,-2 l 0,14 12,0 0,-14 -12,0 z m 2,1 5,0 0,2 -5,0 0,-2 z m 7,0 2,0 0,2 -2,0 0,-2 z m -3,4 c 1.60466,0 3.01542,1.0999131 3.40625,2.65625 L 21,6.5 C 21,8.432997 19.432997,10 17.5,10 15.567003,10 14,8.432997 14,6.5 14,4.5670034 15.567003,3 17.5,3 z"
-     transform="translate(-10.5,2)"
-     id="path3051"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
-</svg>
diff --git a/symbols/library.14.svg b/symbols/library.14.svg
deleted file mode 100644
index dba9828..0000000
--- a/symbols/library.14.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg2"
-   viewBox="0 0 16 16"
-   height="100%"
-   width="100%"
-   version="1.1">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="rect4174"
-     style="visibility:hidden;fill:none;stroke:none" />
-  <path
-     id="path4176"
-     d="M 3.5917969,2.8769531 C 3.39328,2.8849528 3.1958998,2.9246486 3,3 l 0,8 c 0,0 3.1875,-0.125 4,3 L 7,5.5996094 C 6.38001,4.2940108 4.9814151,2.8209552 3.5917969,2.8769531 Z M 7,14 C 4.9375,12.40625 2,12 2,12 L 2,4.4003906 1,4 l 0,9 6,2 2,0 6,-2 0,-9 -1,0.4003906 0,8.0000004 L 9,14 C 8.333333,13.74532 7.556181,13.790637 7,14 Z M 13,3 C 11.00748,2.8934496 8.7073046,4.0896818 7.5,5.1191406 l 0,8.4648434 c 1.1147712,-0.924639 3.113583,-2.141273 5.5,-2.384765 z"
-     style="fill:#734a08;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/post_office-14.svg b/symbols/library.svg
similarity index 55%
copy from symbols/post_office-14.svg
copy to symbols/library.svg
index 82268ef..ad521d9 100644
--- a/symbols/post_office-14.svg
+++ b/symbols/library.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,8 +6,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
@@ -27,14 +25,13 @@
   <defs
      id="defs6" />
   <rect
-     width="14"
-     height="14"
-     x="0"
-     y="0"
+     style="visibility:hidden;fill:none;stroke:none"
      id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
   <path
-     d="m 0,2 0,1 7,4 7,-4 0,-1 z m 0,3 0,7 14,0 0,-7 -7,4 z"
-     id="post-office"
-     style="fill:#000000;fill-opacity:1;stroke:none" />
+     d="M 2.5917969,0.8769531 C 2.39328,0.8849528 2.1958998,0.9246486 2,1 L 2,9 C 2,9 5.1875,8.875 6,12 L 6,3.5996094 C 5.38001,2.2940108 3.9814151,0.8209552 2.5917969,0.8769531 Z M 6,12 C 3.9375,10.40625 1,10 1,10 L 1,2.4003906 0,2 l 0,9 6,2 2,0 6,-2 0,-9 -1,0.4003906 0,8.0000004 L 8,12 C 7.333333,11.74532 6.556181,11.790637 6,12 Z M 12,1 C 10.00748,0.8934496 7.7073046,2.0896818 6.5,3.1191406 l 0,8.4648434 C 7.6147712,10.659345 9.613583,9.442711 12,9.199219 Z"
+     id="path4176" />
 </svg>
diff --git a/symbols/lighthouse.16.svg b/symbols/lighthouse.16.svg
deleted file mode 100644
index eb7eae4..0000000
--- a/symbols/lighthouse.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="m 8.0003065,1 -3,1.5 c -0.465049,1.5 -0.465049,2.5 0,4.5 l 1,0 -1,8 6.0000005,0 -1,-8 1,0 c 0.530187,-2 0.530187,-3 0,-4.5 L 8.0003065,1 z m -6.28125,1.46875 c -0.167266,0.084188 -0.229367,0.3762768 0,0.46875 l 1.875,0.75 c 0.306429,0.1235421 0.493322,-0.3454524 0.1875,-0.46875 l -1.875,-0.75 c -0.07646,-0.030824 -0.131745,-0.028062 -0.1875,0 z m 12.3750005,0 -1.875,0.75 c -0.305822,0.1232976 -0.118929,0.5922921 0.1875,0.46875 l 1.875,-0.75 C 14.58738,2.8142024 14.399879,2.345452 [...]
-     id="lighthouse"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/lighthouse.svg b/symbols/lighthouse.svg
new file mode 100644
index 0000000..c27d78a
--- /dev/null
+++ b/symbols/lighthouse.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     style="visibility:hidden;fill:none;stroke:none"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     id="lighthouse"
+     d="m 7.0003065,0 -3,1.5 c -0.465049,1.5 -0.465049,2.5 0,4.5 l 1,0 -1,8 6.0000005,0 -1,-8 1,0 c 0.530187,-2 0.530187,-3 0,-4.5 L 7.0003065,0 Z m -6.28125,1.46875 c -0.167266,0.084188 -0.229367,0.3762768 0,0.46875 l 1.875,0.75 c 0.306429,0.1235421 0.493322,-0.3454524 0.1875,-0.46875 l -1.875,-0.75 c -0.07646,-0.030824 -0.131745,-0.028062 -0.1875,0 z m 12.3750005,0 -1.875,0.75 c -0.305822,0.1232976 -0.118929,0.5922921 0.1875,0.46875 l 1.875,-0.75 C 13.58738,1.8142024 13.399879,1.345452 [...]
+</svg>
diff --git a/symbols/memorial.svg b/symbols/memorial.svg
new file mode 100644
index 0000000..aac1330
--- /dev/null
+++ b/symbols/memorial.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,0 C 7,0 5,1.4966359 5,2 l 0,8 4,0 0,-8 C 9,1.5206056 7,0 7,0 z M 4,11 c -1,0 -1,1 -1,2 l -1,0 -1,1 12,0 -1,-1 -1,0 c 0,-1 0,-2 -1,-2 z"
+     id="monument" />
+</svg>
diff --git a/symbols/monument.16.svg b/symbols/monument.svg
similarity index 75%
rename from symbols/monument.16.svg
rename to symbols/monument.svg
index 059b97b..25890a6 100644
--- a/symbols/monument.16.svg
+++ b/symbols/monument.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,13 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
   <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 7,0 C 7,0 5,1.4966359 5,2 l 0,8 4,0 0,-8 C 9,1.5206056 7,0 7,0 z M 4,11 c -1,0 -1,1 -1,2 l -1,0 -1,1 12,0 -1,-1 -1,0 c 0,-1 0,-2 -1,-2 z" id="monument" style="fill:#000000;fill-opacity:1;stroke:none" transform="translate(1,1)"/>
+  <path d="M 7,0 C 7,0 5,1.4966359 5,2 l 0,8 4,0 0,-8 C 9,1.5206056 7,0 7,0 z M 4,11 c -1,0 -1,1 -1,2 l -1,0 -1,1 12,0 -1,-1 -1,0 c 0,-1 0,-2 -1,-2 z" id="monument" style="fill:#000000;fill-opacity:1;stroke:none" />
 </svg>
diff --git a/symbols/motel.16.svg b/symbols/motel.16.svg
deleted file mode 100644
index 63b3872..0000000
--- a/symbols/motel.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="M 1.625,1 C 1.25,1 1,1.25 1,1.75 l 0,5.75 1.25,0 0,-1.5 c 0,0 10.380697,0.01892 11.5,0 l 0,1.5 1.25,0 c -9.7e-5,0 0,-4.75 0,-4.75 C 15,2.4202582 14.861987,2 14.375,2 13.88801,2 13.713586,2.422275 13.75,2.75 l 0,2 -11.5,0 0,-3 C 2.25,1.25 2,1 1.625,1 z M 4.5,1 C 3.671573,1 3,1.671573 3,2.5 3,3.328427 3.671573,4 4.5,4 5.328427,4 6,3.328427 6,2.5 6,1.671573 5.328427,1 4.5,1 z m 2,1 0,2 6.5,0 C 13,3 11.963825,2 11,2 z M 5,7 4,10 c -0.472666,0 -1,0.384295 -1,1 l 0,3 1,0 c 0,0 0,1 1,1  [...]
-     id="motel"
-     style="fill:#1a1a1a;stroke:none" />
-</svg>
diff --git a/symbols/motel.svg b/symbols/motel.svg
new file mode 100644
index 0000000..6bcf95e
--- /dev/null
+++ b/symbols/motel.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 0.625,0 C 0.25,0 0,0.25 0,0.75 l 0,5.75 1.25,0 0,-1.5 c 0,0 10.380697,0.01892 11.5,0 l 0,1.5 1.25,0 c -9.7e-5,0 0,-4.75 0,-4.75 C 14,1.4202582 13.861987,1 13.375,1 12.88801,1 12.713586,1.422275 12.75,1.75 l 0,2 -11.5,0 0,-3 C 1.25,0.25 1,0 0.625,0 z M 3.5,0 C 2.671573,0 2,0.671573 2,1.5 2,2.328427 2.671573,3 3.5,3 4.328427,3 5,2.328427 5,1.5 5,0.671573 4.328427,0 3.5,0 z m 2,1 0,2 6.5,0 C 12,2 10.963825,1 10,1 z M 4,6 3,9 C 2.527334,9 2,9.384295 2,10 l 0,3 1,0 c 0,0 0,1 1,1 1,0 [...]
+     id="motel" />
+</svg>
diff --git a/symbols/motorcycle-14.svg b/symbols/motorcycle.svg
similarity index 99%
rename from symbols/motorcycle-14.svg
rename to symbols/motorcycle.svg
index d247992..c1fd0bf 100644
--- a/symbols/motorcycle-14.svg
+++ b/symbols/motorcycle.svg
@@ -6,7 +6,7 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
-   viewBox="-240 0 0 16"
+   viewBox="0 0 14 14"
    height="14"
    width="14"
    version="1.1">
diff --git a/symbols/motorcycle_parking.16.svg b/symbols/motorcycle_parking.16.svg
deleted file mode 100644
index 98f8ea8..0000000
--- a/symbols/motorcycle_parking.16.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg2"
-   viewBox="0 0 16 16"
-   height="100%"
-   width="100%"
-   version="1.1">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="m 13.105361,9.5925004 c 0.230087,0.143493 0.364242,0.301579 0.429688,0.5019526 0.02151,0.06588 0.02287,0.07941 0.02344,0.214845 5.18e-4,0.124653 -9.69e-4,0.157343 -0.01758,0.226563 -0.0326,0.135857 -0.09294,0.287657 -0.164063,0.419922 l -0.03125,0.06055 -0.107422,0.0059 c -0.390788,0.02031 -0.705242,0.09063 -0.978515,0.220703 -0.586101,0.278965 -0.954254,0.803082 -1.136719,1.615234 l -0.01563,0.06445 -0.07617,0.07031 c -0.04224,0.03811 -0.09913,0.08395 -0.126953,0.101562 -0.25285 [...]
-     style="fill:#1a1a1a;fill-rule:evenodd"
-     id="parking-motorcycle" />
-</svg>
diff --git a/symbols/motorcycle_parking.svg b/symbols/motorcycle_parking.svg
new file mode 100644
index 0000000..2e2b7c4
--- /dev/null
+++ b/symbols/motorcycle_parking.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     style="visibility:hidden;fill:none;stroke:none"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     id="parking-motorcycle"
+     style="fill:#1a1a1a;fill-rule:evenodd"
+     d="m 12.105361,8.592849 c 0.230087,0.143493 0.364242,0.301579 0.429688,0.501953 0.02151,0.06588 0.02287,0.07941 0.02344,0.214845 5.18e-4,0.124653 -9.69e-4,0.157343 -0.01758,0.226563 -0.0326,0.135857 -0.09294,0.287657 -0.164063,0.419922 l -0.03125,0.06055 -0.107422,0.0059 c -0.390788,0.02031 -0.705242,0.09063 -0.978515,0.220703 -0.586101,0.278965 -0.954254,0.803082 -1.136719,1.615234 l -0.01563,0.06445 -0.07617,0.07031 c -0.04224,0.03811 -0.09913,0.08395 -0.126953,0.101562 -0.25285,0 [...]
+</svg>
diff --git a/symbols/museum.16.svg b/symbols/museum.16.svg
deleted file mode 100644
index e34ba58..0000000
--- a/symbols/museum.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,2 2,4 2,5 14,5 14,4 z m -6,4 0,1 1,0 0,5 -1,0 -1,2 14,0 -1,-2 -1,0 0,-5 1,0 0,-1 z M 6,7 C 6.4973717,7 7,7.5325904 7,8 L 7,12 5,12 5,8 C 5,7.4726661 5.5026283,7 6,7 z m 4,0 c 0.503364,0 1,0.4726661 1,1 l 0,4 -2,0 0,-4 C 9,7.4726661 9.4966359,7 10,7 z" />
-</svg>
diff --git a/symbols/museum.svg b/symbols/museum.svg
new file mode 100644
index 0000000..fd19661
--- /dev/null
+++ b/symbols/museum.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,1 1,3 1,4 13,4 13,3 z m -6,4 0,1 1,0 0,5 -1,0 -1,2 14,0 -1,-2 -1,0 0,-5 1,0 0,-1 z M 5,6 C 5.497372,6 6,6.5325904 6,7 L 6,11 4,11 4,7 C 4,6.4726661 4.502628,6 5,6 z m 4,0 c 0.503364,0 1,0.4726661 1,1 l 0,4 -2,0 0,-4 C 8,6.4726661 8.496636,6 9,6 z"
+     id="museum" />
+</svg>
diff --git a/symbols/muslim.16.svg b/symbols/muslim.16.svg
deleted file mode 100644
index 5588fe1..0000000
--- a/symbols/muslim.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7,2 C 3.609585,2 1,4.6096 1,8 c 0,3.3904 2.609585,6 6,6 1.89566,0 3.873911,-0.6497 5,-2 -0.7358,0.479 -2.0565974,1 -3,1 C 6.40733,13 4,10.5927 4,8 4,5.4073 6.40733,3 9,3 9.9434026,3 11.2642,3.5211 12,4 10.873911,2.6498 8.89566,2 7,2 z m 4.5,3 -1,2 L 8,7 10,8.5 9,11 11.5,9.5 14,11 13,8.5 15,7 12.5,7 11.5,5 z" />
-</svg>
diff --git a/symbols/muslim.svg b/symbols/muslim.svg
new file mode 100644
index 0000000..7bc5aa0
--- /dev/null
+++ b/symbols/muslim.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 6,1 C 2.609585,1 0,3.6096 0,7 c 0,3.3904 2.609585,6 6,6 1.89566,0 3.873911,-0.6497 5,-2 -0.7358,0.479 -2.056597,1 -3,1 C 5.40733,12 3,9.5927 3,7 3,4.4073 5.40733,2 8,2 8.943403,2 10.2642,2.5211 11,3 9.873911,1.6498 7.89566,1 6,1 z M 10.5,4 9.5,6 7,6 9,7.5 8,10 10.5,8.5 13,10 12,7.5 14,6 11.5,6 10.5,4 z"
+     id="muslim" />
+</svg>
diff --git a/symbols/newsagent-14.svg b/symbols/newsagent-14.svg
deleted file mode 100644
index adb8884..0000000
--- a/symbols/newsagent-14.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 14 14"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="14"
-     height="14"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <g
-     id="g3809">
-    <g
-       id="g3817">
-      <path
-         d="m 7,11 4,0 0,0.536839 -4,0.02177 z m 0,-1 4,0 0,0.536839 -4,0.02177 z M 7,6 11,6 11,9 7,9 z M 2,6 6,6.023451 6,6.5602898 2,6.5586098 z m 0,5 4,0 0,0.536839 -4,0.02177 z m 0,-1 4,0 0,0.536839 -4,0.02177 z M 2,9 6,9.023451 6,9.5602901 2,9.5586101 z M 2,8 6,8.023451 6,8.5602898 2,8.5586098 z M 2,7 6,7 6,7.5368388 2,7.5586062 z M 2,2 2,4.510373 11,4.5572742 11,2 z M 0,0 c 0,1.5606474 0,8.9375328 0,11 0,2 0,0 0,3 l 10,0 3,0 0,-14 z m 1,1 11,0 0,12 -9,0 c -1.4082984,0 0,0 -2,0 z"
-         id="path3795-5-5"
-         style="fill:#000000;fill-opacity:1;stroke:none" />
-    </g>
-  </g>
-</svg>
diff --git a/symbols/nightclub.14.svg b/symbols/nightclub.svg
similarity index 97%
rename from symbols/nightclub.14.svg
rename to symbols/nightclub.svg
index d785725..aaf9a92 100644
--- a/symbols/nightclub.14.svg
+++ b/symbols/nightclub.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
diff --git a/symbols/parking.svg b/symbols/parking.svg
index d93513d..8569591 100644
--- a/symbols/parking.svg
+++ b/symbols/parking.svg
@@ -1,4 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 9 12">
-<path fill-rule="evenodd" d="M 0,0 L 0,12 1.75,12 1.75,7 6,7 A 3.0,3.5 0 0,0 6,0 Z M 1.75,1.75 L 1.75,5.25 5.5,5.25 A 1.58,1.75 0 0,0 5.5,1.75 Z"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     style="fill-rule:evenodd"
+     id="path4"
+     d="m 3,1 0,12 1.75,0 0,-5 L 9,8 A 3,3.5 0 0 0 9,1 Z m 1.75,1.75 0,3.5 3.75,0 a 1.58,1.75 0 0 0 0,-3.5 z" />
 </svg>
diff --git a/symbols/peak.svg b/symbols/peak.svg
index f63cf5a..8886875 100644
--- a/symbols/peak.svg
+++ b/symbols/peak.svg
@@ -4,5 +4,12 @@
    version="1.1"
    width="8"
    height="8">
+	<rect
+     width="8"
+     height="8"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
 	<path d="M 4,1 0,8 8,8 z" />
 </svg>
diff --git a/symbols/pharmacy.16.svg b/symbols/pharmacy.16.svg
deleted file mode 100644
index 0f8ffcb..0000000
--- a/symbols/pharmacy.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 5,5 -2,2 0,8 10,0 0,-8 -2,-2.0000003 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z M 5,1 5,4 11,4 11,1 z" />
-</svg>
diff --git a/symbols/pharmacy.svg b/symbols/pharmacy.svg
new file mode 100644
index 0000000..9be7969
--- /dev/null
+++ b/symbols/pharmacy.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 4,4 -2,2 0,8 10,0 0,-8 -2,-2.0000003 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z M 4,0 4,3 10,3 10,0 z"
+     id="pharmacy" />
+</svg>
diff --git a/symbols/picnic.16.svg b/symbols/picnic.16.svg
deleted file mode 100644
index c2b7129..0000000
--- a/symbols/picnic.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 4,3 C 2.6779661,3 2.6779661,4.5 4,4.5 l 8,0 C 13.33909,4.5 13.338983,3 12,3 L 4,3 z M 5,5 4.25,8 2,8 C 0.6779661,8 0.6779661,9.5 2,9.5 L 3.875,9.5 3,13 4.5,13 5.375,9.5 10.625,9.5 11.5,13 13,13 12.125,9.5 14,9.5 C 15.33909,9.5 15.338983,8 14,8 L 11.75,8 11,5 9.5,5 10.25,8 5.75,8 6.5,5 5,5 z" />
-</svg>
diff --git a/symbols/picnic.svg b/symbols/picnic.svg
new file mode 100644
index 0000000..36556d5
--- /dev/null
+++ b/symbols/picnic.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 2.9995255,2 c -1.322034,0 -1.322034,1.5 0,1.5 l 8.0000005,0 c 1.33909,0 1.338983,-1.5 0,-1.5 L 2.9995255,2 z m 1,2 -0.75,3 -2.25,0 c -1.322034,0 -1.322034,1.5 0,1.5 l 1.875,0 -0.875,3.5 1.5,0 0.875,-3.5 5.25,0 0.8750005,3.5 1.5,0 -0.875,-3.5 1.875,0 c 1.33909,0 1.338983,-1.5 0,-1.5 l -2.25,0 -0.7500005,-3 -1.5,0 0.75,3 -4.5,0 0.75,-3 -1.5,0 z"
+     id="table"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/symbols/place_of_worship.16.svg b/symbols/place_of_worship.16.svg
deleted file mode 100644
index cffa0a0..0000000
--- a/symbols/place_of_worship.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7.5,1 C 6.6715729,1 6,1.6715729 6,2.5 6,3.3284271 6.671573,4 7.5,4 8.3284271,4 9,3.3284271 9,2.5 9,1.6715729 8.328427,1 7.5,1 z M 2.167788,5.573171 3.5,8 l 3,-1 1,4 -2,2 c -0.2711864,0.305085 -0.4661017,0.45872 -0.5,1 0,1 1,1 1,1 l 6,0 c 0,0 1,0 1,-1 0,-1 -1,-1 -1,-1 l -3,0 1,-1 c 1,-1 0.928985,-1.472666 0.8125,-2 L 10,6 C 9.7606097,5.1065832 9.1377884,4.6703491 8,4.85 L 7,5 4,6.5 3,5 C 2.5588374,4.412383 1.8167825,4.9182326 2.167788,5.573171 z" />
-</svg>
diff --git a/symbols/place_of_worship.svg b/symbols/place_of_worship.svg
new file mode 100644
index 0000000..69fb57f
--- /dev/null
+++ b/symbols/place_of_worship.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 6.4996451,0 c -0.828427,0 -1.5,0.6715729 -1.5,1.5 0,0.8284271 0.671573,1.5 1.5,1.5 0.828428,0 1.5,-0.6715729 1.5,-1.5 0,-0.8284271 -0.671573,-1.5 -1.5,-1.5 z M 1.1674331,4.573171 2.4996451,7 l 3,-1 1,4 -2,2 c -0.271186,0.305085 -0.466101,0.45872 -0.5,1 0,1 1,1 1,1 l 5.9999999,0 c 0,0 1,0 1,-1 0,-1 -1,-1 -1,-1 l -2.9999999,0 1,-1 c 1,-1 0.928985,-1.472666 0.8125,-2 l -0.8125,-4 c -0.23939,-0.8934168 -0.862211,-1.3296509 -2,-1.15 l -1,0.15 -3,1.5 -1,-1.5 C 1.5584831,3.412383 0.81 [...]
+     id="place-of-worship" />
+</svg>
diff --git a/symbols/playground.16.svg b/symbols/playground.16.svg
deleted file mode 100644
index e75a973..0000000
--- a/symbols/playground.16.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <path
-     d="M 4.40625,2 C 3.65262,2.0471927 2.9985239,2.7448953 3,3.5 3.0002867,4.2852156 3.7147844,4.9994517 4.5,4.9994517 5.2852156,4.9994517 5.9997133,4.2852156 6,3.5 6.0015986,2.6823545 5.2222984,1.9488955 4.40625,2 z m 8,3 C 11.65262,5.0471927 10.998524,5.7448953 11,6.5 c 2.87e-4,0.7852156 0.714784,1.4994517 1.5,1.4994517 0.785216,0 1.499713,-0.7142361 1.5,-1.4994517 C 14.001599,5.6823545 13.222298,4.9488956 12.40625,5 z M 4,5.5 C 2.5290102,5.5 2.1341648,7.3734067 2.03125,8.375 L 1,8 1, [...]
-     id="path4885"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/playground.svg b/symbols/playground.svg
new file mode 100644
index 0000000..0237285
--- /dev/null
+++ b/symbols/playground.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 3.40625,1 C 2.65262,1.047193 1.998524,1.7448953 2,2.5 2.000287,3.2852156 2.714784,3.9994517 3.5,3.9994517 4.285216,3.9994517 4.999713,3.2852156 5,2.5 5.0016,1.6823545 4.222298,0.9488955 3.40625,1 z m 8,3 C 10.65262,4.0471927 9.998524,4.7448953 10,5.5 c 2.87e-4,0.7852156 0.714784,1.4994517 1.5,1.4994517 0.785216,0 1.499713,-0.7142361 1.5,-1.4994517 C 13.001599,4.6823545 12.222298,3.9488956 11.40625,4 z M 3,4.5 C 1.52901,4.5 1.134165,6.3734067 1.03125,7.375 L 0,7 0,8 5.96875,10.1 [...]
+     id="playground" />
+</svg>
diff --git a/symbols/police.16.svg b/symbols/police.16.svg
deleted file mode 100644
index f899d8b..0000000
--- a/symbols/police.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 6,1 5,2 5,3 11,3 11,2 10,1 z M 5,4 C 4.9667,4.168726 5,4.3395259 5,4.5185186 5,5.9503556 6.61931,7 8,7 9.38069,7 11,5.9503556 11,4.5185186 11,4.3395259 11,4 11,4 z M 5,8 C 3.5810939,8 3.01415,9.876578 3,11 L 3,15 4.53125,15 10,8 z M 11.5,8 6.03125,15 13,15 13,11 C 13,9.8764743 12.727158,8 11.5,8 z" />
-</svg>
diff --git a/symbols/police.svg b/symbols/police.svg
new file mode 100644
index 0000000..b4adfd1
--- /dev/null
+++ b/symbols/police.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 5,0 4,1 4,2 10,2 10,1 9,0 z M 4,3 C 3.9667,3.168726 4,3.3395259 4,3.5185186 4,4.9503556 5.61931,6 7,6 8.38069,6 10,4.9503556 10,3.5185186 10,3.3395259 10,3 10,3 z M 4,7 C 2.581094,7 2.01415,8.876578 2,10 L 2,14 3.53125,14 9,7 z M 10.5,7 5.03125,14 12,14 12,10 C 12,8.876474 11.727158,7 10.5,7 z"
+     id="police" />
+</svg>
diff --git a/symbols/post_box-12.svg b/symbols/post_box.12.svg
similarity index 97%
rename from symbols/post_box-12.svg
rename to symbols/post_box.12.svg
index f0cdcef..43956cb 100644
--- a/symbols/post_box-12.svg
+++ b/symbols/post_box.12.svg
@@ -6,8 +6,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="12"
+   height="12"
    viewBox="0 0 12 12"
    id="svg2">
   <metadata
diff --git a/symbols/post_office-14.svg b/symbols/post_office.svg
similarity index 96%
copy from symbols/post_office-14.svg
copy to symbols/post_office.svg
index 82268ef..6823bc7 100644
--- a/symbols/post_office-14.svg
+++ b/symbols/post_office.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
diff --git a/symbols/power_wind-16.svg b/symbols/power_wind-16.svg
deleted file mode 100644
index 7e20d6b..0000000
--- a/symbols/power_wind-16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="M 12.7185,1.5 C 12.008233,1.3993314 10.205538,2.5161034 8.031,4.59375 8.753021,4.631868 9.470705,5.3689488 9.406,6.03125 11.551291,3.9815468 12.795568,2.2473073 12.7185,1.5 z M 2.93725,4.25 C 2.327739,4.271754 1.874369,4.3532481 1.656,4.53125 1.96178,5.1801816 3.850651,6.0730322 6.781,6.75 6.416505,6.1255886 6.660654,5.1220091 7.24975,4.8125 5.442914,4.3950856 3.953102,4.2137427 2.93725,4.25 z m 5.0625,1.25 c -0.276142,0 -0.5,0.2238576 -0.5,0.5 0,0.2761424 0.223858,0.5 0.5,0.5 0. [...]
-     id="power-wind"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/power_wind.svg b/symbols/power_wind.svg
new file mode 100644
index 0000000..bb10f68
--- /dev/null
+++ b/symbols/power_wind.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 11.718618,0.5 C 11.008344,0.3993314 9.205629,1.5161034 7.0310681,3.59375 7.7530968,3.631868 8.4707885,4.3689488 8.4060828,5.03125 10.551397,2.9815468 11.795687,1.2473073 11.718618,0.5 z M 1.9372637,3.25 C 1.3277462,3.271754 0.8743713,3.3532481 0.656,3.53125 0.9617833,4.1801816 2.8506744,5.0730322 5.7810548,5.75 5.4165559,5.1255886 5.6607075,4.1220091 6.2498098,3.8125 4.4429545,3.3950856 2.9531265,3.2137427 1.9372637,3.25 z M 6.9998178,4.5 c -0.276145,0 -0.5000054,0.2238576 -0.5 [...]
+     id="power-wind"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/symbols/prison.16.svg b/symbols/prison.16.svg
deleted file mode 100644
index ec7e760..0000000
--- a/symbols/prison.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 1,1 1,15 15,15 15,1 1,1 z m 1,1 3,0 0,12 -0.5,0 0,-4.21875 C 4.2009277,10.13501 4,10.5625 4,11 L 4,14 2,14 2,2 z m 4,0 4,0 0,12 -0.5,0 0,-5 -3,0 0,5 L 6,14 6,2 z m 5,0 3,0 0,12 -2,0 0,-3 C 12,10.5625 11.799072,10.13501 11.5,9.78125 L 11.5,14 11,14 11,2 z M 8,4 C 7.3991523,4 6.8666154,4.2680514 6.5,4.6875 l 0,2.625 C 6.8666154,7.7319486 7.3991523,8 8,8 8.6008474,8 9.1333845,7.7319486 9.5,7.3125 l 0,-2.625 C 9.1333845,4.2680514 8.6008474,4 8,4 z" />
-</svg>
diff --git a/symbols/prison.svg b/symbols/prison.svg
new file mode 100644
index 0000000..b3eda17
--- /dev/null
+++ b/symbols/prison.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 0,0 0,14 14,14 14,0 0,0 z m 1,1 3,0 0,12 -0.5,0 0,-4.21875 C 3.200928,9.13501 3,9.5625 3,10 L 3,13 1,13 1,1 z m 4,0 4,0 0,12 -0.5,0 0,-5 -3,0 0,5 L 5,13 5,1 z m 5,0 3,0 0,12 -2,0 0,-3 C 11,9.5625 10.799072,9.13501 10.5,8.78125 L 10.5,13 10,13 10,1 z M 7,3 C 6.399152,3 5.866615,3.2680514 5.5,3.6875 l 0,2.625 C 5.866615,6.7319486 6.399152,7 7,7 7.600847,7 8.133385,6.7319486 8.5,6.3125 l 0,-2.625 C 8.133385,3.2680514 7.600847,3 7,3 z"
+     id="prison" />
+</svg>
diff --git a/symbols/pub.16.svg b/symbols/pub.16.svg
deleted file mode 100644
index f71a431..0000000
--- a/symbols/pub.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 3,2 2,12 6,0 2,-12 z m 1.25,1 7.5,0 -0.33,2 -6.86,0 z" />
-</svg>
diff --git a/symbols/pub.svg b/symbols/pub.svg
new file mode 100644
index 0000000..477cd14
--- /dev/null
+++ b/symbols/pub.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 2,1 2,12 6,0 2,-12 z m 1.25,1 7.5,0 -0.33,2 -6.86,0 z"
+     id="pub"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/symbols/recycling.16.svg b/symbols/recycling.16.svg
deleted file mode 100644
index de9cec4..0000000
--- a/symbols/recycling.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 6.1111131,9.690628 4.5133516,6.804047 1.3,6.804047 2.6062101,7.5880837 1.7986781,9.0311016 C 1.7298071,9.1619607 1.6953738,9.2986132 1.6953767,9.4410632 1.6953738,9.583519 1.7298067,9.720173 1.7986781,9.851023 l 1.2710773,2.298282 c 0.057331,-0.166376 0.1146592,-0.309011 0.171995,-0.427902 L 4.8227305,8.9065915 6.1111131,9.690628 z m -2.3879902,2.316224 c -0.091944,0.154416 -0.1379139,0.320611 -0.1379099,0.498585 -4e-6,0.273307 0.094563,0.504931 0.2836852,0.694868 0.189119,0.18 [...]
-</svg>
diff --git a/symbols/recycling.svg b/symbols/recycling.svg
new file mode 100644
index 0000000..5942a14
--- /dev/null
+++ b/symbols/recycling.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 5.111113,8.690628 3.513352,5.804047 0.3,5.804047 1.60621,6.5880837 0.798678,8.031102 c -0.06887,0.130859 -0.103304,0.267511 -0.103301,0.409961 -3e-6,0.142456 0.03443,0.27911 0.103301,0.40996 l 1.271077,2.298282 c 0.05733,-0.166376 0.11466,-0.309011 0.171995,-0.427902 L 3.82273,7.906591 5.111113,8.690628 z m -2.38799,2.316224 c -0.09194,0.154416 -0.137914,0.320611 -0.13791,0.498585 -4e-6,0.273307 0.09456,0.504931 0.283685,0.694868 0.189119,0.189939 0.415298,0.284906 0.678537,0.2 [...]
+     id="recycling" />
+</svg>
diff --git a/symbols/rental_bicycle.16.svg b/symbols/rental_bicycle.16.svg
deleted file mode 100644
index 72497aa..0000000
--- a/symbols/rental_bicycle.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 4.5,1 C 3.1192881,1 2,2.1192881 2,3.5 2,4.8807119 3.1192881,6 4.5,6 5.4253425,6 6.2239846,5.4972377 6.65625,4.75 L 8,4.75 l 1,-1 1,1 1,-1 1,1 0.5,0 L 14,3.5 12.5,2.25 6.65625,2.25 C 6.2239846,1.5027623 5.4253425,1 4.5,1 z m -1,2 C 3.7761424,3 4,3.2238576 4,3.5 4,3.7761424 3.7761424,4 3.5,4 3.2238576,4 3,3.7761424 3,3.5 3,3.2238576 3.2238576,3 3.5,3 z m 5.5,3.4375 0.03125,1 L 10,8 10,9 6.25,9 6,9 6,8 6.5,8 c 1,0 1,-1 0,-1 l -2,0 c -1,0 -1,1 0,1 L 5,8 5,9 4.4375,10.375 c -0.04165 [...]
-</svg>
diff --git a/symbols/rental_bicycle.svg b/symbols/rental_bicycle.svg
new file mode 100644
index 0000000..a0b6218
--- /dev/null
+++ b/symbols/rental_bicycle.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 3.5,0 C 2.119288,0 1,1.1192881 1,2.5 1,3.8807119 2.119288,5 3.5,5 4.425342,5 5.223985,4.4972377 5.65625,3.75 L 7,3.75 l 1,-1 1,1 1,-1 1,1 0.5,0 L 13,2.5 11.5,1.25 5.65625,1.25 C 5.223985,0.5027623 4.425342,0 3.5,0 z m -1,2 C 2.776142,2 3,2.2238576 3,2.5 3,2.7761424 2.776142,3 2.5,3 2.223858,3 2,2.7761424 2,2.5 2,2.2238576 2.223858,2 2.5,2 z m 5.5,3.4375 0.03125,1 L 9,7 9,8 5.25,8 5,8 5,7 5.5,7 c 1,0 1,-1 0,-1 l -2,0 c -1,0 -1,1 0,1 L 4,7 4,8 3.4375,9.375 c -0.04165,-0.0023 -0.0 [...]
+     id="rental-bicycle" />
+</svg>
diff --git a/symbols/rental_car.16.svg b/symbols/rental_car.16.svg
deleted file mode 100644
index 5e8d37c..0000000
--- a/symbols/rental_car.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 4.5,1 C 3.1192881,1 2,2.1192881 2,3.5 2,4.8807119 3.1192881,6 4.5,6 5.4253425,6 6.2239846,5.4972377 6.65625,4.75 L 8,4.75 l 1,-1 1,1 1,-1 1,1 0.5,0 L 14,3.5 12.5,2.25 6.65625,2.25 C 6.2239846,1.5027623 5.4253425,1 4.5,1 z m -1,2 C 3.7761424,3 4,3.2238576 4,3.5 4,3.7761424 3.7761424,4 3.5,4 3.2238576,4 3,3.7761424 3,3.5 3,3.2238576 3.2238576,3 3.5,3 z M 5,7 4,10 c -0.4726661,0 -1,0.384295 -1,1 l 0,3 1,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 4,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 1,0 0,-3 c 0 [...]
-</svg>
diff --git a/symbols/rental_car.svg b/symbols/rental_car.svg
new file mode 100644
index 0000000..8462ea5
--- /dev/null
+++ b/symbols/rental_car.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 3.5,0 C 2.119288,0 1,1.1192881 1,2.5 1,3.8807119 2.119288,5 3.5,5 4.425342,5 5.223985,4.4972377 5.65625,3.75 L 7,3.75 l 1,-1 1,1 1,-1 1,1 0.5,0 L 13,2.5 11.5,1.25 5.65625,1.25 C 5.223985,0.5027623 4.425342,0 3.5,0 z m -1,2 C 2.776142,2 3,2.2238576 3,2.5 3,2.7761424 2.776142,3 2.5,3 2.223858,3 2,2.7761424 2,2.5 2,2.2238576 2.223858,2 2.5,2 z M 4,6 3,9 C 2.527334,9 2,9.384295 2,10 l 0,3 1,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 4,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 1,0 0,-3 C 12,9.479394 11. [...]
+     id="rental-car" />
+</svg>
diff --git a/symbols/restaurant.16.svg b/symbols/restaurant.16.svg
deleted file mode 100644
index 816134d..0000000
--- a/symbols/restaurant.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 5,1 C 4,1 2,3 2,6 c 0,3 2.25,4 2.25,4 l -0.5,5 2.5,0 -0.5,-5 C 5.75,10 8,9 8,6 8,3 6,1 5,1 z M 9,1.75 9,8 c 0,1 1.75,1 1.75,2 l -0.5,5 2.5,0 -0.5,-5 C 12.25,9 14,9 14,8 l 0,-6.25 c 0,-1 -1,-1 -1,0 L 13,7 c 0,0.5632885 -1,0.5632884 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 L 11,7 c 0,0.5273339 -1,0.5273339 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 z" />
-</svg>
diff --git a/symbols/restaurant.svg b/symbols/restaurant.svg
new file mode 100644
index 0000000..16fe163
--- /dev/null
+++ b/symbols/restaurant.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 4,0 C 3,0 1,2 1,5 1,8 3.25,9 3.25,9 l -0.5,5 2.5,0 -0.5,-5 C 4.75,9 7,8 7,5 7,2 5,0 4,0 z M 8,0.75 8,7 c 0,1 1.75,1 1.75,2 l -0.5,5 2.5,0 -0.5,-5 C 11.25,8 13,8 13,7 l 0,-6.25 c 0,-1 -1,-1 -1,0 L 12,6 c 0,0.5632885 -1,0.5632884 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 L 10,6 C 10,6.5273339 9,6.5273339 9,6 L 9,0.75 c 0,-1 -1,-1 -1,0 z"
+     id="restaurant" />
+</svg>
diff --git a/symbols/saddle.svg b/symbols/saddle.svg
index ac6c356..37f4aea 100644
--- a/symbols/saddle.svg
+++ b/symbols/saddle.svg
@@ -4,5 +4,12 @@
    version="1.1"
    width="8"
    height="8">
+  <rect
+     width="8"
+     height="8"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
 	<path d="M 0,3 0,8 8,8 8,3 4,5 z" />
 </svg>
diff --git a/symbols/scrub.png b/symbols/scrub.png
index b43233a..c821898 100644
Binary files a/symbols/scrub.png and b/symbols/scrub.png differ
diff --git a/symbols/shelter-14.svg b/symbols/shelter.svg
similarity index 91%
rename from symbols/shelter-14.svg
rename to symbols/shelter.svg
index 7abe838..0f5e446 100644
--- a/symbols/shelter-14.svg
+++ b/symbols/shelter.svg
@@ -6,8 +6,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <defs
@@ -24,6 +24,13 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
   <path
      id="rect4777"
      d="M 4.0078125 0 L 3.0078125 2 L 3.4765625 2 L 4.5234375 0 L 4.0078125 0 z M 8.0078125 0 L 7.0078125 2 L 7.4765625 2 L 8.5234375 0 L 8.0078125 0 z M 12.007812 0 L 11.007812 2 L 11.476562 2 L 12.523438 0 L 12.007812 0 z M 1 2 L 0 4 L 0.46875 4 L 1.5175781 2 L 1 2 z M 5.0078125 2 L 4.0078125 4 L 4.4765625 4 L 5.5234375 2 L 5.0078125 2 z M 9.0078125 2 L 8.0078125 4 L 8.4765625 4 L 9.5234375 2 L 9.0078125 2 z M 13.007812 2 L 12.007812 4 L 12.476562 4 L 13.523438 2 L 13.007812 2 z M 2.5  [...]
diff --git a/symbols/shintoist.16.svg b/symbols/shintoist.16.svg
deleted file mode 100644
index c2ac884..0000000
--- a/symbols/shintoist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 1,1 c 0,1 0.6545446,1.654855 1,2 0.3454553,0.345145 0.8426782,0.2121799 0.8426782,0.4724826 0,0 0.1573217,0.5275173 0.6573217,0.5275173 l 1.2500001,0 c 0,0.2876366 0.2500001,0.5 0.2500001,0.5 0,0 -0.2500001,0.1404543 -0.2500001,0.5000002 l -1.2500001,0 c -0.5,0 -0.5,0.2499999 -0.5,0.5 0,0.5273339 0,0.9999999 0,0.9999999 0,0.2396973 0.2311002,0.5 0.5,0.5 0.2689,0 1.2500003,0 1.2500001,0 l 0,1 -0.7499999,0 c 0,0.4060258 0.2706055,0.7315864 0.7499999,0.9999999 0,0.3163531 0,5.5000 [...]
-</svg>
diff --git a/symbols/shintoist.svg b/symbols/shintoist.svg
new file mode 100644
index 0000000..77b2d0f
--- /dev/null
+++ b/symbols/shintoist.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 0,0 c 0,1 0.654545,1.639242 1,1.984387 0.345455,0.345145 0.842678,0.2121799 0.842678,0.4724826 0,0 0.157322,0.5275173 0.657322,0.5275173 l 1.25,0 c 0,0.2876366 0.25,0.5 0.25,0.5 0,0 -0.25,0.1404543 -0.25,0.5000002 l -1.25,0 c -0.5,0 -0.5,0.2499999 -0.5,0.5 0,0.5273339 0,0.9999999 0,0.9999999 0,0.2396973 0.2311,0.5 0.5,0.5 0.2689,0 1.25,0 1.25,0 l 0,1 -0.75,0 c 0,0.406026 0.270606,0.731586 0.75,1 0,0.316353 0,5.5 0,5.5 0,0.658649 1.5,0.715727 1.5,0 l 0,-7.5 3.5,0 0,7.5 c 0,0.691 [...]
+     id="shintoist" />
+</svg>
diff --git a/symbols/shop_alcohol.16.svg b/symbols/shop/alcohol.svg
similarity index 80%
rename from symbols/shop_alcohol.16.svg
rename to symbols/shop/alcohol.svg
index 7a9f698..306d183 100644
--- a/symbols/shop_alcohol.16.svg
+++ b/symbols/shop/alcohol.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 3,0 C 2,0 2,0.4670568 2,1 L 2,3 C 2,4 0,4 0,6 l 0,7 c 0,0.566252 0.467057,1 1,1 l 4,0 c 0.599561,0 1,-0.400439 1,-1 L 6,6 C 6,4 4,4 4,3 L 4,1 C 4,0.4337479 4,0 3,0 z m 4,5 c 0,3 0.47106,5 3,5 l 0,2 c 0,0.666911 -1,1 -1.5,1 -1,0 -1.5,0 -1.5,1 l 7,0 C 14,13 13.5,13 12.5,13 12,13 11,12.633602 11,12 l 0,-2 c 2.47106,0 3,-2 3,-5 L 7,5 z" id="alcohol" style="fill:#000000;fill-opacity:1;stroke:none" transform="translate(1,1)"/>
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 3,0 C 2,0 2,0.4670568 2,1 L 2,3 C 2,4 0,4 0,6 l 0,7 c 0,0.566252 0.467057,1 1,1 l 4,0 c 0.599561,0 1,-0.400439 1,-1 L 6,6 C 6,4 4,4 4,3 L 4,1 C 4,0.4337479 4,0 3,0 z m 4,5 c 0,3 0.47106,5 3,5 l 0,2 c 0,0.666911 -1,1 -1.5,1 -1,0 -1.5,0 -1.5,1 l 7,0 C 14,13 13.5,13 12.5,13 12,13 11,12.633602 11,12 l 0,-2 c 2.47106,0 3,-2 3,-5 L 7,5 z" id="alcohol" style="fill:#000000;fill-opacity:1;stroke:none" />
 </svg>
diff --git a/symbols/art-14.svg b/symbols/shop/art.svg
similarity index 95%
rename from symbols/art-14.svg
rename to symbols/shop/art.svg
index 310a13a..915f842 100644
--- a/symbols/art-14.svg
+++ b/symbols/shop/art.svg
@@ -32,6 +32,7 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
   <path
      d="M 7,-9.9999999e-8 C 3.134444,-9.9999999e-8 0,3.1344439 0,7 c 0,3.865556 3.134444,7 7,7 0.645556,0 1.1660156,-0.520461 1.1660156,-1.166016 0,-0.303333 -0.1121788,-0.577093 -0.3027344,-0.783203 -0.1827769,-0.206111 -0.2910156,-0.473992 -0.2910156,-0.773437 0,-0.645556 0.5204596,-1.166016 1.1660156,-1.166016 l 1.3730468,0 C 12.257994,10.111328 14,8.369323 14,6.222656 c 0,-3.4377778 -3.134445,-6.2226561 -7,-6.2226561 z M 8.9335938,1.3046874 A 1.3891786,1.3891786 0 0 1 10.322266,2.693 [...]
      id="path4" />
diff --git a/symbols/bag-14.svg b/symbols/shop/bag.svg
similarity index 97%
rename from symbols/bag-14.svg
rename to symbols/shop/bag.svg
index 9b05c7d..6a836f6 100644
--- a/symbols/bag-14.svg
+++ b/symbols/shop/bag.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
diff --git a/symbols/shop/bakery.svg b/symbols/shop/bakery.svg
new file mode 100644
index 0000000..9197717
--- /dev/null
+++ b/symbols/shop/bakery.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 6.75,3 8.25,7 6.75,7 5.25,3 C 5.25,3 3.494833,3 3.5,3 L 5,7 3.5,7 2.176907,3.5762712 C 1.291044,4.2640693 0,6.1983848 0,8 l 0,2 c 0,0.59322 0.423729,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 14,8 C 14,5.5355945 12.272623,3.5853602 10,3 L 11.5,7 10,7 8.5,3 c 0,0 -1.743955,0 -1.75,0 z"
+     id="bakery" />
+</svg>
diff --git a/symbols/beauty-14.svg b/symbols/shop/beauty.svg
similarity index 98%
rename from symbols/beauty-14.svg
rename to symbols/shop/beauty.svg
index 3748dac..174e5f0 100644
--- a/symbols/beauty-14.svg
+++ b/symbols/shop/beauty.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <defs
diff --git a/symbols/post_office-14.svg b/symbols/shop/beverages.svg
similarity index 65%
copy from symbols/post_office-14.svg
copy to symbols/shop/beverages.svg
index 82268ef..dfbb9ae 100644
--- a/symbols/post_office-14.svg
+++ b/symbols/shop/beverages.svg
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
+   id="svg2"
    viewBox="0 0 14 14"
-   id="svg2">
+   height="14"
+   width="14"
+   version="1.1">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -27,14 +25,14 @@
   <defs
      id="defs6" />
   <rect
-     width="14"
-     height="14"
-     x="0"
-     y="0"
+     style="fill:none;stroke:none;visibility:hidden"
      id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
   <path
-     d="m 0,2 0,1 7,4 7,-4 0,-1 z m 0,3 0,7 14,0 0,-7 -7,4 z"
-     id="post-office"
+     id="beverages"
+     d="M 3,0 C 2,0 2,0.50227551 2,2 2,3 0,7 0,8 l 0,5 c 0,0.566252 0.467057,1 1,1 l 4,0 c 0.599561,0 1,-0.400439 1,-1 L 6,8 C 6,7 4,3 4,2 4,0.46896661 4,0 3,0 z m 7.875,1 -1,4 L 11,5 11.75,2 14,2 14,1 z M 7,6 8,13 c 0,0 0,1 1,1 l 2,0 c 1,0 1,-1 1,-1 l 1,-7 z"
      style="fill:#000000;fill-opacity:1;stroke:none" />
 </svg>
diff --git a/symbols/shop/bicycle.svg b/symbols/shop/bicycle.svg
new file mode 100644
index 0000000..85c06fb
--- /dev/null
+++ b/symbols/shop/bicycle.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 8,1.5 8,2.375 9.25,3.15625 9.25,4.25 5,4.25 5,3.5 l 0.5,0 c 1,0 1,-1 0,-1 l -2,0 c -1,0 -1,1 0,1 L 4,3.5 4,4.25 3.0625,6 C 3.0416,5.9995343 3.02098,6 3,6 1.387717,6 0,7.3877166 0,9 0,10.612283 1.387717,12 3,12 4.612283,12 6,10.612283 6,9 6,8.654031 5.92843,8.313419 5.8125,8 L 6.25,8 C 7,8 7.172746,7.546004 7.4375,7.28125 L 9.21875,5.25 9.75,6.28125 C 8.727462,6.7659158 8,7.824875 8,9 c 0,1.612283 1.387717,3 3,3 1.612283,0 3,-1.387717 3,-3 C 14,7.3877166 12.612283,6 11,6 10.9685 [...]
+     id="bicycle" />
+</svg>
diff --git a/symbols/shop_butcher.png b/symbols/shop/butcher.png
similarity index 100%
rename from symbols/shop_butcher.png
rename to symbols/shop/butcher.png
diff --git a/symbols/shop/car.svg b/symbols/shop/car.svg
new file mode 100644
index 0000000..201f5fa
--- /dev/null
+++ b/symbols/shop/car.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg2"
+   viewBox="0 1 14 14"
+   height="14"
+   width="14">
+  <metadata
+     id="metadata15">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs13" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     style="fill-rule:evenodd"
+     d="M 0,10.5 A 1.5,1.5 0 0 0 1.5,12 l 11,0 A 1.5,1.5 0 0 0 14,10.5 l 0,-3 A 1.5,1.5 0 0 0 12.5,6 L 1.5,6 A 1.5,1.5 0 0 0 0,7.5 Z m 1.6,-2 a 0.9,0.9 0 1 1 0,0.01 z m 9,0 a 0.9,0.9 0 1 1 0,0.01 z"
+     id="body" />
+  <g
+     transform="translate(0,1)"
+     id="tyres">
+    <rect
+       id="rect6"
+       height="3"
+       width="2"
+       y="10"
+       x="1" />
+    <rect
+       id="rect8"
+       height="3"
+       width="2"
+       y="10"
+       x="11" />
+  </g>
+  <path
+     d="M 2,6 2,3.5 A 1.5,1.5 0 0 1 3.5,2 l 7,0 A 1.5,1.5 0 0 1 12,3.5 l 0,2.5 -1.5,0 0,-1.5 a 1,1 0 0 0 -1,-1 l -5,0 a 1,1 0 0 0 -1,1 l 0,1.5 z"
+     id="top" />
+</svg>
diff --git a/symbols/car_parts-14.svg b/symbols/shop/car_parts.svg
similarity index 97%
rename from symbols/car_parts-14.svg
rename to symbols/shop/car_parts.svg
index 8700140..04b1219 100644
--- a/symbols/car_parts-14.svg
+++ b/symbols/shop/car_parts.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <defs
diff --git a/symbols/shop/car_repair.svg b/symbols/shop/car_repair.svg
new file mode 100644
index 0000000..582b31d
--- /dev/null
+++ b/symbols/shop/car_repair.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 10.499796,0 C 9.5744741,0 8.7758482,0.502762 8.3435925,1.25 l -5.8436247,0 C 1.6222327,1.25 1,1.7711864 1,2.5 1,3.2288136 1.6034191,3.75 2.4999678,3.75 l 5.8436247,0 C 8.7758482,4.4972377 9.5744741,5 10.499796,5 11.425119,5 12.223744,4.4972377 12.656,3.75 l -1.656214,0 L 9.4998177,2.5 10.999786,1.25 12.656,1.25 C 12.223744,0.5027623 11.425119,0 10.499796,0 z M 2.4999678,2 C 2.7761039,2 2.9999571,2.2238576 2.9999571,2.5 2.9999571,2.7761424 2.7761039,3 2.4999678,3 2.2238318,3 1.9 [...]
+     id="repair-car" />
+</svg>
diff --git a/symbols/chemist-14.svg b/symbols/shop/chemist.svg
similarity index 98%
rename from symbols/chemist-14.svg
rename to symbols/shop/chemist.svg
index ecec082..ec278d2 100644
--- a/symbols/chemist-14.svg
+++ b/symbols/shop/chemist.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <defs
diff --git a/symbols/shop_clothes.16.svg b/symbols/shop/clothes.svg
similarity index 66%
rename from symbols/shop_clothes.16.svg
rename to symbols/shop/clothes.svg
index 62d2cce..42f2bbe 100644
--- a/symbols/shop_clothes.16.svg
+++ b/symbols/shop/clothes.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 3,1 0,3 1,6.35 3,5 3,13 11,13 11,5 13,6.35 14,3 11,1 9,1 C 9,2 8,3 7,3 6,3 5,2 5,1 z" id="clothes" style="fill:#000000;fill-opacity:1;stroke:none" transform="translate(1,1)"/>
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 3,1 0,3 1,6.35 3,5 3,13 11,13 11,5 13,6.35 14,3 11,1 9,1 C 9,2 8,3 7,3 6,3 5,2 5,1 z" id="clothes" />
 </svg>
diff --git a/symbols/tobacco-14.svg b/symbols/shop/computer.svg
similarity index 51%
rename from symbols/tobacco-14.svg
rename to symbols/shop/computer.svg
index 72454af..114c508 100644
--- a/symbols/tobacco-14.svg
+++ b/symbols/shop/computer.svg
@@ -17,7 +17,14 @@
      id="metadata13"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs11" /><path
-     d="m 2,11 1,0 0,3 -1,0 z M 1,10 C 1.6666667,9 3,8 3,7 3,6 0,5 0,3 0,1 2,1 4,0 3.6666667,1.3333333 2,2 2,3 3,4 5,5 5,7 5,9 4,9 1,10 Z m -1,1 1,0 0,3 -1,0 z m 14,3 -10,0 0,-3 10,0 z"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
-     id="path3357-4" /></svg>
\ No newline at end of file
+     id="defs11" />
+  <rect
+     style="fill:none;stroke:none;visibility:hidden"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     d="M 3 1 C 2.5154074 1 2 1.5166276 2 2 L 2 8 C 2 8.4833725 2.5166276 9 3 9 L 11 9 C 11.483372 9 12 8.4833725 12 8 L 12 2 C 12 1.5166127 11.483372 1 11 1 L 3 1 z M 3 2 L 11 2 L 11 8 L 3 8 L 3 2 z M 2 10 C 1.7492735 10 1.6780977 10.147712 1.5527344 10.398438 L 0.46484375 13.529297 C 0.27854468 13.779151 0.74927346 14 1 14 L 13 14 C 13.250727 14 13.619365 13.749684 13.535156 13.529297 L 12.416016 10.367188 C 12.290653 10.147801 12.250727 10 12 10 L 2 10 z "
+     id="path4142" /></svg>
diff --git a/symbols/confectionery-14.svg b/symbols/shop/confectionery.svg
similarity index 90%
rename from symbols/confectionery-14.svg
rename to symbols/shop/confectionery.svg
index f3faa9f..7da0e24 100644
--- a/symbols/confectionery-14.svg
+++ b/symbols/shop/confectionery.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <defs
@@ -26,6 +26,13 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <rect
+     style="fill:none;stroke:none;visibility:hidden"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
   <path
      d="M 0.40106652,7 C 0.38814368,6 2,4 4,4 5,4.0319271 6,5.5872292 7,5.5393387 8,5.6564044 9,3.9946789 10,4 12,4 13.571453,6 13.574494,7 13.265866,7 12.839985,7 12.531357,7 12,6 11,5.4873703 10,5.4455611 9,5.5519845 8,7.0053211 7,7 6,7.0266058 5,5.6085387 4,5.5393635 3,5.5119975 2,6 1.5793983,7 1.2335222,7 0.7469426,7 0.40106652,7 z M 9,2 C 9,3.1045695 8.1045695,4 7,4 5.8954305,4 5,3.1045695 5,2 5,0.8954305 5.8954305,0 7,0 7.9169484,0 8.7164405,0.62354577 8.939772,1.5128812 M 3,13 1,8 [...]
      id="path2986"
diff --git a/symbols/shop/convenience.svg b/symbols/shop/convenience.svg
new file mode 100644
index 0000000..918a9e1
--- /dev/null
+++ b/symbols/shop/convenience.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14">
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     transform="translate(0,1)"
+     id="hbars">
+    <rect
+       id="rect5"
+       height="0.5"
+       width="11"
+       y="6"
+       x="1" />
+    <rect
+       id="rect7"
+       height="0.5"
+       width="9.5"
+       y="8"
+       x="2" />
+  </g>
+  <g
+     transform="translate(0,1)"
+     id="vbars">
+    <rect
+       id="rect10"
+       height="5.5"
+       width="0.5"
+       y="4.5"
+       x="3" />
+    <rect
+       id="rect12"
+       height="5.5"
+       width="0.5"
+       y="4.5"
+       x="5" />
+    <rect
+       id="rect14"
+       height="5.5"
+       width="0.5"
+       y="4.5"
+       x="7.5" />
+    <rect
+       id="rect16"
+       height="5.5"
+       width="0.5"
+       y="4.5"
+       x="9.5" />
+  </g>
+  <path
+     d="m 5.9,5 2,-3 A 0.50618672,0.50618672 0 0 1 8.83,2.4 L 7.1,5 Z"
+     id="handle" />
+  <path
+     style="fill-rule:evenodd"
+     d="m 0,5 13,0 -2,7 -9,0 z m 1.25,1 10.5,0 -1.5,5 -7.5,0 z"
+     id="body" />
+</svg>
diff --git a/symbols/copyshop-14.svg b/symbols/shop/copyshop.svg
similarity index 97%
copy from symbols/copyshop-14.svg
copy to symbols/shop/copyshop.svg
index e45a608..33f8313 100644
--- a/symbols/copyshop-14.svg
+++ b/symbols/shop/copyshop.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
diff --git a/symbols/deli-14.svg b/symbols/shop/deli.svg
similarity index 92%
rename from symbols/deli-14.svg
rename to symbols/shop/deli.svg
index 467b036..57da28d 100644
--- a/symbols/deli-14.svg
+++ b/symbols/shop/deli.svg
@@ -32,6 +32,13 @@
       </cc:License>
     </rdf:RDF>
   </metadata>
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
   <path
      d="M 5.9999999,0 8,0 c 2,0 3,0 3,1.0000001 l 0,1 -8.0000003,0 0,-1 C 2.9999997,-4.0395351e-8 3.9999998,0 5.9999999,0 Z M 4,3 c -10e-8,1.9999997 -1.5124998,1.0000396 -1.5,3 l 0.03125,5 C 2.5374999,11.999981 3.0000004,14 5,14 l 4,0 c 2,0 2.5,-2 2.5,-3 l 0,-5 C 11.5,4.0000006 10,4.9999997 10,3 L 4,3 Z m 3,4 c 1.0424134,0 3.126953,0.6074219 3.126953,0.6074219 l 0,1.3925781 0,1.392578 C 10.126953,10.392578 8.0424135,11 7,11 5.9575867,11 3.8730469,10.392578 3.8730469,10.392578 l 0,-1.3925 [...]
      style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
diff --git a/symbols/shop/department_store.svg b/symbols/shop/department_store.svg
new file mode 100644
index 0000000..38bec3e
--- /dev/null
+++ b/symbols/shop/department_store.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2"
+   version="1.1">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     id="rect3477"
+     d="M 7.0664063,0 C 6.4300663,0 5.7941523,0.16062188 5.2226563,0.48242188 4.1024903,1.1133219 3.3931204,2.2802344 3.3652344,3.5527344 l -1.8671875,0 L 1,12.972656 1,14 13.064453,14 12.511719,3.5527344 l -1.744141,0 C 10.739678,2.2802344 10.030331,1.1133219 8.9101563,0.48242188 8.3386613,0.16062187 7.7027473,0 7.0664063,0 Z m 0,1.5273438 c 0.378661,0 0.7576841,0.094956 1.0957031,0.2851562 0.652423,0.3675 1.050958,1.0240344 1.078125,1.7402344 l -4.3476563,0 C 4.9196981,2.8365344 5.3182 [...]
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+</svg>
diff --git a/symbols/copyshop-14.svg b/symbols/shop/diy.svg
similarity index 54%
copy from symbols/copyshop-14.svg
copy to symbols/shop/diy.svg
index e45a608..7451387 100644
--- a/symbols/copyshop-14.svg
+++ b/symbols/shop/diy.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
@@ -34,7 +34,6 @@
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
-     d="M 9.03125,-0.03125 1,0 1,10 4,10 4,9 2,9 2,1 l 6,0 0,2 1.03125,0 0,-3.03125 z M 3,2 3,2.5 7,2.5 7,2 3,2 z M 3,3 3,3.5 4,3.5 4,3 3,3 z M 3,4 3,4.5 4,4.5 4,4 3,4 z M 5,4 5,14 13,14 13,7.28125 9.71875,4 5,4 z M 3,5 3,5.5 4,5.5 4,5 3,5 z m 3,0 3,0 0,3 3,0 0,5 -6,0 0,-8 z M 10,5.6875 11.3125,7 10,7 10,5.6875 z M 3,6 3,6.5 4,6.5 4,6 3,6 z M 7,6 7,6.5 8,6.5 8,6 7,6 z M 3,7 3,7.5 4,7.5 4,7 3,7 z M 7,7 7,7.5 8,7.5 8,7 7,7 z M 7,8 7,8.5 8,8.5 8,8 7,8 z m 0,1 0,0.5 4,0 L 11,9 7,9 z m 0,1 0, [...]
-     id="copyshop"
-     style="fill:#000000;fill-opacity:1" />
+     d="M 9,0 C 8.248808,0.4909181 7.75,1.3481516 7.75,2.3125 c 0,1.0641992 0.615654,1.9803063 1.5,2.4375 l 0,7.75 c 0,0.877754 0.521186,1.5 1.25,1.5 0.728813,0 1.25,-0.603432 1.25,-1.5 l 0,-7.75 C 12.634346,4.2928063 13.25,3.3766992 13.25,2.3125 13.25,1.3481516 12.751192,0.4909181 12,0 L 12,1.5 10.5,3 9,1.5 C 9,1.5 9,-0.0023227 9,0 z M 4,0 C 3.447507,0 3,0.3804513 3,0.75 l -1.5,0 -1.25,1.75 1.25,1.75 1.5,0 0,8.5 C 3,13.434896 3.376848,14 4,14 4.623152,14 5,13.471763 5,12.75 l 0,-8.5 2,0 [...]
+     id="doityourself" />
 </svg>
diff --git a/symbols/shop_electronics.16.svg b/symbols/shop/electronics.svg
similarity index 81%
rename from symbols/shop_electronics.16.svg
rename to symbols/shop/electronics.svg
index 3883f97..2b81103 100644
--- a/symbols/shop_electronics.16.svg
+++ b/symbols/shop/electronics.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 9.375,0.03125 C 9.228609,0.0143576 9.069653,0.0553473 8.9375,0.1875 L 6.03125,3.125 4.125,1.1875 C 3.913054,0.9017344 3.437513,0.8725487 3.1875,1.125 2.937487,1.3774513 2.966994,1.8484875 3.25,2.0625 L 5.15625,4 2,4 C 1,4 0,5 0,6 l 0,6 c 0,1 1,2 2,2 l 10,0 c 1,0 2,-1 2,-2 L 14,6 C 14,5 13,4 12,4 L 6.90625,4 9.8125,1.0625 C 10.20002,0.6749802 9.814172,0.0819271 9.375,0.03125 z M 6,6 c 3,0 4,0 4,3 0,3 -1,3 -4,3 C 3,12 2,12 2,9 2,6 3,6 6,6 z m 6,0.125 c 0.483249,0 0.875,0.39175 [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 9.375,0.03125 C 9.228609,0.0143576 9.069653,0.0553473 8.9375,0.1875 L 6.03125,3.125 4.125,1.1875 C 3.913054,0.9017344 3.437513,0.8725487 3.1875,1.125 2.937487,1.3774513 2.966994,1.8484875 3.25,2.0625 L 5.15625,4 2,4 C 1,4 0,5 0,6 l 0,6 c 0,1 1,2 2,2 l 10,0 c 1,0 2,-1 2,-2 L 14,6 C 14,5 13,4 12,4 L 6.90625,4 9.8125,1.0625 C 10.20002,0.6749802 9.814172,0.0819271 9.375,0.03125 z M 6,6 c 3,0 4,0 4,3 0,3 -1,3 -4,3 C 3,12 2,12 2,9 2,6 3,6 6,6 z m 6,0.125 c 0.483249,0 0.875,0.39175 [...]
 </svg>
diff --git a/symbols/florist.16.svg b/symbols/shop/florist.svg
similarity index 68%
rename from symbols/florist.16.svg
rename to symbols/shop/florist.svg
index 482542d..904a8d2 100644
--- a/symbols/florist.16.svg
+++ b/symbols/shop/florist.svg
@@ -8,9 +8,9 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
    id="svg2">
   <metadata
      id="metadata8">
@@ -27,14 +27,13 @@
   <defs
      id="defs6" />
   <rect
-     width="16"
-     height="16"
+     width="14"
+     height="14"
      x="0"
      y="0"
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
-     d="M 4,1 C 4.944406,3.8332196 3.233819,7.4334035 7.25,7.938 l 0,5.562 C 7.25,12.033993 4.997226,9 2,9 c 3,2 1,6 5,6 2,0 0,0 2,0 4,0 2,-4 5,-6 -2.997226,0 -5.25,2.944994 -5.25,4.5 l 0,-5.562 C 12.753428,7.4504075 11.055593,3.8332196 12,1 11,1 9.75,4 9.75,4 9.75,4 9,2 8,1 7,2 6.25,4 6.25,4 6.25,4 5,1 4,1 z"
-     id="florist"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+     d="M 3,0 C 3.944406,2.8332196 2.233819,6.4334035 6.25,6.938 l 0,5.562 C 6.25,11.033993 3.997226,8 1,8 c 3,2 1,6 5,6 2,0 0,0 2,0 4,0 2,-4 5,-6 -2.997226,0 -5.25,2.944994 -5.25,4.5 l 0,-5.562 C 11.753428,6.4504075 10.055593,2.8332196 11,0 10,0 8.75,3 8.75,3 8.75,3 8,1 7,0 6,1 5.25,3 5.25,3 5.25,3 4,0 3,0 z"
+     id="florist" />
 </svg>
diff --git a/symbols/shop_furniture.16.svg b/symbols/shop/furniture.svg
similarity index 78%
rename from symbols/shop_furniture.16.svg
rename to symbols/shop/furniture.svg
index 89835e7..4df5e08 100644
--- a/symbols/shop_furniture.16.svg
+++ b/symbols/shop/furniture.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 3,2 C 2,2 1,3 1,4 3,4 4,5.5760463 4,7 l 6,0 C 10,5.4818344 11,4 13,4 13,3 12,2 11,2 z M 1,5 C 0,5 0,6 0,6 0,6.5181656 0.481834,7 1,7 l 0,3 c 0,0.645252 0.423351,1 1,1 l 0.5,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 5,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 0.5,0 c 0.509491,0 1,-0.48425 1,-1 l 0,-3 c 0.494613,0 1,-0.3876224 1,-1 0,0 0,-1 -1,-1 -1,0 -2,1 -2,3 L 3,8 C 3,6 2,5 1,5 z" id="furniture" style="fill:#000000;fill-opacity:1;stroke:none" transform="translate(1,1)"/>
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 3,2 C 2,2 1,3 1,4 3,4 4,5.5760463 4,7 l 6,0 C 10,5.4818344 11,4 13,4 13,3 12,2 11,2 z M 1,5 C 0,5 0,6 0,6 0,6.5181656 0.481834,7 1,7 l 0,3 c 0,0.645252 0.423351,1 1,1 l 0.5,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 5,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 0.5,0 c 0.509491,0 1,-0.48425 1,-1 l 0,-3 c 0.494613,0 1,-0.3876224 1,-1 0,0 0,-1 -1,-1 -1,0 -2,1 -2,3 L 3,8 C 3,6 2,5 1,5 z" id="furniture" />
 </svg>
diff --git a/symbols/garden_centre-14.svg b/symbols/shop/garden_centre.svg
similarity index 97%
rename from symbols/garden_centre-14.svg
rename to symbols/shop/garden_centre.svg
index 3cae5d8..2ff5db8 100644
--- a/symbols/garden_centre-14.svg
+++ b/symbols/shop/garden_centre.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <defs
diff --git a/symbols/shop_gift.16.svg b/symbols/shop/gift.svg
similarity index 81%
rename from symbols/shop_gift.16.svg
rename to symbols/shop/gift.svg
index 094375a..8d1f2d4 100644
--- a/symbols/shop_gift.16.svg
+++ b/symbols/shop/gift.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 4.375,0.5 C 3.5,0.5 2.625,1.1125001 2.625,2.25 2.625,3.386625 3.144625,4 4.28125,4 l 2.5625,0 0.25,0 2.5625,0 C 10.792,4 11.375,3.4169999 11.375,2.28125 11.374125,1.14375 10.499999,0.5 9.625,0.5 8.2985,0.5 7.333375,1.3032501 7,2.46875 6.66575,1.3032501 5.730375,0.5 4.375,0.5 z m 0,0.875 c 1.416625,0 1.656375,1.120875 1.75,1.75 l -1.75,0 C 3.455375,3.125 3.5,2.287625 3.5,2.25 3.5,2.212375 3.45538,1.375 4.375,1.375 z m 5.25,0 c 0.874999,0 0.875,0.837375 0.875,0.875 0,0.037625  [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 4.375,0.5 C 3.5,0.5 2.625,1.1125001 2.625,2.25 2.625,3.386625 3.144625,4 4.28125,4 l 2.5625,0 0.25,0 2.5625,0 C 10.792,4 11.375,3.4169999 11.375,2.28125 11.374125,1.14375 10.499999,0.5 9.625,0.5 8.2985,0.5 7.333375,1.3032501 7,2.46875 6.66575,1.3032501 5.730375,0.5 4.375,0.5 z m 0,0.875 c 1.416625,0 1.656375,1.120875 1.75,1.75 l -1.75,0 C 3.455375,3.125 3.5,2.287625 3.5,2.25 3.5,2.212375 3.45538,1.375 4.375,1.375 z m 5.25,0 c 0.874999,0 0.875,0.837375 0.875,0.875 0,0.037625  [...]
 </svg>
diff --git a/symbols/greengrocer-14.svg b/symbols/shop/greengrocer.svg
similarity index 97%
rename from symbols/greengrocer-14.svg
rename to symbols/shop/greengrocer.svg
index fae3056..0bf5717 100644
--- a/symbols/greengrocer-14.svg
+++ b/symbols/shop/greengrocer.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
diff --git a/symbols/copyshop-14.svg b/symbols/shop/hairdresser.svg
similarity index 54%
rename from symbols/copyshop-14.svg
rename to symbols/shop/hairdresser.svg
index e45a608..b65c298 100644
--- a/symbols/copyshop-14.svg
+++ b/symbols/shop/hairdresser.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
@@ -34,7 +34,6 @@
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
-     d="M 9.03125,-0.03125 1,0 1,10 4,10 4,9 2,9 2,1 l 6,0 0,2 1.03125,0 0,-3.03125 z M 3,2 3,2.5 7,2.5 7,2 3,2 z M 3,3 3,3.5 4,3.5 4,3 3,3 z M 3,4 3,4.5 4,4.5 4,4 3,4 z M 5,4 5,14 13,14 13,7.28125 9.71875,4 5,4 z M 3,5 3,5.5 4,5.5 4,5 3,5 z m 3,0 3,0 0,3 3,0 0,5 -6,0 0,-8 z M 10,5.6875 11.3125,7 10,7 10,5.6875 z M 3,6 3,6.5 4,6.5 4,6 3,6 z M 7,6 7,6.5 8,6.5 8,6 7,6 z M 3,7 3,7.5 4,7.5 4,7 3,7 z M 7,7 7,7.5 8,7.5 8,7 7,7 z M 7,8 7,8.5 8,8.5 8,8 7,8 z m 0,1 0,0.5 4,0 L 11,9 7,9 z m 0,1 0, [...]
-     id="copyshop"
-     style="fill:#000000;fill-opacity:1" />
+     d="M 4,0 4,9.53125 C 3.580263,9.212414 3.064535,9 2.5,9 1.12521,9 0,10.12521 0,11.5 0,12.87479 1.12521,14 2.5,14 3.702941,14 4.703332,13.136374 4.9375,12 l 0.125,0 C 5.296668,13.136374 6.297059,14 7.5,14 8.87479,14 10,12.87479 10,11.5 10,10.12521 8.87479,9 7.5,9 6.935465,9 6.419737,9.212414 6,9.53125 L 6,0 z m 4,0 0,2 4,0 0,1 -4,0 0,1 4,0 0,1 -4,0 0,1 4,0 0,1 -4,0 0,1 4,0 0,6 2,0 0,-12 C 14,1 13,0 12,0 z M 2.5,10 C 3.334349,10 4,10.665651 4,11.5 4,12.334349 3.334349,13 2.5,13 1.6656 [...]
+     id="hairdresser" />
 </svg>
diff --git a/symbols/hifi-14.svg b/symbols/shop/hifi.svg
similarity index 97%
rename from symbols/hifi-14.svg
rename to symbols/shop/hifi.svg
index 21c9ce8..5a68474 100644
--- a/symbols/hifi-14.svg
+++ b/symbols/shop/hifi.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 14 14"
-   height="100%"
-   width="100%"
+   height="14"
+   width="14"
    version="1.1">
   <defs
      id="defs8" />
diff --git a/symbols/ice-cream-14.svg b/symbols/shop/ice_cream.svg
similarity index 97%
rename from symbols/ice-cream-14.svg
rename to symbols/shop/ice_cream.svg
index a1ad20e..c2bb714 100644
--- a/symbols/ice-cream-14.svg
+++ b/symbols/shop/ice_cream.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
diff --git a/symbols/shop_jewelry.16.svg b/symbols/shop/jewelry.svg
similarity index 81%
rename from symbols/shop_jewelry.16.svg
rename to symbols/shop/jewelry.svg
index b54a5ae..da61ecf 100644
--- a/symbols/shop_jewelry.16.svg
+++ b/symbols/shop/jewelry.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="m 5.5001761,-0.03125 -1.5000755,2 6.0003024,0 -1.500076,-2 -3.0001509,0 z m -1.5000755,3 3.000151,2.75 3.0001514,-2.75 -6.0003024,0 z m -0.1250063,2.125 C 2.7594552,6.0221898 2,7.4228958 2,8.96875 2,11.716935 4.3397727,14 6.969,14 9.598227,14 11.938,11.716935 11.938,8.96875 11.938,7.4345438 11.195755,6.0534671 10.094157,5.125 L 8.9691006,6.15625 c 0.9205844,0.6728387 1.5625784,1.7640005 1.5625784,2.8125 0,1.711475 -1.7320219,3.46875 -3.562679,3.46875 -1.8306571,0 -3.5314277,-1 [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="m 5.5001761,-0.03125 -1.5000755,2 6.0003024,0 -1.500076,-2 -3.0001509,0 z m -1.5000755,3 3.000151,2.75 3.0001514,-2.75 -6.0003024,0 z m -0.1250063,2.125 C 2.7594552,6.0221898 2,7.4228958 2,8.96875 2,11.716935 4.3397727,14 6.969,14 9.598227,14 11.938,11.716935 11.938,8.96875 11.938,7.4345438 11.195755,6.0534671 10.094157,5.125 L 8.9691006,6.15625 c 0.9205844,0.6728387 1.5625784,1.7640005 1.5625784,2.8125 0,1.711475 -1.7320219,3.46875 -3.562679,3.46875 -1.8306571,0 -3.5314277,-1 [...]
 </svg>
diff --git a/symbols/outdoor-14.svg b/symbols/shop/laundry.svg
similarity index 65%
copy from symbols/outdoor-14.svg
copy to symbols/shop/laundry.svg
index 37af74a..3cd3a2c 100644
--- a/symbols/outdoor-14.svg
+++ b/symbols/shop/laundry.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 14 14"
-   height="100%"
-   width="100%"
+   height="14"
+   width="14"
    version="1.1">
   <defs
      id="defs3053" />
@@ -32,7 +32,7 @@
      height="14"
      width="14" />
   <path
-     id="path4166"
-     d="M 5.5 1.015625 A 1.5 1.5 0 0 0 4 2.515625 A 1.5 1.5 0 0 0 5.5 4.015625 A 1.5 1.5 0 0 0 7 2.515625 A 1.5 1.5 0 0 0 5.5 1.015625 z M 10 2 L 8 3 L 11 9 L 13 8 L 10 2 z M 8 4 L 6 5 L 6.2949219 6.4707031 L 4 8 L 1 7 L 1 8 L 4 10 L 6.6464844 8.234375 L 7 10 L 10 9 L 8 4 z M 1 9 L 1 14 L 2 14 L 2 9 L 1 9 z M 10 10 L 7 11 L 5 14 L 6.8339844 14 L 8.3652344 12 L 9 14 L 11 14 L 10 10 z "
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1" />
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="path3051"
+     d="M 9.5,8.5 C 9.5,9.8807119 8.380712,11 7,11 5.619509,11 4.500312,9.8810564 4.5,8.5005654 M 1,0 1,14 13,14 13,0 1,0 Z M 3,1 8,1 8,3 3,3 3,1 Z m 7,0 2,0 0,2 -2,0 0,-2 z M 7,5 c 1.60466,0 3.01542,1.0999131 3.40625,2.65625 L 10.5,8.5 C 10.5,10.432997 8.932997,12 7,12 5.067003,12 3.5,10.432997 3.5,8.5 3.5,6.5670034 5.067003,5 7,5 Z" />
 </svg>
diff --git a/symbols/shop_mobile_phone.16.svg b/symbols/shop/mobile_phone.svg
similarity index 74%
rename from symbols/shop_mobile_phone.16.svg
rename to symbols/shop/mobile_phone.svg
index 2a7ad07..6f46910 100644
--- a/symbols/shop_mobile_phone.16.svg
+++ b/symbols/shop/mobile_phone.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 6,0 C 5.517164,0 5,0.3876224 5,1 L 5,2 C 3.8815,2.0818 3,2.90528 3,4 l 0,8 c 0,1.1488 0.803333,2 2,2 l 4,0 c 1.196667,0 2,-0.8512 2,-2 L 11,4 C 11,2.8512 10.196667,2 9,2 L 7,2 7,1 C 7,0.3640694 6.482836,0 6,0 z m -2,4 6,0 0,7 -6,0 0,-7 z m 2,8 2,0 0,1 -2,0 0,-1 z" id="mobile-phone" style="fill:#000000;fill-opacity:1" transform="translate(1,1)"/>
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 6,0 C 5.517164,0 5,0.3876224 5,1 L 5,2 C 3.8815,2.0818 3,2.90528 3,4 l 0,8 c 0,1.1488 0.803333,2 2,2 l 4,0 c 1.196667,0 2,-0.8512 2,-2 L 11,4 C 11,2.8512 10.196667,2 9,2 L 7,2 7,1 C 7,0.3640694 6.482836,0 6,0 z m -2,4 6,0 0,7 -6,0 0,-7 z m 2,8 2,0 0,1 -2,0 0,-1 z" id="mobile-phone" />
 </svg>
diff --git a/symbols/musical_instrument-14.svg b/symbols/shop/musical_instrument.svg
similarity index 88%
rename from symbols/musical_instrument-14.svg
rename to symbols/shop/musical_instrument.svg
index a912a20..e4ce363 100644
--- a/symbols/musical_instrument-14.svg
+++ b/symbols/shop/musical_instrument.svg
@@ -17,8 +17,16 @@
      id="metadata13"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs11" /><path
+     id="defs11" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
      d="m 11,6 c 1,0 2,1 2,2 l 0,2 c 0.0034,0.946601 -1,2 -2,2 L 6,12 C 5,12 4,11 4,10 L 4,8 C 4,7 5,6 6,6 L 7,6 C 5,7 5,7 5,9 5,9.558061 5.5149841,9.961494 6,10 l 5,0 c 0.605412,0 1,-0.441939 1,-1 0,-2 0,-2 -2,-3.0047349 z M 7,3 7,4.9882812 5,5 5,6 7,6 7,8 8,8 8,6 l 1,0 0,2 1,0 0,-2 3,0 c 0,1 1,1 1,1 l 0,-3 c 0,0 -1,4.76e-4 -1,0.953125 L 10,4.9707031 10,3 9,3 9,4.9765625 8,4.9824219 8,3 7,3 Z M 0,10 0,1 C 3,1 3,5 5,5 L 5,6 C 3,6 3,10 0,10 Z"
      style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
      id="path3389" />
-</svg>
\ No newline at end of file
+</svg>
diff --git a/symbols/outdoor-14.svg b/symbols/shop/newsagent.svg
similarity index 56%
copy from symbols/outdoor-14.svg
copy to symbols/shop/newsagent.svg
index 37af74a..dd624be 100644
--- a/symbols/outdoor-14.svg
+++ b/symbols/shop/newsagent.svg
@@ -7,11 +7,9 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 14 14"
-   height="100%"
-   width="100%"
+   height="14"
+   width="14"
    version="1.1">
-  <defs
-     id="defs3053" />
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -24,6 +22,8 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <defs
+     id="defs6" />
   <rect
      style="fill:none;stroke:none;visibility:hidden"
      id="canvas"
@@ -32,7 +32,7 @@
      height="14"
      width="14" />
   <path
-     id="path4166"
-     d="M 5.5 1.015625 A 1.5 1.5 0 0 0 4 2.515625 A 1.5 1.5 0 0 0 5.5 4.015625 A 1.5 1.5 0 0 0 7 2.515625 A 1.5 1.5 0 0 0 5.5 1.015625 z M 10 2 L 8 3 L 11 9 L 13 8 L 10 2 z M 8 4 L 6 5 L 6.2949219 6.4707031 L 4 8 L 1 7 L 1 8 L 4 10 L 6.6464844 8.234375 L 7 10 L 10 9 L 8 4 z M 1 9 L 1 14 L 2 14 L 2 9 L 1 9 z M 10 10 L 7 11 L 5 14 L 6.8339844 14 L 8.3652344 12 L 9 14 L 11 14 L 10 10 z "
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1" />
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     id="path3795-5-5"
+     d="m 7,11 4,0 0,0.536839 -4,0.02177 z m 0,-1 4,0 0,0.536839 -4,0.02177 z M 7,6 11,6 11,9 7,9 Z M 2,6 6,6.023451 6,6.5602898 2,6.5586098 Z m 0,5 4,0 0,0.536839 -4,0.02177 z m 0,-1 4,0 0,0.536839 -4,0.02177 z M 2,9 6,9.023451 6,9.5602901 2,9.5586101 Z M 2,8 6,8.023451 6,8.5602898 2,8.5586098 Z M 2,7 6,7 6,7.5368388 2,7.5586062 Z M 2,2 2,4.510373 11,4.5572742 11,2 Z M 0,0 c 0,1.5606474 0,8.9375328 0,11 0,2 0,0 0,3 l 10,0 3,0 0,-14 z m 1,1 11,0 0,12 -9,0 c -1.4082984,0 0,0 -2,0 z" />
 </svg>
diff --git a/symbols/shop_optician.16.svg b/symbols/shop/optician.svg
similarity index 74%
rename from symbols/shop_optician.16.svg
rename to symbols/shop/optician.svg
index d228759..c5c339b 100644
--- a/symbols/shop_optician.16.svg
+++ b/symbols/shop/optician.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 5,3 0,6 c 0,2 0.25,5 1.25,5 L 5,11 C 6,11 6.25,7.5 6.25,7.5 6.76702,7.25 7.23298,7.25 7.75,7.5 7.75,7.5 8,11 9,11 l 3.75,0 C 13.75,11 14,8 14,6 L 9,3 C 8.521411,2.7236864 8.12726,3.746123 9,4.25 L 12,6 2,6 5,4.25 C 5.922502,3.7173932 5.364967,2.789286 5,3 z m -3.75,4.25 3.75,0 -0.5,2.5 -2.75,0 z m 7.75,0 3.75,0 -0.5,2.5 -2.75,0 z" id="optician" style="fill:#000000;fill-opacity:1;stroke:none" transform="translate(1,1)"/>
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 5,3 0,6 c 0,2 0.25,5 1.25,5 L 5,11 C 6,11 6.25,7.5 6.25,7.5 6.76702,7.25 7.23298,7.25 7.75,7.5 7.75,7.5 8,11 9,11 l 3.75,0 C 13.75,11 14,8 14,6 L 9,3 C 8.521411,2.7236864 8.12726,3.746123 9,4.25 L 12,6 2,6 5,4.25 C 5.922502,3.7173932 5.364967,2.789286 5,3 z m -3.75,4.25 3.75,0 -0.5,2.5 -2.75,0 z m 7.75,0 3.75,0 -0.5,2.5 -2.75,0 z" id="optician" />
 </svg>
diff --git a/symbols/outdoor-14.svg b/symbols/shop/outdoor.svg
similarity index 97%
rename from symbols/outdoor-14.svg
rename to symbols/shop/outdoor.svg
index 37af74a..e18ccf4 100644
--- a/symbols/outdoor-14.svg
+++ b/symbols/shop/outdoor.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 14 14"
-   height="100%"
-   width="100%"
+   height="14"
+   width="14"
    version="1.1">
   <defs
      id="defs3053" />
diff --git a/symbols/perfumery-14.svg b/symbols/shop/perfumery.svg
similarity index 88%
rename from symbols/perfumery-14.svg
rename to symbols/shop/perfumery.svg
index 65ed073..a3f8897 100644
--- a/symbols/perfumery-14.svg
+++ b/symbols/shop/perfumery.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 14 14"
-   height="100%"
-   width="100%"
+   height="14"
+   width="14"
    version="1.1">
   <defs
      id="defs3053" />
@@ -24,6 +24,13 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
   <path
      id="perfumery"
      style="fill:#000000;fill-opacity:1;stroke:none"
diff --git a/symbols/shop/pet.svg b/symbols/shop/pet.svg
new file mode 100644
index 0000000..9c9a681
--- /dev/null
+++ b/symbols/shop/pet.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 9.412959,0.00215164 C 8.1693111,0.14587964 7.4631991,1.5093558 7.3733471,2.6936522 7.2264421,3.7464942 7.6860601,5.0899481 8.7918901,5.3320382 9.750208,5.4175142 10.512633,4.5171926 10.825819,3.6583651 11.195679,2.5833906 11.206482,1.147845 10.309038,0.34250684 10.059753,0.12647084 9.739671,-0.00476426 9.412959,0.00215164 z m -5.0729339,0.056367 c -1.034807,0.074858 -1.5652,1.27744256 -1.493223,2.24276386 0.0088,1.2907239 0.717612,2.7424122 2.010186,3.0488129 0.963956,0.1042448 [...]
+     id="pet" />
+</svg>
diff --git a/symbols/photo-14.svg b/symbols/shop/photo.svg
similarity index 91%
rename from symbols/photo-14.svg
rename to symbols/shop/photo.svg
index 3502120..41d7df5 100644
--- a/symbols/photo-14.svg
+++ b/symbols/shop/photo.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 14 14"
-   height="100%"
-   width="100%"
+   height="14"
+   width="14"
    version="1.1">
   <defs
      id="defs3053" />
@@ -24,6 +24,13 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
   <path
      d="M 1.8994152,3.9828765 C 0,4 0,4.1964912 8.78837e-4,5.9898537 L 0.015625,12.03284 C 0,14 0,14 1.9308491,14.034854 L 12.052666,13.998501 C 14,14 14,14 14.050419,11.981131 l -0.0013,-5.9842195 C 14,4 14,4 12.052028,3.9919077 Z M 8,5.015625 c 2.209139,1e-7 4,1.790861 4,4 0,2.209139 -1.790861,4 -4,4 -2.209139,0 -4,-1.790861 -4,-4 0,-2.209139 1.790861,-4 4,-4 z m -6.0163743,-3.0343384 1.0327485,-1e-7 C 4,2 4,3 4.0315789,3.4888892 L 1.0502924,3.5216379 C 1,3 1,2 1.9836257,1.9812866 Z m  [...]
      style="fill:#000000;fill-opacity:1;stroke:none"
diff --git a/symbols/seafood-14.svg b/symbols/shop/seafood.svg
similarity index 88%
rename from symbols/seafood-14.svg
rename to symbols/shop/seafood.svg
index dff1245..9f59aa8 100644
--- a/symbols/seafood-14.svg
+++ b/symbols/shop/seafood.svg
@@ -18,7 +18,14 @@
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs11" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
     <path
      d="M 6,3 C 3,3 0,5 0,7 0,9 3,11 6,11 8.2433092,10.977189 11,9 11,7 11,5 8,3 6,3 Z m 5,4 c 0,2 1.634385,3.274211 3,4 C 14,9 13.333333,8.3333333 13,7 13.333333,5.6666667 14,5 14,3 12.771491,3.6648531 11,5 11,7 Z M 2.9824219,5 A 1,1 0 0 1 4,5.9765625 L 4,6 A 1,1 0 0 1 3.0058594,7 1,1 0 0 1 2,6.0117188 1,1 0 0 1 2.9824219,5 Z"
      style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     id="path4139" /></svg>
\ No newline at end of file
+     id="path4139" /></svg>
diff --git a/symbols/post_office-14.svg b/symbols/shop/shoes.svg
similarity index 61%
copy from symbols/post_office-14.svg
copy to symbols/shop/shoes.svg
index 82268ef..a6edb32 100644
--- a/symbols/post_office-14.svg
+++ b/symbols/shop/shoes.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
@@ -34,7 +34,6 @@
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
-     d="m 0,2 0,1 7,4 7,-4 0,-1 z m 0,3 0,7 14,0 0,-7 -7,4 z"
-     id="post-office"
-     style="fill:#000000;fill-opacity:1;stroke:none" />
+     d="M 0.75,3 C 0.75,3 0,5.25 0,8.25 l 5.5,0 c 0.5,0 1.306389,1 1.3,1 l 7.2,0 C 14,6.25 11,6 10,6 L 8,6 C 7,4 5,3 5,3 L 4.75,3 C 4,4.508412 2.016472,4.508412 1,3 z M 5.5,4 C 5.776142,4 6,4.2238577 6,4.5 6,4.7761423 5.776142,5 5.5,5 5.223858,5 5,4.7761423 5,4.5 5,4.2238577 5.223858,4 5.5,4 z m 1,1 C 6.776142,5 7,5.2238577 7,5.5 7,5.7761423 6.776142,6 6.5,6 6.223858,6 6,5.7761423 6,5.5 6,5.2238577 6.223858,5 6.5,5 z M 0,9 l 0,2 5.25,0 0,-2 z m 7.3,1 c 0,0 0.7,1 1.2,1 l 5.5,0 0,-1 z"
+     id="shoes" />
 </svg>
diff --git a/symbols/shop/sports.svg b/symbols/shop/sports.svg
new file mode 100644
index 0000000..552eaed
--- /dev/null
+++ b/symbols/shop/sports.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"
+   id="svg2"><metadata
+     id="metadata21"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs19" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     id="path4286"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
+     d="M 5.5433072,1.2755905 A 1.2677165,1.2598426 0 0 1 4.2755908,2.5354332 1.2677165,1.2598426 0 0 1 3.0078741,1.2755905 1.2677165,1.2598426 0 0 1 4.2755908,0.01574798 1.2677165,1.2598426 0 0 1 5.5433072,1.2755905 Z M 12.395462,9.8346468 9.714385,10.523756 c -0.1095105,0.02815 -0.3520751,0.0033 -0.4439036,-0.01932 C 9.0351441,10.4588 8.9674746,10.349486 8.8753807,10.235178 L 7.6060635,8.1436871 6.0103144,9.8565596 6.6546096,13.059105 c 0.020606,0.06867 0.030909,0.125809 0.030909,0.171 [...]
diff --git a/symbols/stationery-14.svg b/symbols/shop/stationery.svg
similarity index 89%
rename from symbols/stationery-14.svg
rename to symbols/shop/stationery.svg
index efa26b5..7cbc72a 100644
--- a/symbols/stationery-14.svg
+++ b/symbols/shop/stationery.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <defs
@@ -26,6 +26,13 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
   <path
      d="M 5,10 C 5,9.2808818 5,4.6666667 5,2 5,1 5,1 6,1 l 1,0 c 1,0 1,0 1,1 l -0.010634,7.0084269 -1,0 L 7,3 6,3 C 6,4.6666667 5.9893664,7.3417602 5.9893664,9.0084269 5.9893664,10.008427 5.9893679,9.991392 7,10 l 0.9893664,0.0084 c 1,0 1,0 1,-1.0000001 L 9,2 C 9.0030345,2.3020714e-6 9,0 7,0 6,0 7,0 6,0 4,0 4,0 4,2 4,5 4,7 4,10 4,11 4,11 6.654504,13.668971 6.8617369,13.968351 7,14 7.5370581,14 8,14 8.195636,14.016316 8.5031967,13.68551 11,11 11,11 11,10 11,6.6666667 11,5.3333333 11,2 l - [...]
      id="stationery"
diff --git a/symbols/shop/supermarket.svg b/symbols/shop/supermarket.svg
new file mode 100644
index 0000000..1c8c037
--- /dev/null
+++ b/symbols/shop/supermarket.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14">
+  <metadata
+     id="metadata30">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs28" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     transform="translate(0,1)"
+     id="vbars">
+    <rect
+       id="rect5"
+       height="5"
+       width="0.5"
+       y="2.5"
+       x="3.5" />
+    <rect
+       id="rect7"
+       height="5.5"
+       width="0.5"
+       y="2.5"
+       x="5.5" />
+    <rect
+       id="rect9"
+       height="6"
+       width="0.5"
+       y="2.5"
+       x="7.5" />
+    <rect
+       id="rect11"
+       height="6"
+       width="0.5"
+       y="2.5"
+       x="9.5" />
+  </g>
+  <g
+     transform="translate(0,1)"
+     id="hbars">
+    <rect
+       id="rect14"
+       height="0.5"
+       width="10.5"
+       y="4"
+       x="1" />
+    <rect
+       id="rect16"
+       height="0.5"
+       width="10.5"
+       y="6"
+       x="1" />
+  </g>
+  <g
+     transform="translate(0,1)"
+     id="wheels">
+    <circle
+       id="circle19"
+       r="1"
+       cy="11.2"
+       cx="9.5" />
+    <circle
+       id="circle21"
+       r="1"
+       cy="11.2"
+       cx="3.5" />
+  </g>
+  <path
+     d="m 11,10 0,2 -9.5,0 a 0.5,0.5 0 1 1 0,-1 l 8.5,0 0,-1.5 z"
+     id="base" />
+  <path
+     d="M 11.5,3 11.768,1.75 13.25,1.2 A 0.55339859,0.55339859 0 1 1 13.6,2.25 L 12.6,2.6 12.5,3"
+     id="handle" />
+  <path
+     style="fill-rule:evenodd"
+     d="M 0,3 12.5,3 11,10 1,9 M 1.167,4 11.286,4 10.25,8.9 1.9,8.1 Z"
+     id="body" />
+</svg>
diff --git a/symbols/shop/tea.svg b/symbols/shop/tea.svg
new file mode 100644
index 0000000..480f75a
--- /dev/null
+++ b/symbols/shop/tea.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="14"
+   width="14"
+   version="1.1"
+   viewBox="0 0 14 14"
+   id="svg5114">
+  <defs
+     id="defs14" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="M 6.8320312,1.8984375 A 1.2055479,0.94874388 0 0 0 5.6269531,2.8476562 1.2055479,0.94874388 0 0 0 6.4667969,3.7519531 C 5.0890082,3.8629576 3.899133,4.5711593 3.2011719,5.6171875 c -0.014037,-0.00629 -0.026946,-0.019665 -0.041016,-0.025391 -0.648797,-0.26404 -1.6220121,-0.3965713 -2.25195308,0.011719 -0.61338999,0.39758 -0.87117,1.1088738 -0.90624999,1.9960938 -0.07125,1.80296 1.28012817,2.1642531 2.62695307,2.3457031 0.109103,0.014698 0.2167003,0.00673 0.3242188,0.00195 0.295793 [...]
+     id="path4153" />
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title />
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date />
+        <dc:description />
+        <dc:source />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jotam</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/symbols/shop/tobacco.svg b/symbols/shop/tobacco.svg
new file mode 100644
index 0000000..1e6b87c
--- /dev/null
+++ b/symbols/shop/tobacco.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg2"
+   x="0px"
+   y="0px"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"><metadata
+     id="metadata13"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs11" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 0,0 0,7 c 0,0 0,4 4,4 0.487694,0 0.905229,-0.08308 1.28125,-0.1875 C 5.222862,10.329209 5.25,10 5.25,10 l 0,-0.21875 C 4.906989,9.915179 4.490013,10 4,10 1,10 1,7 1,7 L 1,1.5 c 2,0.9520605 4,0.9520605 6,0 L 7,2.65625 C 7.334486,2.7893793 7.676632,2.9137483 8,3 L 8,0 C 5,1.3728814 3,1.3050847 0,0 z m 2.5,3 c -0.552285,0 -1,0.4477153 -1,1 0,0.5522847 0.447715,1 1,1 0.552285,0 1,-0.4477153 1,-1 0,-0.5522847 -0.447715,-1 -1,-1 z M 6,3 6,10 c 0,0 0,4 4,4 4,0 4,-4 4,-4 L 14,3 C 11,4. [...]
+     id="theatre"
+     style="fill:#000000;fill-opacity:1;stroke:none" /><path
+     d="m 2,11 1,0 0,3 -1,0 z M 1,10 C 1.6666667,9 3,8 3,7 3,6 0,5 0,3 0,1 2,1 4,0 3.6666667,1.3333333 2,2 2,3 3,4 5,5 5,7 5,9 4,9 1,10 Z m -1,1 1,0 0,3 -1,0 z m 14,3 -10,0 0,-3 10,0 z"
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
+     id="path3357-4" /></svg>
diff --git a/symbols/toys-14.svg b/symbols/shop/toys.svg
similarity index 80%
rename from symbols/toys-14.svg
rename to symbols/shop/toys.svg
index 3f8e986..ede94ca 100644
--- a/symbols/toys-14.svg
+++ b/symbols/shop/toys.svg
@@ -16,22 +16,15 @@
      id="metadata19"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs4" /><g
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-599.30675)"
-     id="layer3"
-     style="display:none"><rect
-       width="10"
-       height="10"
-       x="1"
-       y="1"
-       id="rect4134"
-       style="fill:none;stroke:none" /><rect
-       width="8"
-       height="8"
-       x="2"
-       y="2"
-       id="rect4136"
-       style="fill:none;stroke:none" /></g><path
+     id="defs4" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
      d="M 3,0 3,2 C 2.303,2.367 0.5205,3.74 0.3125,4 0.1125,4.249 0.0935,6.054 0.4375,6 1.0385,5.908 3.07175,4.264 3.59375,4.625 4.11475,4.985 3.965,6.677 4,8 3.2885823,8.9155412 3.0486761,9.914732 2.375,10.65625 2.043673,10.355285 1.6921391,10.067139 1.3125,9.6875 1.2346732,9.5966801 0.85929648,9.3748654 0.50753769,9.6954041 0.28592558,10 0.25660799,10.372075 0.5233459,10.617358 c 2.0149553,2.014955 3.9296858,3.077784 6.7580611,3.077784 2.729723,0 4.081027,-1.080817 6.101445,-3.101235 0 [...]
      id="path2529"
-     style="fill:#000000;stroke:none" /></svg>
\ No newline at end of file
+     style="fill:#000000;stroke:none" /></svg>
diff --git a/symbols/travel_agency-14.svg b/symbols/shop/travel_agency.svg
similarity index 90%
rename from symbols/travel_agency-14.svg
rename to symbols/shop/travel_agency.svg
index fb3e5e8..3e2e74b 100644
--- a/symbols/travel_agency-14.svg
+++ b/symbols/shop/travel_agency.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <defs
@@ -26,6 +26,13 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
   <path
      d="M 0,9 C 0,8 0,8 1,8 c 2.3333333,0 4.6666667,0 7,0 1,0 1,0 1,1 0,1.333333 0,2.666667 0,4 0,1 0,1 -1,1 C 5.6666667,14 3.3333333,14 1,14 0,14 0,14 0,13 0,11.666667 0,10.333333 0,9 z M 13,4.03125 13,7 l 1,0 0,-2.96875 -1,0 z M 11.21875,3.6875 9.59375,6.15625 10.40625,6.6875 12.0625,4.25 11.21875,3.6875 z M 9.9375,2.03125 7.125,3.1875 7.5,4.09375 10.3125,2.96875 9.9375,2.03125 z M 7,-0.03125 l 0,1 L 10.09375,1 l 0,-1 L 7,-0.03125 z M 3,8 3,6.2964824 l 3,0 L 6,8 7,8 7,6 C 7,5 7,5 6,5 5 [...]
      id="path2996"
diff --git a/symbols/post_office-14.svg b/symbols/shop/variety_store.svg
similarity index 67%
rename from symbols/post_office-14.svg
rename to symbols/shop/variety_store.svg
index 82268ef..1386864 100644
--- a/symbols/post_office-14.svg
+++ b/symbols/shop/variety_store.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,10 +6,12 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
+  <defs
+     id="defs3053" />
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -24,8 +24,6 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs
-     id="defs6" />
   <rect
      width="14"
      height="14"
@@ -34,7 +32,6 @@
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
-     d="m 0,2 0,1 7,4 7,-4 0,-1 z m 0,3 0,7 14,0 0,-7 -7,4 z"
-     id="post-office"
-     style="fill:#000000;fill-opacity:1;stroke:none" />
+     id="variety_store"
+     d="M 5,0 C 4,0 4,0 4,1 L 4.0097656,4 1,4 1,13 c 0,1 0,1 1,1 l 10,0 c 1,0 1,0 1,-1 L 13,4 10.039062,4 10,1 C 10,0 10,0 9,0 Z M 9,1 9,4 5,4 5,1 Z M 5,5 8,5 8,12 5,12 5,11 7,11 7,9 5,9 Z m 4,0 3,0 0,7 -3,0 0,-1 2,0 0,-2 -2,0 z M 6,6 6,8 7,8 7,6 Z m 4,0 0,2 1,0 0,-2 z m -8,5 2,0 0,2.48929 -1,0 L 3,12 2,12 Z" />
 </svg>
diff --git a/symbols/shop_bakery.16.svg b/symbols/shop_bakery.16.svg
deleted file mode 100644
index 852e0ec..0000000
--- a/symbols/shop_bakery.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7.75,4 9.25,8 7.75,8 6.25,4 C 6.25,4 4.4948328,4 4.5,4 L 6,8 4.5,8 3.1769068,4.5762712 C 2.2910439,5.2640693 1,7.1983848 1,9 l 0,2 c 0,0.59322 0.4237288,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 15,9 C 15,6.5355945 13.272623,4.5853602 11,4 L 12.5,8 11,8 9.5,4 c 0,0 -1.743955,0 -1.75,0 z" />
-</svg>
diff --git a/symbols/shop_bicycle.16.svg b/symbols/shop_bicycle.16.svg
deleted file mode 100644
index d9365d3..0000000
--- a/symbols/shop_bicycle.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="m 9,2.5 0,0.875 1.25,0.78125 0,1.09375 -4.25,0 0,-0.75 0.5,0 c 1,0 1,-1 0,-1 l -2,0 c -1,0 -1,1 0,1 L 5,4.5 5,5.25 4.0625,7 C 4.0416,6.9995343 4.02098,7 4,7 2.387717,7 1,8.387717 1,10 1,11.612283 2.387717,13 4,13 5.612283,13 7,11.612283 7,10 7,9.654031 6.92843,9.313419 6.8125,9 L 7.25,9 C 8,9 8.172746,8.546004 8.4375,8.28125 L 10.21875,6.25 10.75,7.28125 C 9.727462,7.7659158 9,8.824875 9,10 c 0,1.612283 1.387717,3 3,3 1.612283,0 3,-1.387717 3,-3 C 15,8.387717 13.612283,7 12,7 11. [...]
-     id="bicycle"
-     style="fill:#1a1a1a;stroke:none" />
-</svg>
diff --git a/symbols/shop_car.svg b/symbols/shop_car.svg
deleted file mode 100644
index 7c5a319..0000000
--- a/symbols/shop_car.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%" viewBox="0 1 14 12">
-<path fill-rule="evenodd" id="body" d="M 0,9.5 A 1.5,1.5 0 0,0 1.5,11 L 12.5,11 A 1.5,1.5 0 0,0 14,9.5 L 14,6.5 A 1.5,1.5 0 0,0 12.5,5 L 1.5,5 A 1.5,1.5 0 0,0 0,6.5 Z
-M 1.6,7.5 a .9,.9 0 1,1 0,0.01 Z
-M 10.6,7.5 a .9,.9 0 1,1 0,0.01 Z"/>
-<g id="tyres">
-<rect x="1" y="10" width="2" height="3"/>
-<rect x="11" y="10" width="2" height="3"/>
-</g>
-<path id="top" d="M 2,5 L 2,2.5 A 1.5,1.5 0 0,1 3.5,1 L 10.5,1 A 1.5,1.5 0 0,1 12,2.5 L 12,5
-10.5,5 10.5,3.5 A 1,1 0 0,0 9.5,2.5 L 4.5,2.5 A 1,1 0 0,0 3.5,3.5 L 3.5,5 Z" />
-</svg>
diff --git a/symbols/shop_convenience.svg b/symbols/shop_convenience.svg
deleted file mode 100644
index 70105a4..0000000
--- a/symbols/shop_convenience.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 13 11">
-<g id="hbars">
-<rect x="1" y="6" width="11" height="0.5" />
-<rect x="2" y="8" width="9.5" height="0.5" />
-</g>
-<g id="vbars">
-<rect x="3" y="4.5" width="0.5" height="5.5" />
-<rect x="5" y="4.5" width="0.5" height="5.5" />
-<rect x="7.5" y="4.5" width="0.5" height="5.5" />
-<rect x="9.5" y="4.5" width="0.5" height="5.5" />
-</g>
-<path id="handle" d="M5.9,4 L7.9,1 A 0.5,0.5 0 0,1 8.83,1.4 L 7.1,4 Z"/>
-<path id="body" fill-rule="evenodd" d="M 0,4 L 13,4 11,11 2,11 Z
-M 1.25,5 L 11.75,5 10.25,10 2.75,10 Z"/>
-</svg>
diff --git a/symbols/shop_diy.16.svg b/symbols/shop_diy.16.svg
deleted file mode 100644
index 14b707e..0000000
--- a/symbols/shop_diy.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="M 10,1 C 9.248808,1.4909181 8.75,2.3481516 8.75,3.3125 c 0,1.0641992 0.615654,1.9803063 1.5,2.4375 l 0,7.75 c 0,0.877754 0.521186,1.5 1.25,1.5 0.728813,0 1.25,-0.603432 1.25,-1.5 l 0,-7.75 C 13.634346,5.2928063 14.25,4.3766992 14.25,3.3125 14.25,2.3481516 13.751192,1.4909181 13,1 L 13,2.5 11.5,4 10,2.5 c 0,0 0,-1.5023227 0,-1.5 z M 5,1 C 4.447507,1 4,1.3804513 4,1.75 l -1.5,0 -1.25,1.75 1.25,1.75 1.5,0 0,8.5 C 4,14.434896 4.376848,15 5,15 5.623152,15 6,14.471763 6,13.75 l 0,-8.5  [...]
-     id="doityourself"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/shop_hairdresser.16.svg b/symbols/shop_hairdresser.16.svg
deleted file mode 100644
index e2ad7af..0000000
--- a/symbols/shop_hairdresser.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="m 5,1 0,9.53125 C 4.580263,10.212414 4.064535,10 3.5,10 2.12521,10 1,11.12521 1,12.5 1,13.87479 2.12521,15 3.5,15 4.702941,15 5.703332,14.136374 5.9375,13 l 0.125,0 C 6.296668,14.136374 7.297059,15 8.5,15 9.87479,15 11,13.87479 11,12.5 11,11.12521 9.87479,10 8.5,10 7.935465,10 7.419737,10.212414 7,10.53125 L 7,1 z m 4,0 0,2 4,0 0,1 -4,0 0,1 4,0 0,1 -4,0 0,1 4,0 0,1 -4,0 0,1 4,0 0,6 2,0 0,-12 C 15,2 14,1 13,1 z M 3.5,11 C 4.334349,11 5,11.665651 5,12.5 5,13.334349 4.334349,14 3.5, [...]
-     id="hairdresser"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/shop_pet.16.svg b/symbols/shop_pet.16.svg
deleted file mode 100644
index 254015a..0000000
--- a/symbols/shop_pet.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="M 10.412959,1.002152 C 9.1693111,1.14588 8.4631991,2.5093562 8.3733471,3.6936526 8.2264421,4.7464946 8.6860601,6.0899485 9.7918901,6.3320386 10.750208,6.4175146 11.512633,5.517193 11.825819,4.6583655 12.195679,3.583391 12.206482,2.1478454 11.309038,1.3425072 11.059753,1.1264712 10.739671,0.99523614 10.412959,1.002152 z M 5.3400251,1.058519 c -1.034807,0.074858 -1.5652,1.2774426 -1.493223,2.2427639 0.0088,1.2907239 0.717612,2.7424122 2.010186,3.0488129 0.963956,0.1042448 1.606661, [...]
-     id="pet"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/shop_shoes.16.svg b/symbols/shop_shoes.16.svg
deleted file mode 100644
index 1a4d61f..0000000
--- a/symbols/shop_shoes.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="M 1.75,4 C 1.75,4 1,6.25 1,9.25 l 5.5,0 c 0.5,0 1.306389,1 1.3,1 l 7.2,0 C 15,7.25 12,7 11,7 L 9,7 C 8,5 6,4 6,4 L 5.75,4 C 5,5.508412 3.016472,5.508412 2,4 z M 6.5,5 C 6.776142,5 7,5.2238577 7,5.5 7,5.7761423 6.776142,6 6.5,6 6.223858,6 6,5.7761423 6,5.5 6,5.2238577 6.223858,5 6.5,5 z m 1,1 C 7.776142,6 8,6.2238577 8,6.5 8,6.7761423 7.776142,7 7.5,7 7.223858,7 7,6.7761423 7,6.5 7,6.2238577 7.223858,6 7.5,6 z m -6.5,4 0,2 5.25,0 0,-2 z m 7.3,1 c 0,0 0.7,1 1.2,1 l 5.5,0 0,-1 z"
-     id="shoes"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/shop_supermarket.svg b/symbols/shop_supermarket.svg
deleted file mode 100644
index 5f534ce..0000000
--- a/symbols/shop_supermarket.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 14 13">
-<g id="vbars">
-<rect x="3.5" y="2.5" width="0.5" height="5" />
-<rect x="5.5" y="2.5" width="0.5" height="5.5" />
-<rect x="7.5" y="2.5" width="0.5" height="6" />
-<rect x="9.5" y="2.5" width="0.5" height="6" />
-</g>
-<g id="hbars">
-<rect x="1" y="4" width="10.5" height="0.5" />
-<rect x="1" y="6" width="10.5" height="0.5" />
-</g>
-<g id="wheels">
-<circle cx="9.5" cy="11.2" r="1" />
-<circle cx="3.5" cy="11.2" r="1" />
-</g>
-<path id="base" d="M 11,9 L 11,11 1.5,11 A 0.5,0.5 0 1,1 1.5,10 L 10,10 10,8.5 Z"/>
-<path id="handle" d="M 11.5,2 L 11.768,.75 13.25,0.2 A 0.5,0.5 0 0,1 13.6,1.25 L 12.6,1.6 12.5,2"/>
-<path id="body" fill-rule="evenodd" d="M 0,2 L 12.5,2 11,9 1,8 M 1.167,3 L 11.286,3 10.25,7.9 1.9,7.1 Z"/>
-</svg>
diff --git a/symbols/shopping_car_repair.16.svg b/symbols/shopping_car_repair.16.svg
deleted file mode 100644
index f2224d9..0000000
--- a/symbols/shopping_car_repair.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="M 11.5,1 C 10.574658,1 9.776015,1.502762 9.34375,2.25 L 3.5,2.25 C 2.622246,2.25 2,2.7711864 2,3.5 2,4.2288136 2.603432,4.75 3.5,4.75 l 5.84375,0 C 9.776015,5.4972377 10.574658,6 11.5,6 12.425343,6 13.223985,5.4972377 13.65625,4.75 L 12,4.75 10.5,3.5 12,2.25 l 1.65625,0 C 13.223985,1.5027623 12.425343,1 11.5,1 z m -8,2 C 3.776142,3 4,3.2238576 4,3.5 4,3.7761424 3.776142,4 3.5,4 3.223858,4 3,3.7761424 3,3.5 3,3.2238576 3.223858,3 3.5,3 z M 5,7 4,10 c -0.472666,0 -1,0.384295 -1,1 l [...]
-     id="repair-car"
-     style="fill:#1a1a1a;stroke:none" />
-</svg>
diff --git a/symbols/sikhist.16.svg b/symbols/sikhist.16.svg
deleted file mode 100644
index 6818072..0000000
--- a/symbols/sikhist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7.9843342,1 6.9817232,2 C 7.044285,2.4367914 7.0601031,2.7749535 7.1070496,3.15625 5.8826554,3.5360844 4.9765013,4.653806 4.9765013,6 c 0,1.3565494 0.9229007,2.4727975 2.1618799,2.84375 C 7.0873598,9.2198537 7.0530306,9.5732699 6.9817232,10 l 0.5013055,0.5 0,0.40625 C 6.5614039,10.285538 5.5815135,9.5952456 4.9765013,9 2.9436865,7 3.4803233,3.5 5.9791123,2 3.9800811,2.5 2,4.3084098 2,7 c 0,2.9999999 2.9765013,4 2.9765013,5 l 1.002611,-1 1.2845953,0.71875 C 6.6495383,12.098319 5 [...]
-</svg>
diff --git a/symbols/sikhist.svg b/symbols/sikhist.svg
new file mode 100644
index 0000000..35524f2
--- /dev/null
+++ b/symbols/sikhist.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 6.984334,0 5.981723,1 C 6.044283,1.4367914 6.060103,1.7749535 6.10705,2.15625 4.882655,2.5360844 3.976501,3.653806 3.976501,5 c 0,1.3565494 0.922901,2.472798 2.16188,2.84375 C 6.087361,8.219854 6.053031,8.57327 5.981723,9 l 0.501306,0.5 0,0.40625 C 5.561404,9.285538 4.581513,8.595246 3.976501,8 1.943686,6 2.480323,2.5 4.979112,1 2.980081,1.5 1,3.3084098 1,6 c 0,3 2.976501,4 2.976501,5 l 1.002611,-1 1.284596,0.71875 C 5.649538,11.098319 4.979112,11.5 4.979112,11.5 l 0.501306,0.5 [...]
+     id="sikhist" />
+</svg>
diff --git a/symbols/social_facility-14.svg b/symbols/social_facility.svg
similarity index 98%
rename from symbols/social_facility-14.svg
rename to symbols/social_facility.svg
index db5621f..4a70c72 100644
--- a/symbols/social_facility-14.svg
+++ b/symbols/social_facility.svg
@@ -7,8 +7,8 @@
    xmlns="http://www.w3.org/2000/svg"
    id="svg2"
    viewBox="0 0 14 14"
-   height="100%"
-   width="100%"
+   height="14"
+   width="14"
    version="1.1">
   <metadata
      id="metadata8">
diff --git a/symbols/sports-14.svg b/symbols/sports-14.svg
deleted file mode 100644
index 29360af..0000000
--- a/symbols/sports-14.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="14"
-   height="14"
-   viewBox="0 0 14 14"
-   enable-background="new 0 0 580 580"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="sports-14-33.svg"><metadata
-     id="metadata21"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs19" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1871"
-     inkscape:window-height="1056"
-     id="namedview17"
-     showgrid="true"
-     inkscape:zoom="63.5"
-     inkscape:cx="4.2204724"
-     inkscape:cy="7"
-     inkscape:window-x="49"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g9"
-     showguides="false"><inkscape:grid
-       type="xygrid"
-       id="grid4149" /></sodipodi:namedview><g
-     id="g7"
-     inkscape:version="0.46"
-     sodipodi:docname="waste_bin.svg"
-     sodipodi:version="0.32"
-     inkscape:output_extension="org.inkscape.output.svg.inkscape"
-     transform="matrix(0.01926427,0,0,0.03311953,1.6923267,-2.5759903)"
-     style="fill:#000000"><g
-       id="g9"
-       style="fill:#000000"
-       transform="matrix(1.4591054,0,0,1,-148.6728,0)"><path
-         id="path4286"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
-         d="m 238.89676,116.29334 a 45.100662,38.039265 0 0 1 -45.10066,38.03927 45.100662,38.039265 0 0 1 -45.10067,-38.03927 45.100662,38.039265 0 0 1 45.10067,-38.039262 45.100662,38.039265 0 0 1 45.10066,38.039262 z m 243.77432,258.42928 -95.3828,20.80672 c -3.89598,0.84986 -12.52553,0.0999 -15.79245,-0.5834 -8.37243,-1.37786 -10.77986,-4.67843 -14.05622,-8.1298 l -45.15761,-63.14979 -56.77085,51.7179 22.92164,96.69659 c 0.73307,2.07351 1.09961,3.79863 1.09961,5.17648 0,6.2071 -2.364 [...]
\ No newline at end of file
diff --git a/symbols/taoist.16.svg b/symbols/taoist.16.svg
deleted file mode 100644
index 50ad202..0000000
--- a/symbols/taoist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 8,15 c 3.858078,0 7,-3.169117 7,-7 C 15,4.169117 11.877274,1 8,1 4.122726,1 1,4.13993 1,8 c 0,3.860071 3.141922,7 7,7 z M 8,14 C 4.680369,14 2,11.319631 2,8 2,4.680369 4.680369,2 8,2 c 3,0 4,5.4793944 0,6 -4,0.5206056 -2.915254,6 0,6 z m 0,-2 c -0.5522848,0 -1,-0.447716 -1,-1 0,-0.552284 0.4477152,-1 1,-1 0.5522848,0 1,0.447716 1,1 0,0.552284 -0.4477152,1 -1,1 z M 8,6 C 8.5522847,6 9,5.552285 9,5 9,4.447715 8.5522847,4 8,4 7.4477153,4 7,4.447715 7,5 7,5.552285 7.4477153,6 8,6 z" />
-</svg>
diff --git a/symbols/taoist.svg b/symbols/taoist.svg
new file mode 100644
index 0000000..0f179fa
--- /dev/null
+++ b/symbols/taoist.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 7,14 c 3.858078,0 7,-3.169117 7,-7 C 14,3.169117 10.877274,0 7,0 3.122726,0 0,3.13993 0,7 c 0,3.860071 3.141922,7 7,7 z M 7,13 C 3.680369,13 1,10.319631 1,7 1,3.680369 3.680369,1 7,1 10,1 11,6.4793944 7,7 3,7.520606 4.084746,13 7,13 z M 7,11 C 6.447715,11 6,10.552284 6,10 6,9.447716 6.447715,9 7,9 7.552285,9 8,9.447716 8,10 8,10.552284 7.552285,11 7,11 z M 7,5 C 7.552285,5 8,4.552285 8,4 8,3.447715 7.552285,3 7,3 6.447715,3 6,3.447715 6,4 6,4.552285 6.447715,5 7,5 z"
+     id="taoist" />
+</svg>
diff --git a/symbols/taxi.16.svg b/symbols/taxi.svg
similarity index 81%
rename from symbols/taxi.16.svg
rename to symbols/taxi.svg
index 9235b73..669b15f 100644
--- a/symbols/taxi.16.svg
+++ b/symbols/taxi.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 5.96875,0 C 5.429431,0 5,0.4876472 5,1 L 4.96875,2 3,2 1.75,6 C 0.989697,6 0,6.4966359 0,8 l 0,4 2,0 0,1 c 0,0 0,1 1,1 1,0 1,-1 1,-1 L 4,12 10,11.96875 10,13 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 0,-1 2,0 0,-4 C 14,6.4726661 13,6 12,6 L 11,2 9,2 9,1 C 9,0.4337153 8.566285,0 8,0 L 5.96875,0 z M 6,1 8,1 8,2 6,2 6,1 z M 4,3.5 10,3.5 10.59375,6 3.3125,6 4,3.5 z M 3,8 C 3.552285,8 4,8.447715 4,9 4,9.552285 3.552285,10 3,10 2.447715,10 2,9.552285 2,9 2,8.447715 2.447715,8 3,8 z m 8,0 c 0. [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 5.96875,0 C 5.429431,0 5,0.4876472 5,1 L 4.96875,2 3,2 1.75,6 C 0.989697,6 0,6.4966359 0,8 l 0,4 2,0 0,1 c 0,0 0,1 1,1 1,0 1,-1 1,-1 L 4,12 10,11.96875 10,13 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 0,-1 2,0 0,-4 C 14,6.4726661 13,6 12,6 L 11,2 9,2 9,1 C 9,0.4337153 8.566285,0 8,0 L 5.96875,0 z M 6,1 8,1 8,2 6,2 6,1 z M 4,3.5 10,3.5 10.59375,6 3.3125,6 4,3.5 z M 3,8 C 3.552285,8 4,8.447715 4,9 4,9.552285 3.552285,10 3,10 2.447715,10 2,9.552285 2,9 2,8.447715 2.447715,8 3,8 z m 8,0 c 0. [...]
 </svg>
diff --git a/symbols/tea-14.svg b/symbols/tea-14.svg
deleted file mode 100644
index d638541..0000000
--- a/symbols/tea-14.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg5114"
-   viewBox="0 0 14 14"
-   version="1.1"
-   width="14"
-   height="14">
-  <defs
-     id="defs14" />
-  <g
-     id="layer1"
-     transform="translate(-85.520606,-485.84148)">
-    <g
-       id="g4172"
-       transform="translate(0.0112773,-2.31883)">
-      <path
-         id="path4153"
-         transform="translate(85.509329,488.16031)"
-         d="M 6.8320312 1.8984375 A 1.2055479 0.94874388 0 0 0 5.6269531 2.8476562 A 1.2055479 0.94874388 0 0 0 6.4667969 3.7519531 C 5.0890082 3.8629576 3.899133 4.5711593 3.2011719 5.6171875 C 3.1871345 5.6109021 3.1742264 5.5975228 3.1601562 5.5917969 C 2.5113592 5.3277569 1.5381441 5.1952256 0.90820312 5.6035156 C 0.29481313 6.0010956 0.037033125 6.7123894 0.001953125 7.5996094 C -0.069296875 9.4025694 1.2820813 9.7638625 2.6289062 9.9453125 C 2.7380092 9.9600108 2.8456065 9.9520394  [...]
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-  </g>
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:publisher>
-          <cc:Agent
-             rdf:about="http://openclipart.org/">
-            <dc:title />
-          </cc:Agent>
-        </dc:publisher>
-        <dc:title></dc:title>
-        <dc:date />
-        <dc:description />
-        <dc:source />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jotam</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>
diff --git a/symbols/telephone.16.svg b/symbols/telephone.svg
similarity index 75%
rename from symbols/telephone.16.svg
rename to symbols/telephone.svg
index 00edbdb..e04dec5 100644
--- a/symbols/telephone.16.svg
+++ b/symbols/telephone.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 2,8 C 1.0118212,8.9881788 0.56004859,10.573569 1.5487288,11.552966 L 2,12 5,9 5,7.5 7.5,5 9,5 12,2 11.489407,1.512712 C 10.513874,0.58170546 8.9807634,1.0192366 8,2 z m 0.5451482,4.537558 0.3387857,0.352887 c 0,0 0.8501688,0.07591 1.2889221,-0.356167 L 5.5665554,11.161784 C 5.9484277,10.759801 5.8738707,9.8572254 5.8738707,9.8572254 L 5.5350852,9.504338 z M 9.5530473,5.5203307 9.8918329,5.8732169 c 0,0 0.8697361,0.1575408 1.2643511,-0.2310704 l 1.393699,-1.372494 C 12.944768 [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 2,8 C 1.0118212,8.9881788 0.56004859,10.573569 1.5487288,11.552966 L 2,12 5,9 5,7.5 7.5,5 9,5 12,2 11.489407,1.512712 C 10.513874,0.58170546 8.9807634,1.0192366 8,2 z m 0.5451482,4.537558 0.3387857,0.352887 c 0,0 0.8501688,0.07591 1.2889221,-0.356167 L 5.5665554,11.161784 C 5.9484277,10.759801 5.8738707,9.8572254 5.8738707,9.8572254 L 5.5350852,9.504338 z M 9.5530473,5.5203307 9.8918329,5.8732169 c 0,0 0.8697361,0.1575408 1.2643511,-0.2310704 l 1.393699,-1.372494 C 12.944768 [...]
 </svg>
diff --git a/symbols/theatre.16.svg b/symbols/theatre.16.svg
deleted file mode 100644
index 9cf15fd..0000000
--- a/symbols/theatre.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="m 1,1 0,7 c 0,0 0,4 4,4 0.4876943,0 0.9052288,-0.08308 1.28125,-0.1875 C 6.222862,11.329209 6.25,11 6.25,11 l 0,-0.21875 C 5.9069891,10.915179 5.4900129,11 5,11 2,11 2,8 2,8 L 2,2.5 c 2,0.9520605 4,0.9520605 6,0 L 8,3.65625 C 8.3344864,3.7893793 8.6766322,3.9137483 9,4 L 9,1 C 6,2.3728814 4,2.3050847 1,1 z m 2.5,3 c -0.5522847,0 -1,0.4477153 -1,1 0,0.5522847 0.4477153,1 1,1 0.5522847,0 1,-0.4477153 1,-1 0,-0.5522847 -0.4477153,-1 -1,-1 z M 7,4 7,11 c 0,0 0,4 4,4 4,0 4,-4 4,-4 L 1 [...]
-     id="theatre"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/theatre.svg b/symbols/theatre.svg
new file mode 100644
index 0000000..0025619
--- /dev/null
+++ b/symbols/theatre.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 0,0 0,7 c 0,0 0,4 4,4 0.487694,0 0.905229,-0.08308 1.28125,-0.1875 C 5.222862,10.329209 5.25,10 5.25,10 l 0,-0.21875 C 4.906989,9.915179 4.490013,10 4,10 1,10 1,7 1,7 L 1,1.5 c 2,0.9520605 4,0.9520605 6,0 L 7,2.65625 C 7.334486,2.7893793 7.676632,2.9137483 8,3 L 8,0 C 5,1.3728814 3,1.3050847 0,0 z m 2.5,3 c -0.552285,0 -1,0.4477153 -1,1 0,0.5522847 0.447715,1 1,1 0.552285,0 1,-0.4477153 1,-1 0,-0.5522847 -0.447715,-1 -1,-1 z M 6,3 6,10 c 0,0 0,4 4,4 4,0 4,-4 4,-4 L 14,3 C 11,4. [...]
+     id="theatre" />
+</svg>
diff --git a/symbols/toilets.16.svg b/symbols/toilets.16.svg
deleted file mode 100644
index ac0b5ae..0000000
--- a/symbols/toilets.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 7.25,1 0,14 1.5,0 0,-14 -1.5,0 z M 3.5,2 C 2.6715729,2 2,2.6715729 2,3.5 2,4.3284271 2.6715729,5 3.5,5 4.3284271,5 5,4.3284271 5,3.5 5,2.6715729 4.3284271,2 3.5,2 z m 9,0 C 11.671573,2 11,2.6715729 11,3.5 11,4.3284271 11.671573,5 12.5,5 13.328427,5 14,4.3284271 14,3.5 14,2.6715729 13.328427,2 12.5,2 z m -10,4 c -0.5997222,0 -1,0.568545 -1,1 0,0.5273339 1.25,1.4966359 1.25,2 C 2.75,9.5559735 1,10 1,12 l 1.75,0 0,3 1.5,0 0,-3 L 6,12 C 6,10 4.25,9.5295085 4.25,9 4.25,8.4704915 5.5 [...]
-</svg>
diff --git a/symbols/toilets.svg b/symbols/toilets.svg
new file mode 100644
index 0000000..fa869ac
--- /dev/null
+++ b/symbols/toilets.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 6.25,0 0,14 1.5,0 0,-14 -1.5,0 z M 2.5,1 C 1.671573,1 1,1.6715729 1,2.5 1,3.3284271 1.671573,4 2.5,4 3.328427,4 4,3.3284271 4,2.5 4,1.6715729 3.328427,1 2.5,1 z m 9,0 C 10.671573,1 10,1.6715729 10,2.5 10,3.3284271 10.671573,4 11.5,4 12.328427,4 13,3.3284271 13,2.5 13,1.6715729 12.328427,1 11.5,1 z m -10,4 c -0.599722,0 -1,0.568545 -1,1 0,0.5273339 1.25,1.496636 1.25,2 C 1.75,8.555974 0,9 0,11 l 1.75,0 0,3 1.5,0 0,-3 L 5,11 C 5,9 3.25,8.529509 3.25,8 3.25,7.470492 4.5,6.5513036  [...]
+     id="toilets" />
+</svg>
diff --git a/symbols/tourist_memorial.16.svg b/symbols/tourist_memorial.16.svg
deleted file mode 100644
index 8cb8b49..0000000
--- a/symbols/tourist_memorial.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 6,2 C 5,2 4,3 4,4 l 0,8 8,0 0,-8 C 12,3 11,2 10,2 z M 7,4 9,4 9,5 7,5 z m -2,2 6,0 0,1 -6,0 z m 1,2 4,0 0,1 -4,0 z m -3,5 -1,1 0,1 12,0 0,-1 -1,-1 z" />
-</svg>
diff --git a/symbols/town_hall.16.svg b/symbols/town_hall.16.svg
deleted file mode 100644
index 358fba9..0000000
--- a/symbols/town_hall.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,1 C 7.75,1.0032 7.5,1.1644239 7.5,1.5 L 7.5,5.375 2,8 14,8 8.5,5.375 8.5,1.5 C 8.5,1.1516409 8.25,0.99680426 8,1 z M 9,1 9,4 13,4 11,2.5 13,1 z m -7,8 0,1 1,0 0,4 -1,0 0,1 12,0 0,-1 -1,0 0,-4 1,0 0,-1 z m 6,1.5 c 1,0 2,0.5 2,1.5 l 0,2 -4,0 0,-2 c 0,-1 1,-1.5 2,-1.5 z" />
-</svg>
diff --git a/symbols/town_hall.svg b/symbols/town_hall.svg
new file mode 100644
index 0000000..19b3a2c
--- /dev/null
+++ b/symbols/town_hall.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,0 C 6.75,0.0032 6.5,0.1644239 6.5,0.5 L 6.5,4.375 1,7 13,7 7.5,4.375 7.5,0.5 C 7.5,0.1516409 7.25,-0.0031957 7,0 z M 8,0 8,3 12,3 10,1.5 12,0 z m -7,8 0,1 1,0 0,4 -1,0 0,1 12,0 0,-1 -1,0 0,-4 1,0 0,-1 z m 6,1.5 c 1,0 2,0.5 2,1.5 l 0,2 -4,0 0,-2 C 5,10 6,9.5 7,9.5 z"
+     id="town-hall" />
+</svg>
diff --git a/symbols/traffic_light.svg b/symbols/traffic_light.16.svg
similarity index 77%
rename from symbols/traffic_light.svg
rename to symbols/traffic_light.16.svg
index 664dd92..02dc775 100644
--- a/symbols/traffic_light.svg
+++ b/symbols/traffic_light.16.svg
@@ -4,6 +4,13 @@
    version="1.1"
    width="16"
    height="16">
+  <rect
+     width="16"
+     height="16"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
 	<path d="M 5,3 5,13 C 5,17 11,17 11,13 L 11,3 C 11,-1 5,-1 5,3 z
 	M 8,1 C 9.1,1 10,1.9 10,3 10,4.1 9.1,5 8,5 6.9,5 6,4.1 6,3 6,1.9 6.9,1 8,1 z
 	M 8,6 C 9.1,6 10,6.9 10,8 10,9.1 9.1,10 8,10 6.9,10 6,9.1 6,8 6,6.9 6.9,6 8,6 z
diff --git a/symbols/variety_store-14.svg b/symbols/variety_store-14.svg
deleted file mode 100644
index ebc01e1..0000000
--- a/symbols/variety_store-14.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg2"
-   viewBox="0 0 14 14"
-   height="100%"
-   width="100%"
-   version="1.1">
-  <defs
-     id="defs3053" />
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     style="font-size:7.5px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans"
-     id="text4134">
-    <path
-       id="variety_store"
-       d="M 5,0 C 4,0 4,0 4,1 L 4.0097656,4 1,4 1,13 c 0,1 0,1 1,1 l 10,0 c 1,0 1,0 1,-1 L 13,4 10.039062,4 10,1 C 10,0 10,0 9,0 Z M 9,1 9,4 5,4 5,1 Z M 5,5 8,5 8,12 5,12 5,11 7,11 7,9 5,9 Z m 4,0 3,0 0,7 -3,0 0,-1 2,0 0,-2 -2,0 z M 6,6 6,8 7,8 7,6 Z m 4,0 0,2 1,0 0,-2 z m -8,5 2,0 0,2.48929 -1,0 L 3,12 2,12 Z"
-       style="font-weight:bold;font-size:8.75px" />
-  </g>
-</svg>
diff --git a/symbols/veterinary-14.svg b/symbols/veterinary.svg
similarity index 98%
rename from symbols/veterinary-14.svg
rename to symbols/veterinary.svg
index be0dda0..692a111 100644
--- a/symbols/veterinary-14.svg
+++ b/symbols/veterinary.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="14"
+   height="14"
    viewBox="0 0 14 14"
    id="svg2">
   <metadata
diff --git a/symbols/viewpoint.16.svg b/symbols/viewpoint.svg
similarity index 93%
rename from symbols/viewpoint.16.svg
rename to symbols/viewpoint.svg
index 3a184eb..32ca9e6 100644
--- a/symbols/viewpoint.16.svg
+++ b/symbols/viewpoint.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="m 9.65625,0.59375 c -0.3024732,0.0462641 -0.5739493,0.24857188 -0.75,0.5 C 8.4915325,1.6542533 8.3846231,2.3479287 8.1875,3 7.9662603,3.8420605 7.7522058,4.7006473 7.625,5.5625 7.6044,5.8106582 7.7926492,5.8644805 8.03125,5.625 8.8564261,4.8565483 9.6689927,4.0447405 10.46875,3.25 10.66307,3.0435127 10.857947,2.8397801 11,2.59375 c 0.22114,-0.3696454 0.325018,-0.8581921 0.09375,-1.25 -0.238762,-0.3960416 -0.675926,-0.6652283 -1.125,-0.75 -0.1037376,-0.0197567 -0.2116756,-0.015 [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="m 9.65625,0.59375 c -0.3024732,0.0462641 -0.5739493,0.24857188 -0.75,0.5 C 8.4915325,1.6542533 8.3846231,2.3479287 8.1875,3 7.9662603,3.8420605 7.7522058,4.7006473 7.625,5.5625 7.6044,5.8106582 7.7926492,5.8644805 8.03125,5.625 8.8564261,4.8565483 9.6689927,4.0447405 10.46875,3.25 10.66307,3.0435127 10.857947,2.8397801 11,2.59375 c 0.22114,-0.3696454 0.325018,-0.8581921 0.09375,-1.25 -0.238762,-0.3960416 -0.675926,-0.6652283 -1.125,-0.75 -0.1037376,-0.0197567 -0.2116756,-0.015 [...]
 </svg>
diff --git a/symbols/waste_basket.10.svg b/symbols/waste_basket.10.svg
index cfb8bb2..ebdfeda 100644
--- a/symbols/waste_basket.10.svg
+++ b/symbols/waste_basket.10.svg
@@ -8,8 +8,8 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
+   width="10"
+   height="10"
    viewBox="0 0 10 10"
    id="svg2">
   <metadata
diff --git a/symbols/water_park.16.svg b/symbols/water_park.svg
similarity index 86%
rename from symbols/water_park.16.svg
rename to symbols/water_park.svg
index 5eb818a..d112430 100644
--- a/symbols/water_park.16.svg
+++ b/symbols/water_park.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 8.28125,1.90625 C 8.1873095,1.9137211 8.0966058,1.9442246 8,2 L 4.96875,3.625 C 4.58422,3.807 4.4339,4.37715 4.6875,4.71875 L 5.5,6 2,8 2.03125,8.625 C 2.03125,8.625 2.4991574,8.25 3,8.25 3.4737861,8.25 4.4232286,9 5,9 5.5033641,9 6.4961991,8.25 7,8.25 7.5243377,8.25 8.4756623,9 9,9 L 9.34375,9 6.5,4.5 8.59375,3.40625 C 9.041742,3.1476017 9.186529,2.6980781 9,2.375 8.8279386,2.0769809 8.5630716,1.8838367 8.28125,1.90625 z M 10,4.5 C 9.17157,4.5 8.5,5.1716 8.5,6 8.5,6.8284 9. [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 8.28125,1.90625 C 8.1873095,1.9137211 8.0966058,1.9442246 8,2 L 4.96875,3.625 C 4.58422,3.807 4.4339,4.37715 4.6875,4.71875 L 5.5,6 2,8 2.03125,8.625 C 2.03125,8.625 2.4991574,8.25 3,8.25 3.4737861,8.25 4.4232286,9 5,9 5.5033641,9 6.4961991,8.25 7,8.25 7.5243377,8.25 8.4756623,9 9,9 L 9.34375,9 6.5,4.5 8.59375,3.40625 C 9.041742,3.1476017 9.186529,2.6980781 9,2.375 8.8279386,2.0769809 8.5630716,1.8838367 8.28125,1.90625 z M 10,4.5 C 9.17157,4.5 8.5,5.1716 8.5,6 8.5,6.8284 9. [...]
 </svg>
diff --git a/symbols/water_tower.16.svg b/symbols/water_tower.svg
similarity index 86%
rename from symbols/water_tower.16.svg
rename to symbols/water_tower.svg
index f6cf283..d373eb3 100644
--- a/symbols/water_tower.16.svg
+++ b/symbols/water_tower.svg
@@ -8,9 +8,9 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
    id="svg2">
   <metadata
      id="metadata8">
@@ -27,15 +27,13 @@
   <defs
      id="defs6" />
   <rect
-     width="16"
-     height="16"
+     width="14"
+     height="14"
      x="0"
      y="0"
      id="canvas"
      style="fill:none;stroke:none;visibility:hidden" />
   <path
      d="M 2,0 2,3.5 C 2,4.9469172 2.7905512,5.9802716 3.90625,6.625 L 3,14 4.5,14 4.6875,12.53125 7,11 9.3125,12.5625 9.5,14 11,14 10.09375,6.65625 C 11.21821,6.0132746 12,4.9628112 12,3.5 l 0,-3.5 -1.5,0 0,1.5 -0.5,0 C 8.8728814,2 8,2 7,1.5 6,1 5.0381356,1 4,1.5 l -0.5,0 0,-1.5 z m 3.34375,7.1875 c 1.069224,0.2671613 2.2426846,0.2935662 3.3125,0.03125 L 8.84375,8.78125 7,10 5.15625,8.78125 z m -0.3125,2.5 L 6.25,10.5 4.8125,11.46875 z m 3.9375,0 L 9.1875,11.46875 7.75,10.5 z"
-     transform="translate(1,1)"
-     id="water-tower"
-     style="fill:#000000;fill-opacity:1;stroke:none" />
+     id="water-tower" />
 </svg>
diff --git a/symbols/windmill.16.svg b/symbols/windmill.svg
similarity index 80%
rename from symbols/windmill.16.svg
rename to symbols/windmill.svg
index 764607c..0ec2715 100644
--- a/symbols/windmill.16.svg
+++ b/symbols/windmill.svg
@@ -1,4 +1,4 @@
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="14" height="14" viewBox="0 0 14 14" id="svg2">
   <metadata id="metadata8">
     <rdf:RDF>
       <cc:Work rdf:about="">
@@ -9,6 +9,6 @@
     </rdf:RDF>
   </metadata>
   <defs id="defs6"/>
-  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
-  <path d="M 2.71875,0 1,1.71875 5.96875,6 1,10.28125 2.71875,12 7,7.03125 11.28125,12 13,10.28125 8.03125,6 13,1.71875 11.28125,0 7,4.96875 2.71875,0 z M 7,2 C 6.5846058,2 6.2371923,2.0902004 5.9375,2.21875 L 7,3.4375 8.0625,2.21875 C 7.7644902,2.0832701 7.4104059,2 7,2 z M 7,5.5 C 7.2761424,5.5 7.5,5.7238576 7.5,6 7.5,6.2761424 7.2761424,6.5 7,6.5 6.7238576,6.5 6.5,6.2761424 6.5,6 6.5,5.7238576 6.7238576,5.5 7,5.5 z M 4.1875,5.78125 4.15625,6.25 4.4375,6 4.1875,5.78125 z m 5.625,0 L 9. [...]
+  <rect width="14" height="14" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 2.71875,0 1,1.71875 5.96875,6 1,10.28125 2.71875,12 7,7.03125 11.28125,12 13,10.28125 8.03125,6 13,1.71875 11.28125,0 7,4.96875 2.71875,0 z M 7,2 C 6.5846058,2 6.2371923,2.0902004 5.9375,2.21875 L 7,3.4375 8.0625,2.21875 C 7.7644902,2.0832701 7.4104059,2 7,2 z M 7,5.5 C 7.2761424,5.5 7.5,5.7238576 7.5,6 7.5,6.2761424 7.2761424,6.5 7,6.5 6.7238576,6.5 6.5,6.2761424 6.5,6 6.5,5.7238576 6.7238576,5.5 7,5.5 z M 4.1875,5.78125 4.15625,6.25 4.4375,6 4.1875,5.78125 z m 5.625,0 L 9. [...]
 </svg>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git



More information about the Pkg-grass-devel mailing list