[openstreetmap-carto] 01/03: Imported Upstream version 3.3.0
Bas Couwenberg
sebastic at debian.org
Wed May 10 16:11:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit 28a847a708583c3f1a6f55626ca705caefa3ce7e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed May 10 18:09:19 2017 +0200
Imported Upstream version 3.3.0
---
CHANGELOG.md | 9 +-
CONTRIBUTING.md | 36 +++
INSTALL.md | 5 +-
amenity-points.mss | 551 ++++++++++++---------------------
style.mss => fonts.mss | 15 +-
landcover.mss | 6 +-
project.mml | 45 +--
roads.mss | 58 ++--
scripts/generate_shields.py | 13 +-
style.mss | 270 ----------------
symbols/cliff.png | Bin 360 -> 0 bytes
symbols/cliff.svg | 38 +++
symbols/cliff2.png | Bin 379 -> 0 bytes
symbols/cliff2.svg | 39 +++
symbols/embankment.png | Bin 351 -> 0 bytes
symbols/embankment.svg | 38 +++
symbols/shields/motorway_10x1.svg | 4 +-
symbols/shields/motorway_10x1_z16.svg | 4 +-
symbols/shields/motorway_10x1_z18.svg | 4 +-
symbols/shields/motorway_10x2.svg | 4 +-
symbols/shields/motorway_10x2_z16.svg | 4 +-
symbols/shields/motorway_10x2_z18.svg | 4 +-
symbols/shields/motorway_10x3.svg | 4 +-
symbols/shields/motorway_10x3_z16.svg | 4 +-
symbols/shields/motorway_10x3_z18.svg | 4 +-
symbols/shields/motorway_10x4.svg | 4 +-
symbols/shields/motorway_10x4_z16.svg | 4 +-
symbols/shields/motorway_10x4_z18.svg | 4 +-
symbols/shields/motorway_11x1.svg | 4 +-
symbols/shields/motorway_11x1_z16.svg | 4 +-
symbols/shields/motorway_11x1_z18.svg | 4 +-
symbols/shields/motorway_11x2.svg | 4 +-
symbols/shields/motorway_11x2_z16.svg | 4 +-
symbols/shields/motorway_11x2_z18.svg | 4 +-
symbols/shields/motorway_11x3.svg | 4 +-
symbols/shields/motorway_11x3_z16.svg | 4 +-
symbols/shields/motorway_11x3_z18.svg | 4 +-
symbols/shields/motorway_11x4.svg | 4 +-
symbols/shields/motorway_11x4_z16.svg | 4 +-
symbols/shields/motorway_11x4_z18.svg | 4 +-
symbols/shields/motorway_1x1.svg | 4 +-
symbols/shields/motorway_1x1_z16.svg | 4 +-
symbols/shields/motorway_1x1_z18.svg | 4 +-
symbols/shields/motorway_1x2.svg | 4 +-
symbols/shields/motorway_1x2_z16.svg | 4 +-
symbols/shields/motorway_1x2_z18.svg | 4 +-
symbols/shields/motorway_1x3.svg | 4 +-
symbols/shields/motorway_1x3_z16.svg | 4 +-
symbols/shields/motorway_1x3_z18.svg | 4 +-
symbols/shields/motorway_1x4.svg | 4 +-
symbols/shields/motorway_1x4_z16.svg | 4 +-
symbols/shields/motorway_1x4_z18.svg | 4 +-
symbols/shields/motorway_2x1.svg | 4 +-
symbols/shields/motorway_2x1_z16.svg | 4 +-
symbols/shields/motorway_2x1_z18.svg | 4 +-
symbols/shields/motorway_2x2.svg | 4 +-
symbols/shields/motorway_2x2_z16.svg | 4 +-
symbols/shields/motorway_2x2_z18.svg | 4 +-
symbols/shields/motorway_2x3.svg | 4 +-
symbols/shields/motorway_2x3_z16.svg | 4 +-
symbols/shields/motorway_2x3_z18.svg | 4 +-
symbols/shields/motorway_2x4.svg | 4 +-
symbols/shields/motorway_2x4_z16.svg | 4 +-
symbols/shields/motorway_2x4_z18.svg | 4 +-
symbols/shields/motorway_3x1.svg | 4 +-
symbols/shields/motorway_3x1_z16.svg | 4 +-
symbols/shields/motorway_3x1_z18.svg | 4 +-
symbols/shields/motorway_3x2.svg | 4 +-
symbols/shields/motorway_3x2_z16.svg | 4 +-
symbols/shields/motorway_3x2_z18.svg | 4 +-
symbols/shields/motorway_3x3.svg | 4 +-
symbols/shields/motorway_3x3_z16.svg | 4 +-
symbols/shields/motorway_3x3_z18.svg | 4 +-
symbols/shields/motorway_3x4.svg | 4 +-
symbols/shields/motorway_3x4_z16.svg | 4 +-
symbols/shields/motorway_3x4_z18.svg | 4 +-
symbols/shields/motorway_4x1.svg | 4 +-
symbols/shields/motorway_4x1_z16.svg | 4 +-
symbols/shields/motorway_4x1_z18.svg | 4 +-
symbols/shields/motorway_4x2.svg | 4 +-
symbols/shields/motorway_4x2_z16.svg | 4 +-
symbols/shields/motorway_4x2_z18.svg | 4 +-
symbols/shields/motorway_4x3.svg | 4 +-
symbols/shields/motorway_4x3_z16.svg | 4 +-
symbols/shields/motorway_4x3_z18.svg | 4 +-
symbols/shields/motorway_4x4.svg | 4 +-
symbols/shields/motorway_4x4_z16.svg | 4 +-
symbols/shields/motorway_4x4_z18.svg | 4 +-
symbols/shields/motorway_5x1.svg | 4 +-
symbols/shields/motorway_5x1_z16.svg | 4 +-
symbols/shields/motorway_5x1_z18.svg | 4 +-
symbols/shields/motorway_5x2.svg | 4 +-
symbols/shields/motorway_5x2_z16.svg | 4 +-
symbols/shields/motorway_5x2_z18.svg | 4 +-
symbols/shields/motorway_5x3.svg | 4 +-
symbols/shields/motorway_5x3_z16.svg | 4 +-
symbols/shields/motorway_5x3_z18.svg | 4 +-
symbols/shields/motorway_5x4.svg | 4 +-
symbols/shields/motorway_5x4_z16.svg | 4 +-
symbols/shields/motorway_5x4_z18.svg | 4 +-
symbols/shields/motorway_6x1.svg | 4 +-
symbols/shields/motorway_6x1_z16.svg | 4 +-
symbols/shields/motorway_6x1_z18.svg | 4 +-
symbols/shields/motorway_6x2.svg | 4 +-
symbols/shields/motorway_6x2_z16.svg | 4 +-
symbols/shields/motorway_6x2_z18.svg | 4 +-
symbols/shields/motorway_6x3.svg | 4 +-
symbols/shields/motorway_6x3_z16.svg | 4 +-
symbols/shields/motorway_6x3_z18.svg | 4 +-
symbols/shields/motorway_6x4.svg | 4 +-
symbols/shields/motorway_6x4_z16.svg | 4 +-
symbols/shields/motorway_6x4_z18.svg | 4 +-
symbols/shields/motorway_7x1.svg | 4 +-
symbols/shields/motorway_7x1_z16.svg | 4 +-
symbols/shields/motorway_7x1_z18.svg | 4 +-
symbols/shields/motorway_7x2.svg | 4 +-
symbols/shields/motorway_7x2_z16.svg | 4 +-
symbols/shields/motorway_7x2_z18.svg | 4 +-
symbols/shields/motorway_7x3.svg | 4 +-
symbols/shields/motorway_7x3_z16.svg | 4 +-
symbols/shields/motorway_7x3_z18.svg | 4 +-
symbols/shields/motorway_7x4.svg | 4 +-
symbols/shields/motorway_7x4_z16.svg | 4 +-
symbols/shields/motorway_7x4_z18.svg | 4 +-
symbols/shields/motorway_8x1.svg | 4 +-
symbols/shields/motorway_8x1_z16.svg | 4 +-
symbols/shields/motorway_8x1_z18.svg | 4 +-
symbols/shields/motorway_8x2.svg | 4 +-
symbols/shields/motorway_8x2_z16.svg | 4 +-
symbols/shields/motorway_8x2_z18.svg | 4 +-
symbols/shields/motorway_8x3.svg | 4 +-
symbols/shields/motorway_8x3_z16.svg | 4 +-
symbols/shields/motorway_8x3_z18.svg | 4 +-
symbols/shields/motorway_8x4.svg | 4 +-
symbols/shields/motorway_8x4_z16.svg | 4 +-
symbols/shields/motorway_8x4_z18.svg | 4 +-
symbols/shields/motorway_9x1.svg | 4 +-
symbols/shields/motorway_9x1_z16.svg | 4 +-
symbols/shields/motorway_9x1_z18.svg | 4 +-
symbols/shields/motorway_9x2.svg | 4 +-
symbols/shields/motorway_9x2_z16.svg | 4 +-
symbols/shields/motorway_9x2_z18.svg | 4 +-
symbols/shields/motorway_9x3.svg | 4 +-
symbols/shields/motorway_9x3_z16.svg | 4 +-
symbols/shields/motorway_9x3_z18.svg | 4 +-
symbols/shields/motorway_9x4.svg | 4 +-
symbols/shields/motorway_9x4_z16.svg | 4 +-
symbols/shields/motorway_9x4_z18.svg | 4 +-
symbols/shields/primary_10x1.svg | 4 +-
symbols/shields/primary_10x1_z16.svg | 4 +-
symbols/shields/primary_10x1_z18.svg | 4 +-
symbols/shields/primary_10x2.svg | 4 +-
symbols/shields/primary_10x2_z16.svg | 4 +-
symbols/shields/primary_10x2_z18.svg | 4 +-
symbols/shields/primary_10x3.svg | 4 +-
symbols/shields/primary_10x3_z16.svg | 4 +-
symbols/shields/primary_10x3_z18.svg | 4 +-
symbols/shields/primary_10x4.svg | 4 +-
symbols/shields/primary_10x4_z16.svg | 4 +-
symbols/shields/primary_10x4_z18.svg | 4 +-
symbols/shields/primary_11x1.svg | 4 +-
symbols/shields/primary_11x1_z16.svg | 4 +-
symbols/shields/primary_11x1_z18.svg | 4 +-
symbols/shields/primary_11x2.svg | 4 +-
symbols/shields/primary_11x2_z16.svg | 4 +-
symbols/shields/primary_11x2_z18.svg | 4 +-
symbols/shields/primary_11x3.svg | 4 +-
symbols/shields/primary_11x3_z16.svg | 4 +-
symbols/shields/primary_11x3_z18.svg | 4 +-
symbols/shields/primary_11x4.svg | 4 +-
symbols/shields/primary_11x4_z16.svg | 4 +-
symbols/shields/primary_11x4_z18.svg | 4 +-
symbols/shields/primary_1x1.svg | 4 +-
symbols/shields/primary_1x1_z16.svg | 4 +-
symbols/shields/primary_1x1_z18.svg | 4 +-
symbols/shields/primary_1x2.svg | 4 +-
symbols/shields/primary_1x2_z16.svg | 4 +-
symbols/shields/primary_1x2_z18.svg | 4 +-
symbols/shields/primary_1x3.svg | 4 +-
symbols/shields/primary_1x3_z16.svg | 4 +-
symbols/shields/primary_1x3_z18.svg | 4 +-
symbols/shields/primary_1x4.svg | 4 +-
symbols/shields/primary_1x4_z16.svg | 4 +-
symbols/shields/primary_1x4_z18.svg | 4 +-
symbols/shields/primary_2x1.svg | 4 +-
symbols/shields/primary_2x1_z16.svg | 4 +-
symbols/shields/primary_2x1_z18.svg | 4 +-
symbols/shields/primary_2x2.svg | 4 +-
symbols/shields/primary_2x2_z16.svg | 4 +-
symbols/shields/primary_2x2_z18.svg | 4 +-
symbols/shields/primary_2x3.svg | 4 +-
symbols/shields/primary_2x3_z16.svg | 4 +-
symbols/shields/primary_2x3_z18.svg | 4 +-
symbols/shields/primary_2x4.svg | 4 +-
symbols/shields/primary_2x4_z16.svg | 4 +-
symbols/shields/primary_2x4_z18.svg | 4 +-
symbols/shields/primary_3x1.svg | 4 +-
symbols/shields/primary_3x1_z16.svg | 4 +-
symbols/shields/primary_3x1_z18.svg | 4 +-
symbols/shields/primary_3x2.svg | 4 +-
symbols/shields/primary_3x2_z16.svg | 4 +-
symbols/shields/primary_3x2_z18.svg | 4 +-
symbols/shields/primary_3x3.svg | 4 +-
symbols/shields/primary_3x3_z16.svg | 4 +-
symbols/shields/primary_3x3_z18.svg | 4 +-
symbols/shields/primary_3x4.svg | 4 +-
symbols/shields/primary_3x4_z16.svg | 4 +-
symbols/shields/primary_3x4_z18.svg | 4 +-
symbols/shields/primary_4x1.svg | 4 +-
symbols/shields/primary_4x1_z16.svg | 4 +-
symbols/shields/primary_4x1_z18.svg | 4 +-
symbols/shields/primary_4x2.svg | 4 +-
symbols/shields/primary_4x2_z16.svg | 4 +-
symbols/shields/primary_4x2_z18.svg | 4 +-
symbols/shields/primary_4x3.svg | 4 +-
symbols/shields/primary_4x3_z16.svg | 4 +-
symbols/shields/primary_4x3_z18.svg | 4 +-
symbols/shields/primary_4x4.svg | 4 +-
symbols/shields/primary_4x4_z16.svg | 4 +-
symbols/shields/primary_4x4_z18.svg | 4 +-
symbols/shields/primary_5x1.svg | 4 +-
symbols/shields/primary_5x1_z16.svg | 4 +-
symbols/shields/primary_5x1_z18.svg | 4 +-
symbols/shields/primary_5x2.svg | 4 +-
symbols/shields/primary_5x2_z16.svg | 4 +-
symbols/shields/primary_5x2_z18.svg | 4 +-
symbols/shields/primary_5x3.svg | 4 +-
symbols/shields/primary_5x3_z16.svg | 4 +-
symbols/shields/primary_5x3_z18.svg | 4 +-
symbols/shields/primary_5x4.svg | 4 +-
symbols/shields/primary_5x4_z16.svg | 4 +-
symbols/shields/primary_5x4_z18.svg | 4 +-
symbols/shields/primary_6x1.svg | 4 +-
symbols/shields/primary_6x1_z16.svg | 4 +-
symbols/shields/primary_6x1_z18.svg | 4 +-
symbols/shields/primary_6x2.svg | 4 +-
symbols/shields/primary_6x2_z16.svg | 4 +-
symbols/shields/primary_6x2_z18.svg | 4 +-
symbols/shields/primary_6x3.svg | 4 +-
symbols/shields/primary_6x3_z16.svg | 4 +-
symbols/shields/primary_6x3_z18.svg | 4 +-
symbols/shields/primary_6x4.svg | 4 +-
symbols/shields/primary_6x4_z16.svg | 4 +-
symbols/shields/primary_6x4_z18.svg | 4 +-
symbols/shields/primary_7x1.svg | 4 +-
symbols/shields/primary_7x1_z16.svg | 4 +-
symbols/shields/primary_7x1_z18.svg | 4 +-
symbols/shields/primary_7x2.svg | 4 +-
symbols/shields/primary_7x2_z16.svg | 4 +-
symbols/shields/primary_7x2_z18.svg | 4 +-
symbols/shields/primary_7x3.svg | 4 +-
symbols/shields/primary_7x3_z16.svg | 4 +-
symbols/shields/primary_7x3_z18.svg | 4 +-
symbols/shields/primary_7x4.svg | 4 +-
symbols/shields/primary_7x4_z16.svg | 4 +-
symbols/shields/primary_7x4_z18.svg | 4 +-
symbols/shields/primary_8x1.svg | 4 +-
symbols/shields/primary_8x1_z16.svg | 4 +-
symbols/shields/primary_8x1_z18.svg | 4 +-
symbols/shields/primary_8x2.svg | 4 +-
symbols/shields/primary_8x2_z16.svg | 4 +-
symbols/shields/primary_8x2_z18.svg | 4 +-
symbols/shields/primary_8x3.svg | 4 +-
symbols/shields/primary_8x3_z16.svg | 4 +-
symbols/shields/primary_8x3_z18.svg | 4 +-
symbols/shields/primary_8x4.svg | 4 +-
symbols/shields/primary_8x4_z16.svg | 4 +-
symbols/shields/primary_8x4_z18.svg | 4 +-
symbols/shields/primary_9x1.svg | 4 +-
symbols/shields/primary_9x1_z16.svg | 4 +-
symbols/shields/primary_9x1_z18.svg | 4 +-
symbols/shields/primary_9x2.svg | 4 +-
symbols/shields/primary_9x2_z16.svg | 4 +-
symbols/shields/primary_9x2_z18.svg | 4 +-
symbols/shields/primary_9x3.svg | 4 +-
symbols/shields/primary_9x3_z16.svg | 4 +-
symbols/shields/primary_9x3_z18.svg | 4 +-
symbols/shields/primary_9x4.svg | 4 +-
symbols/shields/primary_9x4_z16.svg | 4 +-
symbols/shields/primary_9x4_z18.svg | 4 +-
symbols/shields/secondary_10x1.svg | 4 +-
symbols/shields/secondary_10x1_z16.svg | 4 +-
symbols/shields/secondary_10x1_z18.svg | 4 +-
symbols/shields/secondary_10x2.svg | 4 +-
symbols/shields/secondary_10x2_z16.svg | 4 +-
symbols/shields/secondary_10x2_z18.svg | 4 +-
symbols/shields/secondary_10x3.svg | 4 +-
symbols/shields/secondary_10x3_z16.svg | 4 +-
symbols/shields/secondary_10x3_z18.svg | 4 +-
symbols/shields/secondary_10x4.svg | 4 +-
symbols/shields/secondary_10x4_z16.svg | 4 +-
symbols/shields/secondary_10x4_z18.svg | 4 +-
symbols/shields/secondary_11x1.svg | 4 +-
symbols/shields/secondary_11x1_z16.svg | 4 +-
symbols/shields/secondary_11x1_z18.svg | 4 +-
symbols/shields/secondary_11x2.svg | 4 +-
symbols/shields/secondary_11x2_z16.svg | 4 +-
symbols/shields/secondary_11x2_z18.svg | 4 +-
symbols/shields/secondary_11x3.svg | 4 +-
symbols/shields/secondary_11x3_z16.svg | 4 +-
symbols/shields/secondary_11x3_z18.svg | 4 +-
symbols/shields/secondary_11x4.svg | 4 +-
symbols/shields/secondary_11x4_z16.svg | 4 +-
symbols/shields/secondary_11x4_z18.svg | 4 +-
symbols/shields/secondary_1x1.svg | 4 +-
symbols/shields/secondary_1x1_z16.svg | 4 +-
symbols/shields/secondary_1x1_z18.svg | 4 +-
symbols/shields/secondary_1x2.svg | 4 +-
symbols/shields/secondary_1x2_z16.svg | 4 +-
symbols/shields/secondary_1x2_z18.svg | 4 +-
symbols/shields/secondary_1x3.svg | 4 +-
symbols/shields/secondary_1x3_z16.svg | 4 +-
symbols/shields/secondary_1x3_z18.svg | 4 +-
symbols/shields/secondary_1x4.svg | 4 +-
symbols/shields/secondary_1x4_z16.svg | 4 +-
symbols/shields/secondary_1x4_z18.svg | 4 +-
symbols/shields/secondary_2x1.svg | 4 +-
symbols/shields/secondary_2x1_z16.svg | 4 +-
symbols/shields/secondary_2x1_z18.svg | 4 +-
symbols/shields/secondary_2x2.svg | 4 +-
symbols/shields/secondary_2x2_z16.svg | 4 +-
symbols/shields/secondary_2x2_z18.svg | 4 +-
symbols/shields/secondary_2x3.svg | 4 +-
symbols/shields/secondary_2x3_z16.svg | 4 +-
symbols/shields/secondary_2x3_z18.svg | 4 +-
symbols/shields/secondary_2x4.svg | 4 +-
symbols/shields/secondary_2x4_z16.svg | 4 +-
symbols/shields/secondary_2x4_z18.svg | 4 +-
symbols/shields/secondary_3x1.svg | 4 +-
symbols/shields/secondary_3x1_z16.svg | 4 +-
symbols/shields/secondary_3x1_z18.svg | 4 +-
symbols/shields/secondary_3x2.svg | 4 +-
symbols/shields/secondary_3x2_z16.svg | 4 +-
symbols/shields/secondary_3x2_z18.svg | 4 +-
symbols/shields/secondary_3x3.svg | 4 +-
symbols/shields/secondary_3x3_z16.svg | 4 +-
symbols/shields/secondary_3x3_z18.svg | 4 +-
symbols/shields/secondary_3x4.svg | 4 +-
symbols/shields/secondary_3x4_z16.svg | 4 +-
symbols/shields/secondary_3x4_z18.svg | 4 +-
symbols/shields/secondary_4x1.svg | 4 +-
symbols/shields/secondary_4x1_z16.svg | 4 +-
symbols/shields/secondary_4x1_z18.svg | 4 +-
symbols/shields/secondary_4x2.svg | 4 +-
symbols/shields/secondary_4x2_z16.svg | 4 +-
symbols/shields/secondary_4x2_z18.svg | 4 +-
symbols/shields/secondary_4x3.svg | 4 +-
symbols/shields/secondary_4x3_z16.svg | 4 +-
symbols/shields/secondary_4x3_z18.svg | 4 +-
symbols/shields/secondary_4x4.svg | 4 +-
symbols/shields/secondary_4x4_z16.svg | 4 +-
symbols/shields/secondary_4x4_z18.svg | 4 +-
symbols/shields/secondary_5x1.svg | 4 +-
symbols/shields/secondary_5x1_z16.svg | 4 +-
symbols/shields/secondary_5x1_z18.svg | 4 +-
symbols/shields/secondary_5x2.svg | 4 +-
symbols/shields/secondary_5x2_z16.svg | 4 +-
symbols/shields/secondary_5x2_z18.svg | 4 +-
symbols/shields/secondary_5x3.svg | 4 +-
symbols/shields/secondary_5x3_z16.svg | 4 +-
symbols/shields/secondary_5x3_z18.svg | 4 +-
symbols/shields/secondary_5x4.svg | 4 +-
symbols/shields/secondary_5x4_z16.svg | 4 +-
symbols/shields/secondary_5x4_z18.svg | 4 +-
symbols/shields/secondary_6x1.svg | 4 +-
symbols/shields/secondary_6x1_z16.svg | 4 +-
symbols/shields/secondary_6x1_z18.svg | 4 +-
symbols/shields/secondary_6x2.svg | 4 +-
symbols/shields/secondary_6x2_z16.svg | 4 +-
symbols/shields/secondary_6x2_z18.svg | 4 +-
symbols/shields/secondary_6x3.svg | 4 +-
symbols/shields/secondary_6x3_z16.svg | 4 +-
symbols/shields/secondary_6x3_z18.svg | 4 +-
symbols/shields/secondary_6x4.svg | 4 +-
symbols/shields/secondary_6x4_z16.svg | 4 +-
symbols/shields/secondary_6x4_z18.svg | 4 +-
symbols/shields/secondary_7x1.svg | 4 +-
symbols/shields/secondary_7x1_z16.svg | 4 +-
symbols/shields/secondary_7x1_z18.svg | 4 +-
symbols/shields/secondary_7x2.svg | 4 +-
symbols/shields/secondary_7x2_z16.svg | 4 +-
symbols/shields/secondary_7x2_z18.svg | 4 +-
symbols/shields/secondary_7x3.svg | 4 +-
symbols/shields/secondary_7x3_z16.svg | 4 +-
symbols/shields/secondary_7x3_z18.svg | 4 +-
symbols/shields/secondary_7x4.svg | 4 +-
symbols/shields/secondary_7x4_z16.svg | 4 +-
symbols/shields/secondary_7x4_z18.svg | 4 +-
symbols/shields/secondary_8x1.svg | 4 +-
symbols/shields/secondary_8x1_z16.svg | 4 +-
symbols/shields/secondary_8x1_z18.svg | 4 +-
symbols/shields/secondary_8x2.svg | 4 +-
symbols/shields/secondary_8x2_z16.svg | 4 +-
symbols/shields/secondary_8x2_z18.svg | 4 +-
symbols/shields/secondary_8x3.svg | 4 +-
symbols/shields/secondary_8x3_z16.svg | 4 +-
symbols/shields/secondary_8x3_z18.svg | 4 +-
symbols/shields/secondary_8x4.svg | 4 +-
symbols/shields/secondary_8x4_z16.svg | 4 +-
symbols/shields/secondary_8x4_z18.svg | 4 +-
symbols/shields/secondary_9x1.svg | 4 +-
symbols/shields/secondary_9x1_z16.svg | 4 +-
symbols/shields/secondary_9x1_z18.svg | 4 +-
symbols/shields/secondary_9x2.svg | 4 +-
symbols/shields/secondary_9x2_z16.svg | 4 +-
symbols/shields/secondary_9x2_z18.svg | 4 +-
symbols/shields/secondary_9x3.svg | 4 +-
symbols/shields/secondary_9x3_z16.svg | 4 +-
symbols/shields/secondary_9x3_z18.svg | 4 +-
symbols/shields/secondary_9x4.svg | 4 +-
symbols/shields/secondary_9x4_z16.svg | 4 +-
symbols/shields/secondary_9x4_z18.svg | 4 +-
symbols/shields/tertiary_10x1.svg | 4 +-
symbols/shields/tertiary_10x1_z16.svg | 4 +-
symbols/shields/tertiary_10x1_z18.svg | 4 +-
symbols/shields/tertiary_10x2.svg | 4 +-
symbols/shields/tertiary_10x2_z16.svg | 4 +-
symbols/shields/tertiary_10x2_z18.svg | 4 +-
symbols/shields/tertiary_10x3.svg | 4 +-
symbols/shields/tertiary_10x3_z16.svg | 4 +-
symbols/shields/tertiary_10x3_z18.svg | 4 +-
symbols/shields/tertiary_10x4.svg | 4 +-
symbols/shields/tertiary_10x4_z16.svg | 4 +-
symbols/shields/tertiary_10x4_z18.svg | 4 +-
symbols/shields/tertiary_11x1.svg | 4 +-
symbols/shields/tertiary_11x1_z16.svg | 4 +-
symbols/shields/tertiary_11x1_z18.svg | 4 +-
symbols/shields/tertiary_11x2.svg | 4 +-
symbols/shields/tertiary_11x2_z16.svg | 4 +-
symbols/shields/tertiary_11x2_z18.svg | 4 +-
symbols/shields/tertiary_11x3.svg | 4 +-
symbols/shields/tertiary_11x3_z16.svg | 4 +-
symbols/shields/tertiary_11x3_z18.svg | 4 +-
symbols/shields/tertiary_11x4.svg | 4 +-
symbols/shields/tertiary_11x4_z16.svg | 4 +-
symbols/shields/tertiary_11x4_z18.svg | 4 +-
symbols/shields/tertiary_1x1.svg | 4 +-
symbols/shields/tertiary_1x1_z16.svg | 4 +-
symbols/shields/tertiary_1x1_z18.svg | 4 +-
symbols/shields/tertiary_1x2.svg | 4 +-
symbols/shields/tertiary_1x2_z16.svg | 4 +-
symbols/shields/tertiary_1x2_z18.svg | 4 +-
symbols/shields/tertiary_1x3.svg | 4 +-
symbols/shields/tertiary_1x3_z16.svg | 4 +-
symbols/shields/tertiary_1x3_z18.svg | 4 +-
symbols/shields/tertiary_1x4.svg | 4 +-
symbols/shields/tertiary_1x4_z16.svg | 4 +-
symbols/shields/tertiary_1x4_z18.svg | 4 +-
symbols/shields/tertiary_2x1.svg | 4 +-
symbols/shields/tertiary_2x1_z16.svg | 4 +-
symbols/shields/tertiary_2x1_z18.svg | 4 +-
symbols/shields/tertiary_2x2.svg | 4 +-
symbols/shields/tertiary_2x2_z16.svg | 4 +-
symbols/shields/tertiary_2x2_z18.svg | 4 +-
symbols/shields/tertiary_2x3.svg | 4 +-
symbols/shields/tertiary_2x3_z16.svg | 4 +-
symbols/shields/tertiary_2x3_z18.svg | 4 +-
symbols/shields/tertiary_2x4.svg | 4 +-
symbols/shields/tertiary_2x4_z16.svg | 4 +-
symbols/shields/tertiary_2x4_z18.svg | 4 +-
symbols/shields/tertiary_3x1.svg | 4 +-
symbols/shields/tertiary_3x1_z16.svg | 4 +-
symbols/shields/tertiary_3x1_z18.svg | 4 +-
symbols/shields/tertiary_3x2.svg | 4 +-
symbols/shields/tertiary_3x2_z16.svg | 4 +-
symbols/shields/tertiary_3x2_z18.svg | 4 +-
symbols/shields/tertiary_3x3.svg | 4 +-
symbols/shields/tertiary_3x3_z16.svg | 4 +-
symbols/shields/tertiary_3x3_z18.svg | 4 +-
symbols/shields/tertiary_3x4.svg | 4 +-
symbols/shields/tertiary_3x4_z16.svg | 4 +-
symbols/shields/tertiary_3x4_z18.svg | 4 +-
symbols/shields/tertiary_4x1.svg | 4 +-
symbols/shields/tertiary_4x1_z16.svg | 4 +-
symbols/shields/tertiary_4x1_z18.svg | 4 +-
symbols/shields/tertiary_4x2.svg | 4 +-
symbols/shields/tertiary_4x2_z16.svg | 4 +-
symbols/shields/tertiary_4x2_z18.svg | 4 +-
symbols/shields/tertiary_4x3.svg | 4 +-
symbols/shields/tertiary_4x3_z16.svg | 4 +-
symbols/shields/tertiary_4x3_z18.svg | 4 +-
symbols/shields/tertiary_4x4.svg | 4 +-
symbols/shields/tertiary_4x4_z16.svg | 4 +-
symbols/shields/tertiary_4x4_z18.svg | 4 +-
symbols/shields/tertiary_5x1.svg | 4 +-
symbols/shields/tertiary_5x1_z16.svg | 4 +-
symbols/shields/tertiary_5x1_z18.svg | 4 +-
symbols/shields/tertiary_5x2.svg | 4 +-
symbols/shields/tertiary_5x2_z16.svg | 4 +-
symbols/shields/tertiary_5x2_z18.svg | 4 +-
symbols/shields/tertiary_5x3.svg | 4 +-
symbols/shields/tertiary_5x3_z16.svg | 4 +-
symbols/shields/tertiary_5x3_z18.svg | 4 +-
symbols/shields/tertiary_5x4.svg | 4 +-
symbols/shields/tertiary_5x4_z16.svg | 4 +-
symbols/shields/tertiary_5x4_z18.svg | 4 +-
symbols/shields/tertiary_6x1.svg | 4 +-
symbols/shields/tertiary_6x1_z16.svg | 4 +-
symbols/shields/tertiary_6x1_z18.svg | 4 +-
symbols/shields/tertiary_6x2.svg | 4 +-
symbols/shields/tertiary_6x2_z16.svg | 4 +-
symbols/shields/tertiary_6x2_z18.svg | 4 +-
symbols/shields/tertiary_6x3.svg | 4 +-
symbols/shields/tertiary_6x3_z16.svg | 4 +-
symbols/shields/tertiary_6x3_z18.svg | 4 +-
symbols/shields/tertiary_6x4.svg | 4 +-
symbols/shields/tertiary_6x4_z16.svg | 4 +-
symbols/shields/tertiary_6x4_z18.svg | 4 +-
symbols/shields/tertiary_7x1.svg | 4 +-
symbols/shields/tertiary_7x1_z16.svg | 4 +-
symbols/shields/tertiary_7x1_z18.svg | 4 +-
symbols/shields/tertiary_7x2.svg | 4 +-
symbols/shields/tertiary_7x2_z16.svg | 4 +-
symbols/shields/tertiary_7x2_z18.svg | 4 +-
symbols/shields/tertiary_7x3.svg | 4 +-
symbols/shields/tertiary_7x3_z16.svg | 4 +-
symbols/shields/tertiary_7x3_z18.svg | 4 +-
symbols/shields/tertiary_7x4.svg | 4 +-
symbols/shields/tertiary_7x4_z16.svg | 4 +-
symbols/shields/tertiary_7x4_z18.svg | 4 +-
symbols/shields/tertiary_8x1.svg | 4 +-
symbols/shields/tertiary_8x1_z16.svg | 4 +-
symbols/shields/tertiary_8x1_z18.svg | 4 +-
symbols/shields/tertiary_8x2.svg | 4 +-
symbols/shields/tertiary_8x2_z16.svg | 4 +-
symbols/shields/tertiary_8x2_z18.svg | 4 +-
symbols/shields/tertiary_8x3.svg | 4 +-
symbols/shields/tertiary_8x3_z16.svg | 4 +-
symbols/shields/tertiary_8x3_z18.svg | 4 +-
symbols/shields/tertiary_8x4.svg | 4 +-
symbols/shields/tertiary_8x4_z16.svg | 4 +-
symbols/shields/tertiary_8x4_z18.svg | 4 +-
symbols/shields/tertiary_9x1.svg | 4 +-
symbols/shields/tertiary_9x1_z16.svg | 4 +-
symbols/shields/tertiary_9x1_z18.svg | 4 +-
symbols/shields/tertiary_9x2.svg | 4 +-
symbols/shields/tertiary_9x2_z16.svg | 4 +-
symbols/shields/tertiary_9x2_z18.svg | 4 +-
symbols/shields/tertiary_9x3.svg | 4 +-
symbols/shields/tertiary_9x3_z16.svg | 4 +-
symbols/shields/tertiary_9x3_z18.svg | 4 +-
symbols/shields/tertiary_9x4.svg | 4 +-
symbols/shields/tertiary_9x4_z16.svg | 4 +-
symbols/shields/tertiary_9x4_z18.svg | 4 +-
symbols/shields/trunk_10x1.svg | 4 +-
symbols/shields/trunk_10x1_z16.svg | 4 +-
symbols/shields/trunk_10x1_z18.svg | 4 +-
symbols/shields/trunk_10x2.svg | 4 +-
symbols/shields/trunk_10x2_z16.svg | 4 +-
symbols/shields/trunk_10x2_z18.svg | 4 +-
symbols/shields/trunk_10x3.svg | 4 +-
symbols/shields/trunk_10x3_z16.svg | 4 +-
symbols/shields/trunk_10x3_z18.svg | 4 +-
symbols/shields/trunk_10x4.svg | 4 +-
symbols/shields/trunk_10x4_z16.svg | 4 +-
symbols/shields/trunk_10x4_z18.svg | 4 +-
symbols/shields/trunk_11x1.svg | 4 +-
symbols/shields/trunk_11x1_z16.svg | 4 +-
symbols/shields/trunk_11x1_z18.svg | 4 +-
symbols/shields/trunk_11x2.svg | 4 +-
symbols/shields/trunk_11x2_z16.svg | 4 +-
symbols/shields/trunk_11x2_z18.svg | 4 +-
symbols/shields/trunk_11x3.svg | 4 +-
symbols/shields/trunk_11x3_z16.svg | 4 +-
symbols/shields/trunk_11x3_z18.svg | 4 +-
symbols/shields/trunk_11x4.svg | 4 +-
symbols/shields/trunk_11x4_z16.svg | 4 +-
symbols/shields/trunk_11x4_z18.svg | 4 +-
symbols/shields/trunk_1x1.svg | 4 +-
symbols/shields/trunk_1x1_z16.svg | 4 +-
symbols/shields/trunk_1x1_z18.svg | 4 +-
symbols/shields/trunk_1x2.svg | 4 +-
symbols/shields/trunk_1x2_z16.svg | 4 +-
symbols/shields/trunk_1x2_z18.svg | 4 +-
symbols/shields/trunk_1x3.svg | 4 +-
symbols/shields/trunk_1x3_z16.svg | 4 +-
symbols/shields/trunk_1x3_z18.svg | 4 +-
symbols/shields/trunk_1x4.svg | 4 +-
symbols/shields/trunk_1x4_z16.svg | 4 +-
symbols/shields/trunk_1x4_z18.svg | 4 +-
symbols/shields/trunk_2x1.svg | 4 +-
symbols/shields/trunk_2x1_z16.svg | 4 +-
symbols/shields/trunk_2x1_z18.svg | 4 +-
symbols/shields/trunk_2x2.svg | 4 +-
symbols/shields/trunk_2x2_z16.svg | 4 +-
symbols/shields/trunk_2x2_z18.svg | 4 +-
symbols/shields/trunk_2x3.svg | 4 +-
symbols/shields/trunk_2x3_z16.svg | 4 +-
symbols/shields/trunk_2x3_z18.svg | 4 +-
symbols/shields/trunk_2x4.svg | 4 +-
symbols/shields/trunk_2x4_z16.svg | 4 +-
symbols/shields/trunk_2x4_z18.svg | 4 +-
symbols/shields/trunk_3x1.svg | 4 +-
symbols/shields/trunk_3x1_z16.svg | 4 +-
symbols/shields/trunk_3x1_z18.svg | 4 +-
symbols/shields/trunk_3x2.svg | 4 +-
symbols/shields/trunk_3x2_z16.svg | 4 +-
symbols/shields/trunk_3x2_z18.svg | 4 +-
symbols/shields/trunk_3x3.svg | 4 +-
symbols/shields/trunk_3x3_z16.svg | 4 +-
symbols/shields/trunk_3x3_z18.svg | 4 +-
symbols/shields/trunk_3x4.svg | 4 +-
symbols/shields/trunk_3x4_z16.svg | 4 +-
symbols/shields/trunk_3x4_z18.svg | 4 +-
symbols/shields/trunk_4x1.svg | 4 +-
symbols/shields/trunk_4x1_z16.svg | 4 +-
symbols/shields/trunk_4x1_z18.svg | 4 +-
symbols/shields/trunk_4x2.svg | 4 +-
symbols/shields/trunk_4x2_z16.svg | 4 +-
symbols/shields/trunk_4x2_z18.svg | 4 +-
symbols/shields/trunk_4x3.svg | 4 +-
symbols/shields/trunk_4x3_z16.svg | 4 +-
symbols/shields/trunk_4x3_z18.svg | 4 +-
symbols/shields/trunk_4x4.svg | 4 +-
symbols/shields/trunk_4x4_z16.svg | 4 +-
symbols/shields/trunk_4x4_z18.svg | 4 +-
symbols/shields/trunk_5x1.svg | 4 +-
symbols/shields/trunk_5x1_z16.svg | 4 +-
symbols/shields/trunk_5x1_z18.svg | 4 +-
symbols/shields/trunk_5x2.svg | 4 +-
symbols/shields/trunk_5x2_z16.svg | 4 +-
symbols/shields/trunk_5x2_z18.svg | 4 +-
symbols/shields/trunk_5x3.svg | 4 +-
symbols/shields/trunk_5x3_z16.svg | 4 +-
symbols/shields/trunk_5x3_z18.svg | 4 +-
symbols/shields/trunk_5x4.svg | 4 +-
symbols/shields/trunk_5x4_z16.svg | 4 +-
symbols/shields/trunk_5x4_z18.svg | 4 +-
symbols/shields/trunk_6x1.svg | 4 +-
symbols/shields/trunk_6x1_z16.svg | 4 +-
symbols/shields/trunk_6x1_z18.svg | 4 +-
symbols/shields/trunk_6x2.svg | 4 +-
symbols/shields/trunk_6x2_z16.svg | 4 +-
symbols/shields/trunk_6x2_z18.svg | 4 +-
symbols/shields/trunk_6x3.svg | 4 +-
symbols/shields/trunk_6x3_z16.svg | 4 +-
symbols/shields/trunk_6x3_z18.svg | 4 +-
symbols/shields/trunk_6x4.svg | 4 +-
symbols/shields/trunk_6x4_z16.svg | 4 +-
symbols/shields/trunk_6x4_z18.svg | 4 +-
symbols/shields/trunk_7x1.svg | 4 +-
symbols/shields/trunk_7x1_z16.svg | 4 +-
symbols/shields/trunk_7x1_z18.svg | 4 +-
symbols/shields/trunk_7x2.svg | 4 +-
symbols/shields/trunk_7x2_z16.svg | 4 +-
symbols/shields/trunk_7x2_z18.svg | 4 +-
symbols/shields/trunk_7x3.svg | 4 +-
symbols/shields/trunk_7x3_z16.svg | 4 +-
symbols/shields/trunk_7x3_z18.svg | 4 +-
symbols/shields/trunk_7x4.svg | 4 +-
symbols/shields/trunk_7x4_z16.svg | 4 +-
symbols/shields/trunk_7x4_z18.svg | 4 +-
symbols/shields/trunk_8x1.svg | 4 +-
symbols/shields/trunk_8x1_z16.svg | 4 +-
symbols/shields/trunk_8x1_z18.svg | 4 +-
symbols/shields/trunk_8x2.svg | 4 +-
symbols/shields/trunk_8x2_z16.svg | 4 +-
symbols/shields/trunk_8x2_z18.svg | 4 +-
symbols/shields/trunk_8x3.svg | 4 +-
symbols/shields/trunk_8x3_z16.svg | 4 +-
symbols/shields/trunk_8x3_z18.svg | 4 +-
symbols/shields/trunk_8x4.svg | 4 +-
symbols/shields/trunk_8x4_z16.svg | 4 +-
symbols/shields/trunk_8x4_z18.svg | 4 +-
symbols/shields/trunk_9x1.svg | 4 +-
symbols/shields/trunk_9x1_z16.svg | 4 +-
symbols/shields/trunk_9x1_z18.svg | 4 +-
symbols/shields/trunk_9x2.svg | 4 +-
symbols/shields/trunk_9x2_z16.svg | 4 +-
symbols/shields/trunk_9x2_z18.svg | 4 +-
symbols/shields/trunk_9x3.svg | 4 +-
symbols/shields/trunk_9x3_z16.svg | 4 +-
symbols/shields/trunk_9x3_z18.svg | 4 +-
symbols/shields/trunk_9x4.svg | 4 +-
symbols/shields/trunk_9x4_z16.svg | 4 +-
symbols/shields/trunk_9x4_z18.svg | 4 +-
water.mss | 108 ++++---
677 files changed, 1830 insertions(+), 2041 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cc9ce6..49713e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
-## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v3.2.0...master)
+## [Unreleased](https://github.com/gravitystorm/openstreetmap-carto/compare/v3.3.0...master)
+
+## [v3.3.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v3.2.0...v3.3.0) - 2017-05-10
+### Changes
+- Most shops are now rendered as dots z17 to deal with overcrowding
+- Font selection is moved to its own file to make customization easier, and to make it easier for other styles to reuse our font work
+- Rare CJK characters outside the BMP should now render better
+- Waterway tunnels in forests and lakes are clearer
## [v3.2.0](https://github.com/gravitystorm/openstreetmap-carto/compare/v3.1.0...v3.2.0) - 2017-04-17
### Changes
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c9555fd..107be6f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -133,6 +133,42 @@ The project's goals and design philsophy are different from other projects, but
* [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)
+## Typography
+
+This style uses the font "Noto" for a world-wide coverage of scripts. The font
+size should be ≥ 10 (legibility).
+
+### Multi-line labels
+
+Additional to text-size we have to set text-wrap-width and text-line-spacing.
+For both, the absolute value is meaningless; it should be interpreted relative
+to the font size (em):
+```
+text-size: 10;
+text-wrap-width: 30; // 3.0 em
+text-line-spacing: -1.5; // -0.15 em
+```
+If text-size increases on higher zoom levels the other parameters also have
+to be adjusted:
+```
+text-size: 12;
+text-wrap-width: 36; // 3.0 em
+text-line-spacing: -1.8; // -0.15 em
+```
+Usually, with higher zoom levels we increase the line length
+(text-wrap-width in em). Following an old typography convention, we use narrow
+line spacing for short lines and wider line spacing for longer lines.
+```
+text-size: 15;
+text-wrap-width: 75; // 5.0 em
+text-line-spacing: -0.75; // -0.05 em
+```
+Noto’s line spacing is rather large to allow also tall scripts like Myanmar
+to be rendered without collisions. But the line spacing is too large for
+cartographic usage; therefore we reduce the line spacing. Currently, the
+line spacing ranges from -0.15 em to -0.05 em. (Even at -0.15 em, collisions
+are seldom and even then the text stays legible).
+
## Pull requests
Pull requests that change the cartography should contain a few images selected
diff --git a/INSTALL.md b/INSTALL.md
index c9e1803..afb19d2 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -47,6 +47,8 @@ The stylesheet uses Noto, an openly licensed font family from Google with suppor
DejaVu Sans is used as an optional fallback font for systems without Noto Sans. If all the Noto fonts are installed, it should never be used.
+Hanazono is used a fallback for seldom used CJK characters that are not covered by Noto.
+
Unifont is used as a last resort fallback, with it's excellent coverage, common presence on machines, and ugly look.
### Installation on Ubuntu/Debian
@@ -54,7 +56,7 @@ Unifont is used as a last resort fallback, with it's excellent coverage, common
On Ubuntu 16.04 or Debian Testing you can download and install the required fonts except Noto Emoji Regular with
```
-sudo apt-get install fonts-noto-cjk fonts-noto-hinted fonts-noto-unhinted ttf-unifont
+sudo apt-get install fonts-noto-cjk fonts-noto-hinted fonts-noto-unhinted fonts-hanazono ttf-unifont
```
Noto Emoji Regular can be downloaded [from the Noto Emoji repository](https://github.com/googlei18n/noto-emoji).
@@ -69,6 +71,7 @@ The fonts can be downloaded here:
* [Noto homepage](http://www.google.com/get/noto/) and [Noto github repositories](http://github.com/googlei18n?utf8=%E2%9C%93&q=noto)
* [DejaVu homepage](http://dejavu-fonts.org/)
+* [Hanazono homepage](http://fonts.jp/hanazono/)
* [Unifont homepage](http://unifoundry.com/)
After the download, you have to install the font files in the usual way of your operation system.
diff --git a/amenity-points.mss b/amenity-points.mss
index 0cba35b..bcbe74e 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -565,408 +565,269 @@
marker-clip: false;
}
- [feature = 'shop_other'][zoom >= 17] {
- marker-fill: @shop-icon;
- marker-width: 6;
- marker-line-width: 0;
- marker-placement: interior;
- marker-clip: false;
- }
+ [feature = 'shop'] {
+ [zoom >= 17],
+ [shop = 'supermarket'][zoom >= 16],
+ [shop = 'department_store'][zoom >= 16] {
+ marker-placement: interior;
+ marker-clip: false;
+ marker-fill: @shop-icon;
+ }
- [feature = 'shop_supermarket'][zoom >= 16] {
- marker-file: url('symbols/shop/supermarket.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [zoom >= 17][zoom < 18][shop != 'supermarket'][shop != 'department_store'] {
+ marker-placement: interior;
+ marker-clip: false;
+ marker-fill: @shop-icon;
+ marker-width: 4;
+ marker-line-width: 0;
+ }
- [feature = 'shop_art'][zoom >= 17] {
- marker-file: url('symbols/shop/art.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'other'][zoom >= 18] {
+ marker-width: 6;
+ marker-line-width: 0;
+ }
- [feature = 'shop_bag'][zoom >= 17] {
- marker-file: url('symbols/shop/bag.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'supermarket'][zoom >= 16] {
+ marker-file: url('symbols/shop/supermarket.svg');
+ }
- [feature = 'shop_bakery'][zoom >= 17] {
- marker-file: url('symbols/shop/bakery.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'art'][zoom >= 18] {
+ marker-file: url('symbols/shop/art.svg');
+ }
- [feature = 'shop_beauty'][zoom >= 17] {
- marker-file: url('symbols/shop/beauty.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'bag'][zoom >= 18] {
+ marker-file: url('symbols/shop/bag.svg');
+ }
- [feature = 'shop_beverages'][zoom >= 17] {
- marker-file: url('symbols/shop/beverages.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'bakery'][zoom >= 18] {
+ marker-file: url('symbols/shop/bakery.svg');
+ }
- [feature = 'shop_books'][zoom >= 17] {
- marker-file: url('symbols/library.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'beauty'][zoom >= 18] {
+ marker-file: url('symbols/shop/beauty.svg');
+ }
- [feature = 'shop_butcher'][zoom >= 17] {
- marker-file: url('symbols/shop/butcher.png');
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'beverages'][zoom >= 18] {
+ marker-file: url('symbols/shop/beverages.svg');
+ }
- [feature = 'shop_chemist'][zoom >= 17] {
- marker-file: url('symbols/shop/chemist.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'books'][zoom >= 18] {
+ marker-file: url('symbols/library.svg');
+ }
- [feature = 'shop_clothes'],
- [feature = 'shop_fashion'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/clothes.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'butcher'][zoom >= 18] {
+ marker-file: url('symbols/shop/butcher.png');
}
- }
- [feature = 'shop_coffee'][zoom >= 17] {
- marker-file: url('symbols/shop/coffee.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'chemist'][zoom >= 18] {
+ marker-file: url('symbols/shop/chemist.svg');
+ }
- [feature = 'shop_computer'][zoom >= 17] {
- marker-file: url('symbols/shop/computer.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'clothes'],
+ [shop = 'fashion'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/clothes.svg');
+ }
+ }
- [feature = 'shop_convenience'][zoom >= 17] {
- marker-file: url('symbols/shop/convenience.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'coffee'][zoom >= 18] {
+ marker-file: url('symbols/shop/coffee.svg');
+ }
- [feature = 'shop_confectionery'][zoom >= 17] {
- marker-file: url('symbols/shop/confectionery.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'computer'][zoom >= 18] {
+ marker-file: url('symbols/shop/computer.svg');
+ }
- [feature = 'shop_copyshop'][zoom >= 17] {
- marker-file: url('symbols/shop/copyshop.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'convenience'][zoom >= 18] {
+ marker-file: url('symbols/shop/convenience.svg');
+ }
- [feature = 'shop_cosmetics'],
- [feature = 'shop_perfumery'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/perfumery.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'confectionery'][zoom >= 18] {
+ marker-file: url('symbols/shop/confectionery.svg');
}
- }
- [feature = 'shop_deli'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/deli.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'copyshop'][zoom >= 18] {
+ marker-file: url('symbols/shop/copyshop.svg');
}
- }
- [feature = 'shop_department_store'][zoom >= 16] {
- marker-file: url('symbols/shop/department_store.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'cosmetics'],
+ [shop = 'perfumery'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/perfumery.svg');
+ }
+ }
- [feature = 'shop_doityourself'],
- [feature = 'shop_hardware'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/diy.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'deli'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/deli.svg');
+ }
}
- }
- [feature = 'shop_dry_cleaning'],
- [feature = 'shop_laundry'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/laundry.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'department_store'][zoom >= 16] {
+ marker-file: url('symbols/shop/department_store.svg');
}
- }
- [feature = 'shop_fishmonger'],
- [feature = 'shop_seafood'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/seafood.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'doityourself'],
+ [shop = 'hardware'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/diy.svg');
+ }
}
- }
- [feature = 'shop_florist'][zoom >= 17] {
- marker-file: url('symbols/shop/florist.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'dry_cleaning'],
+ [shop = 'laundry'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/laundry.svg');
+ }
+ }
- [feature = 'shop_garden_centre'][zoom >= 17] {
- marker-file: url('symbols/shop/garden_centre.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'fishmonger'],
+ [shop = 'seafood'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/seafood.svg');
+ }
+ }
- [feature = 'shop_greengrocer'],
- [feature = 'shop_farm'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/greengrocer.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'florist'][zoom >= 18] {
+ marker-file: url('symbols/shop/florist.svg');
}
- }
- [feature = 'shop_hairdresser'][zoom >= 17] {
- marker-file: url('symbols/shop/hairdresser.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'garden_centre'][zoom >= 18] {
+ marker-file: url('symbols/shop/garden_centre.svg');
+ }
- [feature = 'shop_hifi'][zoom >= 17] {
- marker-file: url('symbols/shop/hifi.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'greengrocer'],
+ [shop = 'farm'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/greengrocer.svg');
+ }
+ }
- [feature = 'shop_ice_cream'][zoom >= 17] {
- marker-file: url('symbols/shop/ice_cream.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'hairdresser'][zoom >= 18] {
+ marker-file: url('symbols/shop/hairdresser.svg');
+ }
- [feature = 'shop_car'][zoom >= 17] {
- marker-file: url('symbols/shop/car.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'hifi'][zoom >= 18] {
+ marker-file: url('symbols/shop/hifi.svg');
+ }
- [feature = 'shop_car_parts'][zoom >= 17] {
- marker-file: url('symbols/shop/car_parts.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'ice_cream'][zoom >= 18] {
+ marker-file: url('symbols/shop/ice_cream.svg');
+ }
- [feature = 'shop_car_repair'][zoom >= 17] {
- marker-file: url('symbols/shop/car_repair.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @amenity-brown;
- }
+ [shop = 'car'][zoom >= 18] {
+ marker-file: url('symbols/shop/car.svg');
+ }
- [feature = 'shop_bicycle'][zoom >= 17] {
- marker-file: url('symbols/shop/bicycle.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'car_parts'][zoom >= 18] {
+ marker-file: url('symbols/shop/car_parts.svg');
+ }
- [feature = 'shop_pet'][zoom >= 17] {
- marker-file: url('symbols/shop/pet.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'car_repair'][zoom >= 18] {
+ marker-file: url('symbols/shop/car_repair.svg');
+ marker-fill: @amenity-brown;
+ }
- [feature = 'shop_photo'],
- [feature = 'shop_photo_studio'],
- [feature = 'shop_photography'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/photo.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'bicycle'][zoom >= 18] {
+ marker-file: url('symbols/shop/bicycle.svg');
}
- }
- [feature = 'shop_shoes'][zoom >= 17] {
- marker-file: url('symbols/shop/shoes.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'pet'][zoom >= 18] {
+ marker-file: url('symbols/shop/pet.svg');
+ }
- [feature = 'shop_gift'][zoom >= 17] {
- 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.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
-
- [feature = 'shop_alcohol'],
- [feature = 'shop_wine'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/alcohol.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'photo'],
+ [shop = 'photo_studio'],
+ [shop = 'photography'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/photo.svg');
+ }
}
- }
-
- [feature = 'shop_optician'][zoom >= 17] {
- 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/shop/outdoor.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
-
- [feature = 'shop_furniture'][zoom >= 17] {
- 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.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
- [feature = 'shop_motorcycle'][zoom >= 17] {
- marker-file: url('symbols/motorcycle.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'shoes'][zoom >= 18] {
+ marker-file: url('symbols/shop/shoes.svg');
+ }
- [feature = 'shop_musical_instrument'][zoom >= 17] {
- marker-file: url('symbols/shop/musical_instrument.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'gift'][zoom >= 18] {
+ marker-file: url('symbols/shop/gift.svg');
+ }
+
+ [shop = 'electronics'][zoom >= 18] {
+ marker-file: url('symbols/shop/electronics.svg');
+ }
+
+ [shop = 'alcohol'],
+ [shop = 'wine'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/alcohol.svg');
+ }
+ }
+
+ [shop = 'optician'][zoom >= 18] {
+ marker-file: url('symbols/shop/optician.svg');
+ }
+
+ [shop = 'outdoor'][zoom >= 18] {
+ marker-file: url('symbols/shop/outdoor.svg');
+ }
+
+ [shop = 'furniture'][zoom >= 18] {
+ marker-file: url('symbols/shop/furniture.svg');
+ }
+
+ [shop = 'mobile_phone'][zoom >= 18] {
+ marker-file: url('symbols/shop/mobile_phone.svg');
+ }
- [feature = 'shop_kiosk'],
- [feature = 'shop_newsagent'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/newsagent.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'motorcycle'][zoom >= 18] {
+ marker-file: url('symbols/motorcycle.svg');
}
- }
- [feature = 'shop_jewelry'],
- [feature = 'shop_jewellery'] {
- [zoom >= 17] {
- marker-file: url('symbols/shop/jewelry.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'musical_instrument'][zoom >= 18] {
+ marker-file: url('symbols/shop/musical_instrument.svg');
}
- }
- [feature = 'shop_toys'][zoom >= 17] {
- marker-file: url('symbols/shop/toys.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'kiosk'],
+ [shop = 'newsagent'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/newsagent.svg');
+ }
+ }
- [feature = 'shop_travel_agency'][zoom >= 17] {
- marker-file: url('symbols/shop/travel_agency.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'jewelry'],
+ [shop = 'jewellery'] {
+ [zoom >= 18] {
+ marker-file: url('symbols/shop/jewelry.svg');
+ }
+ }
- [feature = 'shop_sports'][zoom >= 17] {
- marker-file: url('symbols/shop/sports.svg');
- marker-fill: @shop-icon;
- marker-placement: interior;
- marker-clip: false;
- }
+ [shop = 'toys'][zoom >= 18] {
+ marker-file: url('symbols/shop/toys.svg');
+ }
- [feature = 'shop_stationery'][zoom >= 17] {
- marker-file: url('symbols/shop/stationery.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'travel_agency'][zoom >= 18] {
+ marker-file: url('symbols/shop/travel_agency.svg');
+ }
- [feature = 'shop_tobacco'][zoom >= 17] {
- marker-file: url('symbols/shop/tobacco.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'sports'][zoom >= 18] {
+ marker-file: url('symbols/shop/sports.svg');
+ }
- [feature = 'shop_tea'][zoom >= 17] {
- marker-file: url('symbols/shop/tea.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
- }
+ [shop = 'stationery'][zoom >= 18] {
+ marker-file: url('symbols/shop/stationery.svg');
+ }
- [feature = 'shop_variety_store'][zoom >= 17] {
- marker-file: url('symbols/shop/variety_store.svg');
- marker-placement: interior;
- marker-clip: false;
- marker-fill: @shop-icon;
+ [shop = 'tobacco'][zoom >= 18] {
+ marker-file: url('symbols/shop/tobacco.svg');
+ }
+
+ [shop = 'tea'][zoom >= 18] {
+ marker-file: url('symbols/shop/tea.svg');
+ }
+
+ [shop = 'variety_store'][zoom >= 18] {
+ marker-file: url('symbols/shop/variety_store.svg');
+ }
}
[feature = 'leisure_water_park'][zoom >= 17] {
diff --git a/style.mss b/fonts.mss
similarity index 98%
copy from style.mss
copy to fonts.mss
index c9e3838..55f125d 100644
--- a/style.mss
+++ b/fonts.mss
@@ -1,7 +1,3 @@
-Map {
- background-color: @water-color;
-}
-
/*
About fonts:
@@ -118,6 +114,7 @@ A regular style.
"DejaVu Sans Book",
+ "HanaMinA Regular", "HanaMinB Regular",
"Unifont Medium", "unifont Medium", "Unifont Upper Medium";
/*
@@ -197,6 +194,7 @@ regular text and can be used for emphasis. Fallback is a regular style.
"DejaVu Sans Bold", "DejaVu Sans Book",
+ "HanaMinA Regular", "HanaMinB Regular",
"Unifont Medium", "unifont Medium", "Unifont Upper Medium";
/*
@@ -270,10 +268,5 @@ For a considerable number of labels this style will make no difference to the re
"DejaVu Sans Oblique", "DejaVu Sans Book",
- "Unifont Medium", "unifont Medium", "Unifont Upper Medium";
-
- at water-color: #b5d0d0;
- at land-color: #f2efe9;
-
- at standard-halo-radius: 1;
- at standard-halo-fill: rgba(255,255,255,0.6);
+ "HanaMinA Regular", "HanaMinB Regular",
+ "Unifont Medium", "unifont Medium", "Unifont Upper Medium";
\ No newline at end of file
diff --git a/landcover.mss b/landcover.mss
index 23ce1ec..79875f5 100644
--- a/landcover.mss
+++ b/landcover.mss
@@ -672,13 +672,13 @@
#cliffs {
[natural = 'cliff'][zoom >= 13] {
- line-pattern-file: url('symbols/cliff.png');
+ line-pattern-file: url('symbols/cliff.svg');
[zoom >= 15] {
- line-pattern-file: url('symbols/cliff2.png');
+ line-pattern-file: url('symbols/cliff2.svg');
}
}
[man_made = 'embankment'][zoom >= 15]::man_made {
- line-pattern-file: url('symbols/embankment.png');
+ line-pattern-file: url('symbols/embankment.svg');
}
}
diff --git a/project.mml b/project.mml
index 0a3a3dc..f986ca1 100644
--- a/project.mml
+++ b/project.mml
@@ -37,6 +37,7 @@ _parts:
Stylesheet:
- style.mss
+ - fonts.mss
- shapefiles.mss
- landcover.mss
- water.mss
@@ -590,7 +591,7 @@ Layer:
) AS tunnels
properties:
group-by: layernotnull
- minzoom: 9
+ minzoom: 10
- id: landuse-overlay
name: landuse-overlay
geometry: polygon
@@ -862,7 +863,7 @@ Layer:
CASE WHEN int_surface IN ('unpaved') THEN 0 ELSE 2 END
) AS roads_casing
properties:
- minzoom: 9
+ minzoom: 10
- id: highway-area-fill
name: highway-area-fill
# FIXME: No geometry?
@@ -1258,7 +1259,7 @@ Layer:
) AS bridges
properties:
group-by: layernotnull
- minzoom: 9
+ minzoom: 10
- id: guideways
name: guideways
geometry: linestring
@@ -1622,15 +1623,7 @@ Layer:
'fast_food', 'telephone', 'emergency_phone', 'taxi', 'theatre', 'toilets', 'drinking_water',
'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
'charging_station', 'arts_centre') THEN amenity ELSE NULL END,
- 'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer',
- 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist',
- 'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet',
- 'photo', 'photo_studio', 'photography', 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk',
- 'mobile_phone', 'motorcycle', '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', 'coffee') THEN shop
- WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
+ 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' 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,
@@ -1644,6 +1637,15 @@ Layer:
denomination,
"generator:source",
power_source,
+ CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer',
+ 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist',
+ 'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet',
+ 'photo', 'photo_studio', 'photography', 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk',
+ 'mobile_phone', 'motorcycle', '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', 'coffee') THEN shop
+ ELSE 'other' END AS shop,
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
FROM planet_osm_polygon
-- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
@@ -1691,15 +1693,7 @@ Layer:
'fast_food', 'telephone', 'emergency_phone', 'taxi', 'theatre', 'toilets', 'drinking_water',
'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
'charging_station', 'arts_centre') THEN amenity ELSE NULL END,
- 'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer', 'confectionery',
- 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre',
- 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio',
- 'photography', 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle',
- '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', 'coffee') THEN shop
- WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' END,
+ 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' 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,
@@ -1724,6 +1718,15 @@ Layer:
denomination,
"generator:source",
power_source,
+ CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer',
+ 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist',
+ 'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet',
+ 'photo', 'photo_studio', 'photography', 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk',
+ 'mobile_phone', 'motorcycle', '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', 'coffee') THEN shop
+ ELSE 'other' END AS shop,
NULL AS way_pixels
FROM planet_osm_point
-- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
diff --git a/roads.mss b/roads.mss
index 08d6dd8..c7f5fb2 100644
--- a/roads.mss
+++ b/roads.mss
@@ -282,34 +282,6 @@
.roads-casing, .bridges-casing, .tunnels-casing {
::casing {
- [zoom = 9][feature = 'highway_secondary'] {
- line-color: @halo-color-for-minor-road;
- line-width: 2.2;
- line-opacity: 0.4;
- line-join: round;
- //Missing line-cap: round; is intentional. It would cause rendering glow multiple times in some places - what as result of partial transparency would cause differences in rendering
- //Also, bridges - including bridge casings - are rendered on top of roads. Enabling line-cap: round would result in glow from bridges rendered on top of road around bridges.
- }
- [zoom = 10][feature = 'highway_secondary'],
- [zoom = 11][feature = 'highway_secondary'] {
- line-color: @halo-color-for-minor-road;
- line-width: 2.7;
- line-opacity: 0.4;
- line-join: round;
- //Missing line-cap: round; is intentional. It would cause rendering glow multiple times in some places - what as result of partial transparency would cause differences in rendering
- //Also, bridges - including bridge casings - are rendered on top of roads. Enabling line-cap: round would result in glow from bridges rendered on top of road around bridges.
- }
- [zoom = 10][feature = 'highway_tertiary'],
- [zoom = 11][feature = 'highway_tertiary'],
- [zoom = 12][feature = 'highway_unclassified'] {
- line-color: @halo-color-for-minor-road;
- line-width: 2.2;
- line-opacity: 0.3;
- line-join: round;
- //Missing line-cap: round; is intentional. It would cause rendering glow multiple times in some places - what as result of partial transparency would cause differences in rendering
- //Also, bridges - including bridge casings are rendered on top of roads. Enabling line-cap: round would result in glow from bridges rendered on top of road around bridges.
- }
-
[zoom >= 12] {
[feature = 'highway_motorway'] {
line-width: @motorway-width-z12;
@@ -1067,6 +1039,36 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
.roads-fill[zoom >= 10],
.bridges-fill[zoom >= 10],
.tunnels-fill[zoom >= 10] {
+ ::halo {
+ [zoom = 9][feature = 'highway_secondary'] {
+ line-color: @halo-color-for-minor-road;
+ line-width: 2.2;
+ line-opacity: 0.4;
+ line-join: round;
+ //Missing line-cap: round; is intentional. It would cause rendering glow multiple times in some places - what as result of partial transparency would cause differences in rendering
+ //Also, bridges - including bridge casings - are rendered on top of roads. Enabling line-cap: round would result in glow from bridges rendered on top of road around bridges.
+ }
+ [zoom = 10][feature = 'highway_secondary'],
+ [zoom = 11][feature = 'highway_secondary'] {
+ line-color: @halo-color-for-minor-road;
+ line-width: 2.7;
+ line-opacity: 0.4;
+ line-join: round;
+ //Missing line-cap: round; is intentional. It would cause rendering glow multiple times in some places - what as result of partial transparency would cause differences in rendering
+ //Also, bridges - including bridge casings - are rendered on top of roads. Enabling line-cap: round would result in glow from bridges rendered on top of road around bridges.
+ }
+ [zoom = 10][feature = 'highway_tertiary'],
+ [zoom = 11][feature = 'highway_tertiary'],
+ [zoom = 12][feature = 'highway_unclassified'] {
+ line-color: @halo-color-for-minor-road;
+ line-width: 2.2;
+ line-opacity: 0.3;
+ line-join: round;
+ //Missing line-cap: round; is intentional. It would cause rendering glow multiple times in some places - what as result of partial transparency would cause differences in rendering
+ //Also, bridges - including bridge casings are rendered on top of roads. Enabling line-cap: round would result in glow from bridges rendered on top of road around bridges.
+ }
+ }
+
::fill {
/*
* The construction rules for small roads are strange, since if construction is null its assumed that
diff --git a/scripts/generate_shields.py b/scripts/generate_shields.py
index 4faa207..c864af1 100755
--- a/scripts/generate_shields.py
+++ b/scripts/generate_shields.py
@@ -18,9 +18,10 @@ def main():
config = {}
config['base'] = {}
+ # font_height and font_width are determined by trial and error
config['base']['rounded_corners'] = 2
- config['base']['font_height'] = 9.1
- config['base']['font_width'] = 5.9
+ config['base']['font_height'] = 12.1
+ config['base']['font_width'] = 6.2
config['base']['padding_x'] = 4
config['base']['padding_y'] = 2
config['base']['stroke_width'] = 1
@@ -54,10 +55,10 @@ def main():
config['z16'] = {}
config['z18'] = {}
- config['z16']['font_width'] = 6.5
- config['z16']['font_height'] = 10.1
- config['z18']['font_width'] = 7.2
- config['z18']['font_height'] = 11.1
+ config['z16']['font_width'] = 6.1
+ config['z16']['font_height'] = 14.1
+ config['z18']['font_width'] = 6.9
+ config['z18']['font_height'] = 15.1
if not os.path.exists(os.path.dirname(config['global']['output_dir'])):
os.makedirs(os.path.dirname(config['global']['output_dir']))
diff --git a/style.mss b/style.mss
index c9e3838..426529e 100644
--- a/style.mss
+++ b/style.mss
@@ -2,276 +2,6 @@ Map {
background-color: @water-color;
}
-/*
-About fonts:
-
-Noto is a font family that wants to cover most of Unicode with a harmonic
-design across various scripts. We use Noto for most text, with some support
-for backward-compatibility and Unifont as fallback.
-
-By order:
-
-1. Noto Sans is available for most scripts and it is used as a first choice.
-Where available the UI version of the fonts is used. In some cases the UI version
-has fewer glyphs, so both are listed. Most of the list is in alphabetical order,
-but there are some exceptions
-
- - Noto Sans UI is before all other fonts
- - The CJK fonts are manually ordered. The used CJK font covers all CJK
- languages, but defaults to the japanese glyph style if various glyph
- styles are available. (We have to default to one of JP, KR, SC, TC because
- this carto style has no knowledge about what language the “names” tag
- contains. As in Korea Han characters are not so widely used, it seems
- better to default to either Chinese or Japanese. As Chinese exists in the
- two variants SC/TC, it won’t be a uniform rendering anyway. So we default
- to Japanese. However, this choise stays somewhat arbitrary and subjective.
- See also https://github.com/gravitystorm/openstreetmap-carto/issues/2208)
-
-2. Noto provides three variants of Arabic: Noto Kufi Arabic, Noto Naskh Arabic
-and Noto Nastaliq Urdu. Naskh is the most commonly used style of Arabic.
-Furthermore, Noto Naskh is the Arabic font of the Noto family with the greatest
-coverage and the only one that has an UI variant. Therefor this style uses
-Noto Naskh Arabic UI. The Arabic fonts are placed behind Sans fonts because
-they might re-define some commonly used signs like parenthesis or quotation
-marks, and the arabic design should not overwrite the standard design.
-
-3. Noto provides two variants of Emoji: Noto Color Emoji and Noto Emoji. The
-colour variant is a SVG flavoured OpenType font that contains coloured emojis.
-This is not useful in cartography, so we use the “normal” monochromatic
-Noto Emoji.
-
-4. The list still includes DejaVu for compatibility on systems without Noto.
-
-5. Unifont. This is a fallback of last resort with excellent coverage.
-Unifont Medium covers the whole Unicode BMP without surrogates and without PUA.
-Unifont Upper Medium covers some parts of the other Unicode planes. Unifont
-Medium Sample would cover the BMP PUA with replacement characters, but cannot
-be used because Mapnik does not support SBIT TTF.
-*/
-
-/*
-A regular style.
-*/
- at book-fonts: "Noto Sans UI Regular",
- "Noto Sans CJK JP Regular",
- "Noto Sans Armenian Regular",
- "Noto Sans Balinese Regular",
- "Noto Sans Bamum Regular",
- "Noto Sans Batak Regular",
- "Noto Sans Bengali UI Regular",
- "Noto Sans Buginese Regular",
- "Noto Sans Buhid Regular",
- "Noto Sans Canadian Aboriginal Regular",
- "Noto Sans Cham Regular",
- "Noto Sans Cherokee Regular",
- "Noto Sans Coptic Regular",
- "Noto Sans Devanagari UI Regular", "Noto Sans Devanagari Regular",
- "Noto Sans Ethiopic Regular",
- "Noto Sans Georgian Regular",
- "Noto Sans Gujarati UI Regular", "Noto Sans Gujarati Regular",
- "Noto Sans Gurmukhi UI Regular",
- "Noto Sans Hanunoo Regular",
- "Noto Sans Hebrew Regular",
- "Noto Sans Javanese Regular",
- "Noto Sans Kannada UI Regular",
- "Noto Sans Kayah Li Regular",
- "Noto Sans Khmer UI Regular",
- "Noto Sans Lao UI Regular",
- "Noto Sans Lepcha Regular",
- "Noto Sans Limbu Regular",
- "Noto Sans Lisu Regular",
- "Noto Sans Malayalam UI Regular",
- "Noto Sans Mandaic Regular",
- "Noto Sans Mongolian Regular",
- "Noto Sans Myanmar UI Regular",
- "Noto Sans New Tai Lue Regular",
- "Noto Sans NKo Regular",
- "Noto Sans Ol Chiki Regular",
- "Noto Sans Oriya UI Regular", "Noto Sans Oriya Regular",
- "Noto Sans Osmanya Regular",
- "Noto Sans Samaritan Regular",
- "Noto Sans Saurashtra Regular",
- "Noto Sans Shavian Regular",
- "Noto Sans Sinhala Regular",
- "Noto Sans Sundanese Regular",
- "Noto Sans Symbols Regular",
- "Noto Sans Syriac Eastern Regular",
- "Noto Sans Syriac Estrangela Regular",
- "Noto Sans Syriac Western Regular",
- "Noto Sans Tagalog Regular",
- "Noto Sans Tagbanwa Regular",
- "Noto Sans Tai Le Regular",
- "Noto Sans Tai Tham Regular",
- "Noto Sans Tai Viet Regular",
- "Noto Sans Tamil UI Regular",
- "Noto Sans Telugu UI Regular",
- "Noto Sans Thaana Regular",
- "Noto Sans Thai UI Regular",
- "Noto Sans Tibetan Regular",
- "Noto Sans Tifinagh Regular",
- "Noto Sans Vai Regular",
- "Noto Sans Yi Regular",
-
- "Noto Naskh Arabic UI Regular",
-
- "Noto Emoji Regular",
-
- "DejaVu Sans Book",
-
- "Unifont Medium", "unifont Medium", "Unifont Upper Medium";
-
-/*
-A bold style is available for almost all scripts. Bold text is heavier than
-regular text and can be used for emphasis. Fallback is a regular style.
-*/
- at bold-fonts: "Noto Sans UI Bold",
- "Noto Sans CJK JP Bold",
- "Noto Sans Armenian Bold",
- "Noto Sans Bengali UI Bold",
- "Noto Sans Cham Bold",
- "Noto Sans Devanagari UI Bold", "Noto Sans Devanagari Bold",
- "Noto Sans Ethiopic Bold",
- "Noto Sans Georgian Bold",
- "Noto Sans Gujarati UI Bold", "Noto Sans Gujarati Bold",
- "Noto Sans Gurmukhi UI Bold",
- "Noto Sans Hebrew Bold",
- "Noto Sans Kannada UI Bold",
- "Noto Sans Khmer UI Bold",
- "Noto Sans Lao UI Bold",
- "Noto Sans Malayalam UI Bold",
- "Noto Sans Myanmar UI Bold",
- "Noto Sans Oriya UI Bold", "Noto Sans Oriya Bold",
- "Noto Sans Sinhala Bold",
- "Noto Sans Tamil UI Bold",
- "Noto Sans Telugu UI Bold",
- "Noto Sans Thaana Bold",
- "Noto Sans Thai UI Bold",
- "Noto Sans Tibetan Bold",
-
- "Noto Sans CJK JP Regular",
- "Noto Sans Balinese Regular",
- "Noto Sans Bamum Regular",
- "Noto Sans Batak Regular",
- "Noto Sans Buginese Regular",
- "Noto Sans Buhid Regular",
- "Noto Sans Canadian Aboriginal Regular",
- "Noto Sans Cherokee Regular",
- "Noto Sans Coptic Regular",
- "Noto Sans Devanagari UI Regular", "Noto Sans Devanagari Regular",
- "Noto Sans Georgian Regular",
- "Noto Sans Gujarati UI Regular", "Noto Sans Gujarati Regular",
- "Noto Sans Hanunoo Regular",
- "Noto Sans Javanese Regular",
- "Noto Sans Kayah Li Regular",
- "Noto Sans Lepcha Regular",
- "Noto Sans Limbu Regular",
- "Noto Sans Lisu Regular",
- "Noto Sans Mandaic Regular",
- "Noto Sans Mongolian Regular",
- "Noto Sans New Tai Lue Regular",
- "Noto Sans NKo Regular",
- "Noto Sans Ol Chiki Regular",
- "Noto Sans Osmanya Regular",
- "Noto Sans Samaritan Regular",
- "Noto Sans Saurashtra Regular",
- "Noto Sans Shavian Regular",
- "Noto Sans Sundanese Regular",
- "Noto Sans Symbols Regular",
- "Noto Sans Syriac Eastern Regular",
- "Noto Sans Syriac Estrangela Regular",
- "Noto Sans Syriac Western Regular",
- "Noto Sans Tagalog Regular",
- "Noto Sans Tagbanwa Regular",
- "Noto Sans Tai Le Regular",
- "Noto Sans Tai Tham Regular",
- "Noto Sans Tai Viet Regular",
- "Noto Sans Tifinagh Regular",
- "Noto Sans Vai Regular",
- "Noto Sans Yi Regular",
-
- "Noto Naskh Arabic UI Bold",
-
- "Noto Naskh Arabic UI Regular",
-
- "Noto Emoji Regular",
-
- "DejaVu Sans Bold", "DejaVu Sans Book",
-
- "Unifont Medium", "unifont Medium", "Unifont Upper Medium";
-
-/*
-Italics are only available for the base font, not the other scripts.
-For a considerable number of labels this style will make no difference to the regular style.
-*/
- at oblique-fonts: "Noto Sans UI Italic",
- "Noto Sans UI Regular",
- "Noto Sans CJK JP Regular",
- "Noto Sans Armenian Regular",
- "Noto Sans Balinese Regular",
- "Noto Sans Bamum Regular",
- "Noto Sans Batak Regular",
- "Noto Sans Bengali UI Regular",
- "Noto Sans Buginese Regular",
- "Noto Sans Buhid Regular",
- "Noto Sans Canadian Aboriginal Regular",
- "Noto Sans Cham Regular",
- "Noto Sans Cherokee Regular",
- "Noto Sans Coptic Regular",
- "Noto Sans Devanagari UI Regular", "Noto Sans Devanagari Regular",
- "Noto Sans Ethiopic Regular",
- "Noto Sans Georgian Regular",
- "Noto Sans Gujarati UI Regular", "Noto Sans Gujarati Regular",
- "Noto Sans Gurmukhi UI Regular",
- "Noto Sans Hanunoo Regular",
- "Noto Sans Hebrew Regular",
- "Noto Sans Javanese Regular",
- "Noto Sans Kannada UI Regular",
- "Noto Sans Kayah Li Regular",
- "Noto Sans Khmer UI Regular",
- "Noto Sans Lao UI Regular",
- "Noto Sans Lepcha Regular",
- "Noto Sans Limbu Regular",
- "Noto Sans Lisu Regular",
- "Noto Sans Malayalam UI Regular",
- "Noto Sans Mandaic Regular",
- "Noto Sans Mongolian Regular",
- "Noto Sans Myanmar UI Regular",
- "Noto Sans New Tai Lue Regular",
- "Noto Sans NKo Regular",
- "Noto Sans Ol Chiki Regular",
- "Noto Sans Oriya UI Regular", "Noto Sans Oriya Regular",
- "Noto Sans Osmanya Regular",
- "Noto Sans Samaritan Regular",
- "Noto Sans Saurashtra Regular",
- "Noto Sans Shavian Regular",
- "Noto Sans Sinhala Regular",
- "Noto Sans Sundanese Regular",
- "Noto Sans Symbols Regular",
- "Noto Sans Syriac Eastern Regular",
- "Noto Sans Syriac Estrangela Regular",
- "Noto Sans Syriac Western Regular",
- "Noto Sans Tagalog Regular",
- "Noto Sans Tagbanwa Regular",
- "Noto Sans Tai Le Regular",
- "Noto Sans Tai Tham Regular",
- "Noto Sans Tai Viet Regular",
- "Noto Sans Tamil UI Regular",
- "Noto Sans Telugu UI Regular",
- "Noto Sans Thaana Regular",
- "Noto Sans Thai UI Regular",
- "Noto Sans Tibetan Regular",
- "Noto Sans Tifinagh Regular",
- "Noto Sans Vai Regular",
- "Noto Sans Yi Regular",
-
- "Noto Naskh Arabic UI Regular",
-
- "Noto Emoji Regular",
-
- "DejaVu Sans Oblique", "DejaVu Sans Book",
-
- "Unifont Medium", "unifont Medium", "Unifont Upper Medium";
-
@water-color: #b5d0d0;
@land-color: #f2efe9;
diff --git a/symbols/cliff.png b/symbols/cliff.png
deleted file mode 100644
index b516fe2..0000000
Binary files a/symbols/cliff.png and /dev/null differ
diff --git a/symbols/cliff.svg b/symbols/cliff.svg
new file mode 100644
index 0000000..55b6c8d
--- /dev/null
+++ b/symbols/cliff.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"
+ id="svg2"
+ height="7"
+ width="15">
+ <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(0,-9)"
+ id="layer1">
+ <path
+ id="path2988"
+ d="m 8.33331e-6,12 c 0,0.75 -3.749991e-5,0.25 0,1 L 6,13 l 1,3 1,0 1,-3 6,0 0,-1 z"
+ style="fill:#999999;fill-opacity:1;stroke:none" />
+ <path
+ style="fill:none;fill-opacity:1;stroke:none"
+ d="M 6,12 7,9 8,9 9,12 Z"
+ id="path3417" />
+ </g>
+</svg>
diff --git a/symbols/cliff2.png b/symbols/cliff2.png
deleted file mode 100644
index bda2dd7..0000000
Binary files a/symbols/cliff2.png and /dev/null differ
diff --git a/symbols/cliff2.svg b/symbols/cliff2.svg
new file mode 100644
index 0000000..5e5e067
--- /dev/null
+++ b/symbols/cliff2.svg
@@ -0,0 +1,39 @@
+<?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"
+ height="11"
+ width="15">
+ <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(0,-5)"
+ id="layer1">
+ <path
+ id="path2988"
+ transform="translate(0,5)"
+ d="m 0,5 c 0,0.75 -3.74999e-5,0.25 0,1 l 5,0 2,5 1,0 2,-5 5,0 0,-1 z"
+ style="fill:#999999;fill-opacity:1;stroke:none" />
+ <path
+ style="fill:none;fill-opacity:1;stroke:none"
+ d="m 5.0000001,10 2,-5 1.0000001,0 1.9999997,5 z"
+ id="path3413" />
+ </g>
+</svg>
diff --git a/symbols/embankment.png b/symbols/embankment.png
deleted file mode 100644
index 4e44dbf..0000000
Binary files a/symbols/embankment.png and /dev/null differ
diff --git a/symbols/embankment.svg b/symbols/embankment.svg
new file mode 100644
index 0000000..cce11b3
--- /dev/null
+++ b/symbols/embankment.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"
+ id="svg2"
+ height="5"
+ width="12">
+ <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(0,-11)"
+ id="layer1">
+ <path
+ id="path2988"
+ d="m 8.33331e-6,13 c 0,0.75 -3.749991e-5,0.25 0,1 L 5,14 l 0.25,2 1.5,0 0.25,-2 5,0 0,-1 z"
+ style="fill:#7b7b7b;fill-opacity:1;stroke:none" />
+ <path
+ style="fill:none;fill-opacity:1;stroke:none"
+ d="M 5,13 5.25,11 6.75,11 7,13 Z"
+ id="path3415" />
+ </g>
+</svg>
diff --git a/symbols/shields/motorway_10x1.svg b/symbols/shields/motorway_10x1.svg
index b409587..239f85a 100644
--- a/symbols/shields/motorway_10x1.svg
+++ b/symbols/shields/motorway_10x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 15.0">
- <rect x="0.5" y="0.5" width="67.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 18.0">
+ <rect x="0.5" y="0.5" width="70.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x1_z16.svg b/symbols/shields/motorway_10x1_z16.svg
index 931fa57..d7fc359 100644
--- a/symbols/shields/motorway_10x1_z16.svg
+++ b/symbols/shields/motorway_10x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 16.0">
- <rect x="0.5" y="0.5" width="73.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 20.0">
+ <rect x="0.5" y="0.5" width="69.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x1_z18.svg b/symbols/shields/motorway_10x1_z18.svg
index c0f1d36..b5d9a5f 100644
--- a/symbols/shields/motorway_10x1_z18.svg
+++ b/symbols/shields/motorway_10x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 17.0">
- <rect x="0.5" y="0.5" width="80.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 21.0">
+ <rect x="0.5" y="0.5" width="77.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x2.svg b/symbols/shields/motorway_10x2.svg
index ea4f621..d9de4e9 100644
--- a/symbols/shields/motorway_10x2.svg
+++ b/symbols/shields/motorway_10x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 24.0">
- <rect x="0.5" y="0.5" width="67.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 30.0">
+ <rect x="0.5" y="0.5" width="70.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x2_z16.svg b/symbols/shields/motorway_10x2_z16.svg
index 8334e04..0a61619 100644
--- a/symbols/shields/motorway_10x2_z16.svg
+++ b/symbols/shields/motorway_10x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 26.0">
- <rect x="0.5" y="0.5" width="73.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 34.0">
+ <rect x="0.5" y="0.5" width="69.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x2_z18.svg b/symbols/shields/motorway_10x2_z18.svg
index dbef6a8..91dec9f 100644
--- a/symbols/shields/motorway_10x2_z18.svg
+++ b/symbols/shields/motorway_10x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 28.0">
- <rect x="0.5" y="0.5" width="80.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 36.0">
+ <rect x="0.5" y="0.5" width="77.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x3.svg b/symbols/shields/motorway_10x3.svg
index 27f9cea..2ba414a 100644
--- a/symbols/shields/motorway_10x3.svg
+++ b/symbols/shields/motorway_10x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 33.0">
- <rect x="0.5" y="0.5" width="67.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 42.0">
+ <rect x="0.5" y="0.5" width="70.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x3_z16.svg b/symbols/shields/motorway_10x3_z16.svg
index 24a96a9..48c4df8 100644
--- a/symbols/shields/motorway_10x3_z16.svg
+++ b/symbols/shields/motorway_10x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 36.0">
- <rect x="0.5" y="0.5" width="73.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 48.0">
+ <rect x="0.5" y="0.5" width="69.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x3_z18.svg b/symbols/shields/motorway_10x3_z18.svg
index 89bc211..61cf3f2 100644
--- a/symbols/shields/motorway_10x3_z18.svg
+++ b/symbols/shields/motorway_10x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 39.0">
- <rect x="0.5" y="0.5" width="80.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 51.0">
+ <rect x="0.5" y="0.5" width="77.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x4.svg b/symbols/shields/motorway_10x4.svg
index e02ab5d..4cb08b2 100644
--- a/symbols/shields/motorway_10x4.svg
+++ b/symbols/shields/motorway_10x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 42.0">
- <rect x="0.5" y="0.5" width="67.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 54.0">
+ <rect x="0.5" y="0.5" width="70.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x4_z16.svg b/symbols/shields/motorway_10x4_z16.svg
index 529b29a..e3c3412 100644
--- a/symbols/shields/motorway_10x4_z16.svg
+++ b/symbols/shields/motorway_10x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 46.0">
- <rect x="0.5" y="0.5" width="73.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 62.0">
+ <rect x="0.5" y="0.5" width="69.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_10x4_z18.svg b/symbols/shields/motorway_10x4_z18.svg
index 19f6a54..c252f52 100644
--- a/symbols/shields/motorway_10x4_z18.svg
+++ b/symbols/shields/motorway_10x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 50.0">
- <rect x="0.5" y="0.5" width="80.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 66.0">
+ <rect x="0.5" y="0.5" width="77.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x1.svg b/symbols/shields/motorway_11x1.svg
index dc1ea53..db092cf 100644
--- a/symbols/shields/motorway_11x1.svg
+++ b/symbols/shields/motorway_11x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 15.0">
- <rect x="0.5" y="0.5" width="73.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 18.0">
+ <rect x="0.5" y="0.5" width="77.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x1_z16.svg b/symbols/shields/motorway_11x1_z16.svg
index 6ff4a9e..dd4bda0 100644
--- a/symbols/shields/motorway_11x1_z16.svg
+++ b/symbols/shields/motorway_11x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 16.0">
- <rect x="0.5" y="0.5" width="80.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 20.0">
+ <rect x="0.5" y="0.5" width="76.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x1_z18.svg b/symbols/shields/motorway_11x1_z18.svg
index 2476b09..50d3fd5 100644
--- a/symbols/shields/motorway_11x1_z18.svg
+++ b/symbols/shields/motorway_11x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 17.0">
- <rect x="0.5" y="0.5" width="88.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 21.0">
+ <rect x="0.5" y="0.5" width="84.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x2.svg b/symbols/shields/motorway_11x2.svg
index fe0b236..dcfb821 100644
--- a/symbols/shields/motorway_11x2.svg
+++ b/symbols/shields/motorway_11x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 24.0">
- <rect x="0.5" y="0.5" width="73.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 30.0">
+ <rect x="0.5" y="0.5" width="77.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x2_z16.svg b/symbols/shields/motorway_11x2_z16.svg
index 2e6b5ed..ffe1671 100644
--- a/symbols/shields/motorway_11x2_z16.svg
+++ b/symbols/shields/motorway_11x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 26.0">
- <rect x="0.5" y="0.5" width="80.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 34.0">
+ <rect x="0.5" y="0.5" width="76.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x2_z18.svg b/symbols/shields/motorway_11x2_z18.svg
index 7a14467..cd563d9 100644
--- a/symbols/shields/motorway_11x2_z18.svg
+++ b/symbols/shields/motorway_11x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 28.0">
- <rect x="0.5" y="0.5" width="88.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 36.0">
+ <rect x="0.5" y="0.5" width="84.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x3.svg b/symbols/shields/motorway_11x3.svg
index c7ce5c5..1402617 100644
--- a/symbols/shields/motorway_11x3.svg
+++ b/symbols/shields/motorway_11x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 33.0">
- <rect x="0.5" y="0.5" width="73.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 42.0">
+ <rect x="0.5" y="0.5" width="77.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x3_z16.svg b/symbols/shields/motorway_11x3_z16.svg
index ec1f5b8..028e9b3 100644
--- a/symbols/shields/motorway_11x3_z16.svg
+++ b/symbols/shields/motorway_11x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 36.0">
- <rect x="0.5" y="0.5" width="80.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 48.0">
+ <rect x="0.5" y="0.5" width="76.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x3_z18.svg b/symbols/shields/motorway_11x3_z18.svg
index aedcd2e..a569209 100644
--- a/symbols/shields/motorway_11x3_z18.svg
+++ b/symbols/shields/motorway_11x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 39.0">
- <rect x="0.5" y="0.5" width="88.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 51.0">
+ <rect x="0.5" y="0.5" width="84.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x4.svg b/symbols/shields/motorway_11x4.svg
index 3dc3139..0bda265 100644
--- a/symbols/shields/motorway_11x4.svg
+++ b/symbols/shields/motorway_11x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 42.0">
- <rect x="0.5" y="0.5" width="73.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 54.0">
+ <rect x="0.5" y="0.5" width="77.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x4_z16.svg b/symbols/shields/motorway_11x4_z16.svg
index 3a5f56e..2b3bc8f 100644
--- a/symbols/shields/motorway_11x4_z16.svg
+++ b/symbols/shields/motorway_11x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 46.0">
- <rect x="0.5" y="0.5" width="80.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 62.0">
+ <rect x="0.5" y="0.5" width="76.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_11x4_z18.svg b/symbols/shields/motorway_11x4_z18.svg
index 4869ebe..ac671e9 100644
--- a/symbols/shields/motorway_11x4_z18.svg
+++ b/symbols/shields/motorway_11x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 50.0">
- <rect x="0.5" y="0.5" width="88.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 66.0">
+ <rect x="0.5" y="0.5" width="84.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x1.svg b/symbols/shields/motorway_1x1.svg
index d353b58..5cf7ec6 100644
--- a/symbols/shields/motorway_1x1.svg
+++ b/symbols/shields/motorway_1x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 15.0">
- <rect x="0.5" y="0.5" width="14.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 18.0">
+ <rect x="0.5" y="0.5" width="15.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x1_z16.svg b/symbols/shields/motorway_1x1_z16.svg
index 367bd81..7263979 100644
--- a/symbols/shields/motorway_1x1_z16.svg
+++ b/symbols/shields/motorway_1x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 16.0">
- <rect x="0.5" y="0.5" width="15.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 20.0">
+ <rect x="0.5" y="0.5" width="15.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x1_z18.svg b/symbols/shields/motorway_1x1_z18.svg
index 69ae6fa..e1752a6 100644
--- a/symbols/shields/motorway_1x1_z18.svg
+++ b/symbols/shields/motorway_1x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 17.0">
- <rect x="0.5" y="0.5" width="16.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 21.0">
+ <rect x="0.5" y="0.5" width="15.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x2.svg b/symbols/shields/motorway_1x2.svg
index 0aeb147..46752a7 100644
--- a/symbols/shields/motorway_1x2.svg
+++ b/symbols/shields/motorway_1x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 24.0">
- <rect x="0.5" y="0.5" width="14.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 30.0">
+ <rect x="0.5" y="0.5" width="15.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x2_z16.svg b/symbols/shields/motorway_1x2_z16.svg
index fd7ac73..cc3ae02 100644
--- a/symbols/shields/motorway_1x2_z16.svg
+++ b/symbols/shields/motorway_1x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 26.0">
- <rect x="0.5" y="0.5" width="15.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 34.0">
+ <rect x="0.5" y="0.5" width="15.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x2_z18.svg b/symbols/shields/motorway_1x2_z18.svg
index 58b4096..0b0e150 100644
--- a/symbols/shields/motorway_1x2_z18.svg
+++ b/symbols/shields/motorway_1x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 28.0">
- <rect x="0.5" y="0.5" width="16.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 36.0">
+ <rect x="0.5" y="0.5" width="15.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x3.svg b/symbols/shields/motorway_1x3.svg
index 8809675..4151b18 100644
--- a/symbols/shields/motorway_1x3.svg
+++ b/symbols/shields/motorway_1x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 33.0">
- <rect x="0.5" y="0.5" width="14.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 42.0">
+ <rect x="0.5" y="0.5" width="15.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x3_z16.svg b/symbols/shields/motorway_1x3_z16.svg
index 0b0e150..d7841ca 100644
--- a/symbols/shields/motorway_1x3_z16.svg
+++ b/symbols/shields/motorway_1x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 36.0">
- <rect x="0.5" y="0.5" width="15.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 48.0">
+ <rect x="0.5" y="0.5" width="15.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x3_z18.svg b/symbols/shields/motorway_1x3_z18.svg
index c3f231c..3c35836 100644
--- a/symbols/shields/motorway_1x3_z18.svg
+++ b/symbols/shields/motorway_1x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 39.0">
- <rect x="0.5" y="0.5" width="16.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 51.0">
+ <rect x="0.5" y="0.5" width="15.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x4.svg b/symbols/shields/motorway_1x4.svg
index 0547a32..5e29c0f 100644
--- a/symbols/shields/motorway_1x4.svg
+++ b/symbols/shields/motorway_1x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 42.0">
- <rect x="0.5" y="0.5" width="14.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 54.0">
+ <rect x="0.5" y="0.5" width="15.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x4_z16.svg b/symbols/shields/motorway_1x4_z16.svg
index 4389d7a..8553dc5 100644
--- a/symbols/shields/motorway_1x4_z16.svg
+++ b/symbols/shields/motorway_1x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 46.0">
- <rect x="0.5" y="0.5" width="15.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 62.0">
+ <rect x="0.5" y="0.5" width="15.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_1x4_z18.svg b/symbols/shields/motorway_1x4_z18.svg
index 1fd2618..459daaa 100644
--- a/symbols/shields/motorway_1x4_z18.svg
+++ b/symbols/shields/motorway_1x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 50.0">
- <rect x="0.5" y="0.5" width="16.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 66.0">
+ <rect x="0.5" y="0.5" width="15.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x1.svg b/symbols/shields/motorway_2x1.svg
index 39dc3b3..abac4c5 100644
--- a/symbols/shields/motorway_2x1.svg
+++ b/symbols/shields/motorway_2x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 15.0">
- <rect x="0.5" y="0.5" width="20.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 18.0">
+ <rect x="0.5" y="0.5" width="21.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x1_z16.svg b/symbols/shields/motorway_2x1_z16.svg
index cdc70d4..54c92f5 100644
--- a/symbols/shields/motorway_2x1_z16.svg
+++ b/symbols/shields/motorway_2x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 16.0">
- <rect x="0.5" y="0.5" width="21.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 20.0">
+ <rect x="0.5" y="0.5" width="21.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x1_z18.svg b/symbols/shields/motorway_2x1_z18.svg
index 3fc1360..9993b1d 100644
--- a/symbols/shields/motorway_2x1_z18.svg
+++ b/symbols/shields/motorway_2x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 17.0">
- <rect x="0.5" y="0.5" width="23.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 21.0">
+ <rect x="0.5" y="0.5" width="22.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x2.svg b/symbols/shields/motorway_2x2.svg
index 27237f5..9f29439 100644
--- a/symbols/shields/motorway_2x2.svg
+++ b/symbols/shields/motorway_2x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 24.0">
- <rect x="0.5" y="0.5" width="20.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 30.0">
+ <rect x="0.5" y="0.5" width="21.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x2_z16.svg b/symbols/shields/motorway_2x2_z16.svg
index 1ad7977..52393db 100644
--- a/symbols/shields/motorway_2x2_z16.svg
+++ b/symbols/shields/motorway_2x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 26.0">
- <rect x="0.5" y="0.5" width="21.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 34.0">
+ <rect x="0.5" y="0.5" width="21.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x2_z18.svg b/symbols/shields/motorway_2x2_z18.svg
index 6b57791..44e88c2 100644
--- a/symbols/shields/motorway_2x2_z18.svg
+++ b/symbols/shields/motorway_2x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 28.0">
- <rect x="0.5" y="0.5" width="23.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 36.0">
+ <rect x="0.5" y="0.5" width="22.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x3.svg b/symbols/shields/motorway_2x3.svg
index 8217fc6..e5034c5 100644
--- a/symbols/shields/motorway_2x3.svg
+++ b/symbols/shields/motorway_2x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 33.0">
- <rect x="0.5" y="0.5" width="20.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 42.0">
+ <rect x="0.5" y="0.5" width="21.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x3_z16.svg b/symbols/shields/motorway_2x3_z16.svg
index 7d4af4a..43fd6ff 100644
--- a/symbols/shields/motorway_2x3_z16.svg
+++ b/symbols/shields/motorway_2x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 36.0">
- <rect x="0.5" y="0.5" width="21.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 48.0">
+ <rect x="0.5" y="0.5" width="21.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x3_z18.svg b/symbols/shields/motorway_2x3_z18.svg
index c79560e..893d48c 100644
--- a/symbols/shields/motorway_2x3_z18.svg
+++ b/symbols/shields/motorway_2x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 39.0">
- <rect x="0.5" y="0.5" width="23.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 51.0">
+ <rect x="0.5" y="0.5" width="22.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x4.svg b/symbols/shields/motorway_2x4.svg
index 26cbe7c..f044260 100644
--- a/symbols/shields/motorway_2x4.svg
+++ b/symbols/shields/motorway_2x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 42.0">
- <rect x="0.5" y="0.5" width="20.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 54.0">
+ <rect x="0.5" y="0.5" width="21.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x4_z16.svg b/symbols/shields/motorway_2x4_z16.svg
index 497387c..67b95ed 100644
--- a/symbols/shields/motorway_2x4_z16.svg
+++ b/symbols/shields/motorway_2x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 46.0">
- <rect x="0.5" y="0.5" width="21.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 62.0">
+ <rect x="0.5" y="0.5" width="21.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_2x4_z18.svg b/symbols/shields/motorway_2x4_z18.svg
index 49fee9a..68e0395 100644
--- a/symbols/shields/motorway_2x4_z18.svg
+++ b/symbols/shields/motorway_2x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 50.0">
- <rect x="0.5" y="0.5" width="23.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 66.0">
+ <rect x="0.5" y="0.5" width="22.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x1.svg b/symbols/shields/motorway_3x1.svg
index 71bc898..1c448c4 100644
--- a/symbols/shields/motorway_3x1.svg
+++ b/symbols/shields/motorway_3x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 15.0">
- <rect x="0.5" y="0.5" width="26.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 18.0">
+ <rect x="0.5" y="0.5" width="27.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x1_z16.svg b/symbols/shields/motorway_3x1_z16.svg
index 22de057..f06ebc0 100644
--- a/symbols/shields/motorway_3x1_z16.svg
+++ b/symbols/shields/motorway_3x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 16.0">
- <rect x="0.5" y="0.5" width="28.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 20.0">
+ <rect x="0.5" y="0.5" width="27.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x1_z18.svg b/symbols/shields/motorway_3x1_z18.svg
index 283a931..5db46e7 100644
--- a/symbols/shields/motorway_3x1_z18.svg
+++ b/symbols/shields/motorway_3x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 17.0">
- <rect x="0.5" y="0.5" width="30.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 21.0">
+ <rect x="0.5" y="0.5" width="29.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x2.svg b/symbols/shields/motorway_3x2.svg
index 6647171..d86fc81 100644
--- a/symbols/shields/motorway_3x2.svg
+++ b/symbols/shields/motorway_3x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 24.0">
- <rect x="0.5" y="0.5" width="26.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 30.0">
+ <rect x="0.5" y="0.5" width="27.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x2_z16.svg b/symbols/shields/motorway_3x2_z16.svg
index 09feec4..7e5c81d 100644
--- a/symbols/shields/motorway_3x2_z16.svg
+++ b/symbols/shields/motorway_3x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 26.0">
- <rect x="0.5" y="0.5" width="28.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 34.0">
+ <rect x="0.5" y="0.5" width="27.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x2_z18.svg b/symbols/shields/motorway_3x2_z18.svg
index 4e24f6e..8d8687f 100644
--- a/symbols/shields/motorway_3x2_z18.svg
+++ b/symbols/shields/motorway_3x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 28.0">
- <rect x="0.5" y="0.5" width="30.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 36.0">
+ <rect x="0.5" y="0.5" width="29.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x3.svg b/symbols/shields/motorway_3x3.svg
index 6654f24..6c30856 100644
--- a/symbols/shields/motorway_3x3.svg
+++ b/symbols/shields/motorway_3x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 33.0">
- <rect x="0.5" y="0.5" width="26.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 42.0">
+ <rect x="0.5" y="0.5" width="27.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x3_z16.svg b/symbols/shields/motorway_3x3_z16.svg
index 279f1f8..2356c9f 100644
--- a/symbols/shields/motorway_3x3_z16.svg
+++ b/symbols/shields/motorway_3x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 36.0">
- <rect x="0.5" y="0.5" width="28.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 48.0">
+ <rect x="0.5" y="0.5" width="27.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x3_z18.svg b/symbols/shields/motorway_3x3_z18.svg
index 90db21d..5d2a022 100644
--- a/symbols/shields/motorway_3x3_z18.svg
+++ b/symbols/shields/motorway_3x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 39.0">
- <rect x="0.5" y="0.5" width="30.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 51.0">
+ <rect x="0.5" y="0.5" width="29.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x4.svg b/symbols/shields/motorway_3x4.svg
index 4b638fa..354d344 100644
--- a/symbols/shields/motorway_3x4.svg
+++ b/symbols/shields/motorway_3x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 42.0">
- <rect x="0.5" y="0.5" width="26.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 54.0">
+ <rect x="0.5" y="0.5" width="27.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x4_z16.svg b/symbols/shields/motorway_3x4_z16.svg
index b629084..907b938 100644
--- a/symbols/shields/motorway_3x4_z16.svg
+++ b/symbols/shields/motorway_3x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 46.0">
- <rect x="0.5" y="0.5" width="28.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 62.0">
+ <rect x="0.5" y="0.5" width="27.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_3x4_z18.svg b/symbols/shields/motorway_3x4_z18.svg
index 26aeecd..1391eb8 100644
--- a/symbols/shields/motorway_3x4_z18.svg
+++ b/symbols/shields/motorway_3x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 50.0">
- <rect x="0.5" y="0.5" width="30.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 66.0">
+ <rect x="0.5" y="0.5" width="29.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x1.svg b/symbols/shields/motorway_4x1.svg
index e38dcb9..17311c9 100644
--- a/symbols/shields/motorway_4x1.svg
+++ b/symbols/shields/motorway_4x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 15.0">
- <rect x="0.5" y="0.5" width="32.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 18.0">
+ <rect x="0.5" y="0.5" width="33.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x1_z16.svg b/symbols/shields/motorway_4x1_z16.svg
index b6b0cec..c8a3f97 100644
--- a/symbols/shields/motorway_4x1_z16.svg
+++ b/symbols/shields/motorway_4x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 16.0">
- <rect x="0.5" y="0.5" width="34.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 20.0">
+ <rect x="0.5" y="0.5" width="33.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x1_z18.svg b/symbols/shields/motorway_4x1_z18.svg
index 312bf9d..943ca5c 100644
--- a/symbols/shields/motorway_4x1_z18.svg
+++ b/symbols/shields/motorway_4x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 17.0">
- <rect x="0.5" y="0.5" width="37.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 21.0">
+ <rect x="0.5" y="0.5" width="36.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x2.svg b/symbols/shields/motorway_4x2.svg
index e449e34..991ecba 100644
--- a/symbols/shields/motorway_4x2.svg
+++ b/symbols/shields/motorway_4x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 24.0">
- <rect x="0.5" y="0.5" width="32.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 30.0">
+ <rect x="0.5" y="0.5" width="33.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x2_z16.svg b/symbols/shields/motorway_4x2_z16.svg
index fe9c619..9fdfb2a 100644
--- a/symbols/shields/motorway_4x2_z16.svg
+++ b/symbols/shields/motorway_4x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 26.0">
- <rect x="0.5" y="0.5" width="34.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 34.0">
+ <rect x="0.5" y="0.5" width="33.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x2_z18.svg b/symbols/shields/motorway_4x2_z18.svg
index a01d0f1..2183e2a 100644
--- a/symbols/shields/motorway_4x2_z18.svg
+++ b/symbols/shields/motorway_4x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 28.0">
- <rect x="0.5" y="0.5" width="37.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 36.0">
+ <rect x="0.5" y="0.5" width="36.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x3.svg b/symbols/shields/motorway_4x3.svg
index 90fa761..5d17a31 100644
--- a/symbols/shields/motorway_4x3.svg
+++ b/symbols/shields/motorway_4x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 33.0">
- <rect x="0.5" y="0.5" width="32.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 42.0">
+ <rect x="0.5" y="0.5" width="33.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x3_z16.svg b/symbols/shields/motorway_4x3_z16.svg
index 08ffcc7..1341205 100644
--- a/symbols/shields/motorway_4x3_z16.svg
+++ b/symbols/shields/motorway_4x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 36.0">
- <rect x="0.5" y="0.5" width="34.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 48.0">
+ <rect x="0.5" y="0.5" width="33.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x3_z18.svg b/symbols/shields/motorway_4x3_z18.svg
index 1543d78..e239603 100644
--- a/symbols/shields/motorway_4x3_z18.svg
+++ b/symbols/shields/motorway_4x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 39.0">
- <rect x="0.5" y="0.5" width="37.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 51.0">
+ <rect x="0.5" y="0.5" width="36.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x4.svg b/symbols/shields/motorway_4x4.svg
index 55de374..b902ff1 100644
--- a/symbols/shields/motorway_4x4.svg
+++ b/symbols/shields/motorway_4x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 42.0">
- <rect x="0.5" y="0.5" width="32.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 54.0">
+ <rect x="0.5" y="0.5" width="33.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x4_z16.svg b/symbols/shields/motorway_4x4_z16.svg
index 70b6b76..e3959bf 100644
--- a/symbols/shields/motorway_4x4_z16.svg
+++ b/symbols/shields/motorway_4x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 46.0">
- <rect x="0.5" y="0.5" width="34.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 62.0">
+ <rect x="0.5" y="0.5" width="33.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_4x4_z18.svg b/symbols/shields/motorway_4x4_z18.svg
index 9efb114..0c91268 100644
--- a/symbols/shields/motorway_4x4_z18.svg
+++ b/symbols/shields/motorway_4x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 50.0">
- <rect x="0.5" y="0.5" width="37.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 66.0">
+ <rect x="0.5" y="0.5" width="36.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x1.svg b/symbols/shields/motorway_5x1.svg
index 65e30e6..183b27e 100644
--- a/symbols/shields/motorway_5x1.svg
+++ b/symbols/shields/motorway_5x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 15.0">
- <rect x="0.5" y="0.5" width="38.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 18.0">
+ <rect x="0.5" y="0.5" width="39.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x1_z16.svg b/symbols/shields/motorway_5x1_z16.svg
index 3ef9e60..af10c88 100644
--- a/symbols/shields/motorway_5x1_z16.svg
+++ b/symbols/shields/motorway_5x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 16.0">
- <rect x="0.5" y="0.5" width="41.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 20.0">
+ <rect x="0.5" y="0.5" width="39.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x1_z18.svg b/symbols/shields/motorway_5x1_z18.svg
index 32d4919..6b8e992 100644
--- a/symbols/shields/motorway_5x1_z18.svg
+++ b/symbols/shields/motorway_5x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 17.0">
- <rect x="0.5" y="0.5" width="44.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 21.0">
+ <rect x="0.5" y="0.5" width="43.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x2.svg b/symbols/shields/motorway_5x2.svg
index 3839999..1c2fd0f 100644
--- a/symbols/shields/motorway_5x2.svg
+++ b/symbols/shields/motorway_5x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 24.0">
- <rect x="0.5" y="0.5" width="38.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 30.0">
+ <rect x="0.5" y="0.5" width="39.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x2_z16.svg b/symbols/shields/motorway_5x2_z16.svg
index 5db23b0..e6a257e 100644
--- a/symbols/shields/motorway_5x2_z16.svg
+++ b/symbols/shields/motorway_5x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 26.0">
- <rect x="0.5" y="0.5" width="41.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 34.0">
+ <rect x="0.5" y="0.5" width="39.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x2_z18.svg b/symbols/shields/motorway_5x2_z18.svg
index c979258..5b0e026 100644
--- a/symbols/shields/motorway_5x2_z18.svg
+++ b/symbols/shields/motorway_5x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 28.0">
- <rect x="0.5" y="0.5" width="44.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 36.0">
+ <rect x="0.5" y="0.5" width="43.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x3.svg b/symbols/shields/motorway_5x3.svg
index 904fcc4..e28207e 100644
--- a/symbols/shields/motorway_5x3.svg
+++ b/symbols/shields/motorway_5x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 33.0">
- <rect x="0.5" y="0.5" width="38.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 42.0">
+ <rect x="0.5" y="0.5" width="39.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x3_z16.svg b/symbols/shields/motorway_5x3_z16.svg
index 2c5cd94..cd67f00 100644
--- a/symbols/shields/motorway_5x3_z16.svg
+++ b/symbols/shields/motorway_5x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 36.0">
- <rect x="0.5" y="0.5" width="41.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 48.0">
+ <rect x="0.5" y="0.5" width="39.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x3_z18.svg b/symbols/shields/motorway_5x3_z18.svg
index 05f0bf9..4167bdd 100644
--- a/symbols/shields/motorway_5x3_z18.svg
+++ b/symbols/shields/motorway_5x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 39.0">
- <rect x="0.5" y="0.5" width="44.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 51.0">
+ <rect x="0.5" y="0.5" width="43.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x4.svg b/symbols/shields/motorway_5x4.svg
index e5e10f7..fd75032 100644
--- a/symbols/shields/motorway_5x4.svg
+++ b/symbols/shields/motorway_5x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 42.0">
- <rect x="0.5" y="0.5" width="38.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 54.0">
+ <rect x="0.5" y="0.5" width="39.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x4_z16.svg b/symbols/shields/motorway_5x4_z16.svg
index a35dce9..777ce40 100644
--- a/symbols/shields/motorway_5x4_z16.svg
+++ b/symbols/shields/motorway_5x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 46.0">
- <rect x="0.5" y="0.5" width="41.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 62.0">
+ <rect x="0.5" y="0.5" width="39.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_5x4_z18.svg b/symbols/shields/motorway_5x4_z18.svg
index c45a1d7..6394605 100644
--- a/symbols/shields/motorway_5x4_z18.svg
+++ b/symbols/shields/motorway_5x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 50.0">
- <rect x="0.5" y="0.5" width="44.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 66.0">
+ <rect x="0.5" y="0.5" width="43.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x1.svg b/symbols/shields/motorway_6x1.svg
index 1cb9303..72a8351 100644
--- a/symbols/shields/motorway_6x1.svg
+++ b/symbols/shields/motorway_6x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 15.0">
- <rect x="0.5" y="0.5" width="44.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 18.0">
+ <rect x="0.5" y="0.5" width="46.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x1_z16.svg b/symbols/shields/motorway_6x1_z16.svg
index 9b6cbaf..ca7b226 100644
--- a/symbols/shields/motorway_6x1_z16.svg
+++ b/symbols/shields/motorway_6x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 16.0">
- <rect x="0.5" y="0.5" width="47.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 20.0">
+ <rect x="0.5" y="0.5" width="45.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x1_z18.svg b/symbols/shields/motorway_6x1_z18.svg
index 35be0df..330966f 100644
--- a/symbols/shields/motorway_6x1_z18.svg
+++ b/symbols/shields/motorway_6x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 17.0">
- <rect x="0.5" y="0.5" width="52.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 21.0">
+ <rect x="0.5" y="0.5" width="50.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x2.svg b/symbols/shields/motorway_6x2.svg
index 24af88f..7fb5d3f 100644
--- a/symbols/shields/motorway_6x2.svg
+++ b/symbols/shields/motorway_6x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 24.0">
- <rect x="0.5" y="0.5" width="44.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 30.0">
+ <rect x="0.5" y="0.5" width="46.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x2_z16.svg b/symbols/shields/motorway_6x2_z16.svg
index 5a885b1..f7cc027 100644
--- a/symbols/shields/motorway_6x2_z16.svg
+++ b/symbols/shields/motorway_6x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 26.0">
- <rect x="0.5" y="0.5" width="47.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 34.0">
+ <rect x="0.5" y="0.5" width="45.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x2_z18.svg b/symbols/shields/motorway_6x2_z18.svg
index cdce6f4..5226d2d 100644
--- a/symbols/shields/motorway_6x2_z18.svg
+++ b/symbols/shields/motorway_6x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 28.0">
- <rect x="0.5" y="0.5" width="52.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 36.0">
+ <rect x="0.5" y="0.5" width="50.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x3.svg b/symbols/shields/motorway_6x3.svg
index 23a4ff3..a998826 100644
--- a/symbols/shields/motorway_6x3.svg
+++ b/symbols/shields/motorway_6x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 33.0">
- <rect x="0.5" y="0.5" width="44.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 42.0">
+ <rect x="0.5" y="0.5" width="46.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x3_z16.svg b/symbols/shields/motorway_6x3_z16.svg
index bc435b0..b078857 100644
--- a/symbols/shields/motorway_6x3_z16.svg
+++ b/symbols/shields/motorway_6x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 36.0">
- <rect x="0.5" y="0.5" width="47.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 48.0">
+ <rect x="0.5" y="0.5" width="45.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x3_z18.svg b/symbols/shields/motorway_6x3_z18.svg
index 58824f6..d041437 100644
--- a/symbols/shields/motorway_6x3_z18.svg
+++ b/symbols/shields/motorway_6x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 39.0">
- <rect x="0.5" y="0.5" width="52.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 51.0">
+ <rect x="0.5" y="0.5" width="50.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x4.svg b/symbols/shields/motorway_6x4.svg
index 66f972b..a3eeef1 100644
--- a/symbols/shields/motorway_6x4.svg
+++ b/symbols/shields/motorway_6x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 42.0">
- <rect x="0.5" y="0.5" width="44.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 54.0">
+ <rect x="0.5" y="0.5" width="46.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x4_z16.svg b/symbols/shields/motorway_6x4_z16.svg
index 5743a6c..5fe5ef5 100644
--- a/symbols/shields/motorway_6x4_z16.svg
+++ b/symbols/shields/motorway_6x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 46.0">
- <rect x="0.5" y="0.5" width="47.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 62.0">
+ <rect x="0.5" y="0.5" width="45.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_6x4_z18.svg b/symbols/shields/motorway_6x4_z18.svg
index 769fa4c..396d06f 100644
--- a/symbols/shields/motorway_6x4_z18.svg
+++ b/symbols/shields/motorway_6x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 50.0">
- <rect x="0.5" y="0.5" width="52.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 66.0">
+ <rect x="0.5" y="0.5" width="50.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x1.svg b/symbols/shields/motorway_7x1.svg
index 57e2940..78f7e09 100644
--- a/symbols/shields/motorway_7x1.svg
+++ b/symbols/shields/motorway_7x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 15.0">
- <rect x="0.5" y="0.5" width="50.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 18.0">
+ <rect x="0.5" y="0.5" width="52.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x1_z16.svg b/symbols/shields/motorway_7x1_z16.svg
index e0e5bbb..576a123 100644
--- a/symbols/shields/motorway_7x1_z16.svg
+++ b/symbols/shields/motorway_7x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 16.0">
- <rect x="0.5" y="0.5" width="54.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 20.0">
+ <rect x="0.5" y="0.5" width="51.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x1_z18.svg b/symbols/shields/motorway_7x1_z18.svg
index c334b4f..d5e9e28 100644
--- a/symbols/shields/motorway_7x1_z18.svg
+++ b/symbols/shields/motorway_7x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 17.0">
- <rect x="0.5" y="0.5" width="59.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 21.0">
+ <rect x="0.5" y="0.5" width="57.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x2.svg b/symbols/shields/motorway_7x2.svg
index 322bb8d..f376204 100644
--- a/symbols/shields/motorway_7x2.svg
+++ b/symbols/shields/motorway_7x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 24.0">
- <rect x="0.5" y="0.5" width="50.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 30.0">
+ <rect x="0.5" y="0.5" width="52.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x2_z16.svg b/symbols/shields/motorway_7x2_z16.svg
index 7fb466d..f7ea19c 100644
--- a/symbols/shields/motorway_7x2_z16.svg
+++ b/symbols/shields/motorway_7x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 26.0">
- <rect x="0.5" y="0.5" width="54.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 34.0">
+ <rect x="0.5" y="0.5" width="51.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x2_z18.svg b/symbols/shields/motorway_7x2_z18.svg
index 18933e9..6dbe078 100644
--- a/symbols/shields/motorway_7x2_z18.svg
+++ b/symbols/shields/motorway_7x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 28.0">
- <rect x="0.5" y="0.5" width="59.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 36.0">
+ <rect x="0.5" y="0.5" width="57.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x3.svg b/symbols/shields/motorway_7x3.svg
index 58d153e..20bd166 100644
--- a/symbols/shields/motorway_7x3.svg
+++ b/symbols/shields/motorway_7x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 33.0">
- <rect x="0.5" y="0.5" width="50.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 42.0">
+ <rect x="0.5" y="0.5" width="52.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x3_z16.svg b/symbols/shields/motorway_7x3_z16.svg
index 284a6c5..eae5ff0 100644
--- a/symbols/shields/motorway_7x3_z16.svg
+++ b/symbols/shields/motorway_7x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 36.0">
- <rect x="0.5" y="0.5" width="54.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 48.0">
+ <rect x="0.5" y="0.5" width="51.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x3_z18.svg b/symbols/shields/motorway_7x3_z18.svg
index b0f4325..7293411 100644
--- a/symbols/shields/motorway_7x3_z18.svg
+++ b/symbols/shields/motorway_7x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 39.0">
- <rect x="0.5" y="0.5" width="59.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 51.0">
+ <rect x="0.5" y="0.5" width="57.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x4.svg b/symbols/shields/motorway_7x4.svg
index 888f2c2..285f7b7 100644
--- a/symbols/shields/motorway_7x4.svg
+++ b/symbols/shields/motorway_7x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 42.0">
- <rect x="0.5" y="0.5" width="50.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 54.0">
+ <rect x="0.5" y="0.5" width="52.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x4_z16.svg b/symbols/shields/motorway_7x4_z16.svg
index 39c9314..05e6cf3 100644
--- a/symbols/shields/motorway_7x4_z16.svg
+++ b/symbols/shields/motorway_7x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 46.0">
- <rect x="0.5" y="0.5" width="54.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 62.0">
+ <rect x="0.5" y="0.5" width="51.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_7x4_z18.svg b/symbols/shields/motorway_7x4_z18.svg
index 8cacb0a..f86a4b3 100644
--- a/symbols/shields/motorway_7x4_z18.svg
+++ b/symbols/shields/motorway_7x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 50.0">
- <rect x="0.5" y="0.5" width="59.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 66.0">
+ <rect x="0.5" y="0.5" width="57.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x1.svg b/symbols/shields/motorway_8x1.svg
index d157d0d..ec97460 100644
--- a/symbols/shields/motorway_8x1.svg
+++ b/symbols/shields/motorway_8x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 15.0">
- <rect x="0.5" y="0.5" width="56.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 18.0">
+ <rect x="0.5" y="0.5" width="58.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x1_z16.svg b/symbols/shields/motorway_8x1_z16.svg
index bbebef9..a7db56b 100644
--- a/symbols/shields/motorway_8x1_z16.svg
+++ b/symbols/shields/motorway_8x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 16.0">
- <rect x="0.5" y="0.5" width="60.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 20.0">
+ <rect x="0.5" y="0.5" width="57.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x1_z18.svg b/symbols/shields/motorway_8x1_z18.svg
index a14c89a..84532e8 100644
--- a/symbols/shields/motorway_8x1_z18.svg
+++ b/symbols/shields/motorway_8x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 17.0">
- <rect x="0.5" y="0.5" width="66.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 21.0">
+ <rect x="0.5" y="0.5" width="64.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x2.svg b/symbols/shields/motorway_8x2.svg
index 310c0b4..77fce24 100644
--- a/symbols/shields/motorway_8x2.svg
+++ b/symbols/shields/motorway_8x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 24.0">
- <rect x="0.5" y="0.5" width="56.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 30.0">
+ <rect x="0.5" y="0.5" width="58.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x2_z16.svg b/symbols/shields/motorway_8x2_z16.svg
index 496ef2c..2c8e846 100644
--- a/symbols/shields/motorway_8x2_z16.svg
+++ b/symbols/shields/motorway_8x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 26.0">
- <rect x="0.5" y="0.5" width="60.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 34.0">
+ <rect x="0.5" y="0.5" width="57.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x2_z18.svg b/symbols/shields/motorway_8x2_z18.svg
index 21921b3..d6dc85a 100644
--- a/symbols/shields/motorway_8x2_z18.svg
+++ b/symbols/shields/motorway_8x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 28.0">
- <rect x="0.5" y="0.5" width="66.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 36.0">
+ <rect x="0.5" y="0.5" width="64.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x3.svg b/symbols/shields/motorway_8x3.svg
index 85f3c86..b194cff 100644
--- a/symbols/shields/motorway_8x3.svg
+++ b/symbols/shields/motorway_8x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 33.0">
- <rect x="0.5" y="0.5" width="56.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 42.0">
+ <rect x="0.5" y="0.5" width="58.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x3_z16.svg b/symbols/shields/motorway_8x3_z16.svg
index 35c5caa..2d8c570 100644
--- a/symbols/shields/motorway_8x3_z16.svg
+++ b/symbols/shields/motorway_8x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 36.0">
- <rect x="0.5" y="0.5" width="60.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 48.0">
+ <rect x="0.5" y="0.5" width="57.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x3_z18.svg b/symbols/shields/motorway_8x3_z18.svg
index 6043906..4265304 100644
--- a/symbols/shields/motorway_8x3_z18.svg
+++ b/symbols/shields/motorway_8x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 39.0">
- <rect x="0.5" y="0.5" width="66.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 51.0">
+ <rect x="0.5" y="0.5" width="64.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x4.svg b/symbols/shields/motorway_8x4.svg
index cbc8189..c10cbd0 100644
--- a/symbols/shields/motorway_8x4.svg
+++ b/symbols/shields/motorway_8x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 42.0">
- <rect x="0.5" y="0.5" width="56.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 54.0">
+ <rect x="0.5" y="0.5" width="58.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x4_z16.svg b/symbols/shields/motorway_8x4_z16.svg
index 10fe9af..cf5bb10 100644
--- a/symbols/shields/motorway_8x4_z16.svg
+++ b/symbols/shields/motorway_8x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 46.0">
- <rect x="0.5" y="0.5" width="60.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 62.0">
+ <rect x="0.5" y="0.5" width="57.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_8x4_z18.svg b/symbols/shields/motorway_8x4_z18.svg
index a8e930e..850d87c 100644
--- a/symbols/shields/motorway_8x4_z18.svg
+++ b/symbols/shields/motorway_8x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 50.0">
- <rect x="0.5" y="0.5" width="66.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 66.0">
+ <rect x="0.5" y="0.5" width="64.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x1.svg b/symbols/shields/motorway_9x1.svg
index 40d60b2..4d677b8 100644
--- a/symbols/shields/motorway_9x1.svg
+++ b/symbols/shields/motorway_9x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 15.0">
- <rect x="0.5" y="0.5" width="62.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 18.0">
+ <rect x="0.5" y="0.5" width="64.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x1_z16.svg b/symbols/shields/motorway_9x1_z16.svg
index b985c5b..9cad1d4 100644
--- a/symbols/shields/motorway_9x1_z16.svg
+++ b/symbols/shields/motorway_9x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 16.0">
- <rect x="0.5" y="0.5" width="67.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 20.0">
+ <rect x="0.5" y="0.5" width="63.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x1_z18.svg b/symbols/shields/motorway_9x1_z18.svg
index 5a1ff7a..397d1ac 100644
--- a/symbols/shields/motorway_9x1_z18.svg
+++ b/symbols/shields/motorway_9x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 17.0">
- <rect x="0.5" y="0.5" width="73.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 21.0">
+ <rect x="0.5" y="0.5" width="71.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x2.svg b/symbols/shields/motorway_9x2.svg
index f95eeaa..7c9876c 100644
--- a/symbols/shields/motorway_9x2.svg
+++ b/symbols/shields/motorway_9x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 24.0">
- <rect x="0.5" y="0.5" width="62.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 30.0">
+ <rect x="0.5" y="0.5" width="64.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x2_z16.svg b/symbols/shields/motorway_9x2_z16.svg
index eca7a2e..ac4fa65 100644
--- a/symbols/shields/motorway_9x2_z16.svg
+++ b/symbols/shields/motorway_9x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 26.0">
- <rect x="0.5" y="0.5" width="67.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 34.0">
+ <rect x="0.5" y="0.5" width="63.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x2_z18.svg b/symbols/shields/motorway_9x2_z18.svg
index 5eda1ee..b79e31b 100644
--- a/symbols/shields/motorway_9x2_z18.svg
+++ b/symbols/shields/motorway_9x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 28.0">
- <rect x="0.5" y="0.5" width="73.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 36.0">
+ <rect x="0.5" y="0.5" width="71.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x3.svg b/symbols/shields/motorway_9x3.svg
index 05f19ca..e517012 100644
--- a/symbols/shields/motorway_9x3.svg
+++ b/symbols/shields/motorway_9x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 33.0">
- <rect x="0.5" y="0.5" width="62.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 42.0">
+ <rect x="0.5" y="0.5" width="64.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x3_z16.svg b/symbols/shields/motorway_9x3_z16.svg
index e7d3046..e666f1c 100644
--- a/symbols/shields/motorway_9x3_z16.svg
+++ b/symbols/shields/motorway_9x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 36.0">
- <rect x="0.5" y="0.5" width="67.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 48.0">
+ <rect x="0.5" y="0.5" width="63.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x3_z18.svg b/symbols/shields/motorway_9x3_z18.svg
index df78c11..9c4e2f1 100644
--- a/symbols/shields/motorway_9x3_z18.svg
+++ b/symbols/shields/motorway_9x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 39.0">
- <rect x="0.5" y="0.5" width="73.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 51.0">
+ <rect x="0.5" y="0.5" width="71.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x4.svg b/symbols/shields/motorway_9x4.svg
index 174ef22..8eebf99 100644
--- a/symbols/shields/motorway_9x4.svg
+++ b/symbols/shields/motorway_9x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 42.0">
- <rect x="0.5" y="0.5" width="62.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 54.0">
+ <rect x="0.5" y="0.5" width="64.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x4_z16.svg b/symbols/shields/motorway_9x4_z16.svg
index 6a9ebe1..1e8f49a 100644
--- a/symbols/shields/motorway_9x4_z16.svg
+++ b/symbols/shields/motorway_9x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 46.0">
- <rect x="0.5" y="0.5" width="67.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 62.0">
+ <rect x="0.5" y="0.5" width="63.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/motorway_9x4_z18.svg b/symbols/shields/motorway_9x4_z18.svg
index b568c6d..069bb81 100644
--- a/symbols/shields/motorway_9x4_z18.svg
+++ b/symbols/shields/motorway_9x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 50.0">
- <rect x="0.5" y="0.5" width="73.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 66.0">
+ <rect x="0.5" y="0.5" width="71.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eccdd1;stroke:#d39da5;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x1.svg b/symbols/shields/primary_10x1.svg
index 9675d9f..ef43d6c 100644
--- a/symbols/shields/primary_10x1.svg
+++ b/symbols/shields/primary_10x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 15.0">
- <rect x="0.5" y="0.5" width="67.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 18.0">
+ <rect x="0.5" y="0.5" width="70.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x1_z16.svg b/symbols/shields/primary_10x1_z16.svg
index 47dceb5..2eda8a4 100644
--- a/symbols/shields/primary_10x1_z16.svg
+++ b/symbols/shields/primary_10x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 16.0">
- <rect x="0.5" y="0.5" width="73.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 20.0">
+ <rect x="0.5" y="0.5" width="69.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x1_z18.svg b/symbols/shields/primary_10x1_z18.svg
index b6bf76c..e9cf3f9 100644
--- a/symbols/shields/primary_10x1_z18.svg
+++ b/symbols/shields/primary_10x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 17.0">
- <rect x="0.5" y="0.5" width="80.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 21.0">
+ <rect x="0.5" y="0.5" width="77.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x2.svg b/symbols/shields/primary_10x2.svg
index 0419d8e..f6cc21c 100644
--- a/symbols/shields/primary_10x2.svg
+++ b/symbols/shields/primary_10x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 24.0">
- <rect x="0.5" y="0.5" width="67.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 30.0">
+ <rect x="0.5" y="0.5" width="70.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x2_z16.svg b/symbols/shields/primary_10x2_z16.svg
index dd360ee..8d66503 100644
--- a/symbols/shields/primary_10x2_z16.svg
+++ b/symbols/shields/primary_10x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 26.0">
- <rect x="0.5" y="0.5" width="73.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 34.0">
+ <rect x="0.5" y="0.5" width="69.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x2_z18.svg b/symbols/shields/primary_10x2_z18.svg
index debc130..851f3f0 100644
--- a/symbols/shields/primary_10x2_z18.svg
+++ b/symbols/shields/primary_10x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 28.0">
- <rect x="0.5" y="0.5" width="80.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 36.0">
+ <rect x="0.5" y="0.5" width="77.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x3.svg b/symbols/shields/primary_10x3.svg
index 8d6be36..06c8821 100644
--- a/symbols/shields/primary_10x3.svg
+++ b/symbols/shields/primary_10x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 33.0">
- <rect x="0.5" y="0.5" width="67.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 42.0">
+ <rect x="0.5" y="0.5" width="70.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x3_z16.svg b/symbols/shields/primary_10x3_z16.svg
index e059e2e..61d53b4 100644
--- a/symbols/shields/primary_10x3_z16.svg
+++ b/symbols/shields/primary_10x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 36.0">
- <rect x="0.5" y="0.5" width="73.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 48.0">
+ <rect x="0.5" y="0.5" width="69.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x3_z18.svg b/symbols/shields/primary_10x3_z18.svg
index d95f379..d200af5 100644
--- a/symbols/shields/primary_10x3_z18.svg
+++ b/symbols/shields/primary_10x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 39.0">
- <rect x="0.5" y="0.5" width="80.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 51.0">
+ <rect x="0.5" y="0.5" width="77.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x4.svg b/symbols/shields/primary_10x4.svg
index 2c8fdb0..584e4c6 100644
--- a/symbols/shields/primary_10x4.svg
+++ b/symbols/shields/primary_10x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 42.0">
- <rect x="0.5" y="0.5" width="67.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 54.0">
+ <rect x="0.5" y="0.5" width="70.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x4_z16.svg b/symbols/shields/primary_10x4_z16.svg
index 9c792fa..3b8be30 100644
--- a/symbols/shields/primary_10x4_z16.svg
+++ b/symbols/shields/primary_10x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 46.0">
- <rect x="0.5" y="0.5" width="73.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 62.0">
+ <rect x="0.5" y="0.5" width="69.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_10x4_z18.svg b/symbols/shields/primary_10x4_z18.svg
index 2ecb32d..ea251c4 100644
--- a/symbols/shields/primary_10x4_z18.svg
+++ b/symbols/shields/primary_10x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 50.0">
- <rect x="0.5" y="0.5" width="80.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 66.0">
+ <rect x="0.5" y="0.5" width="77.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x1.svg b/symbols/shields/primary_11x1.svg
index ef7380f..9bc369c 100644
--- a/symbols/shields/primary_11x1.svg
+++ b/symbols/shields/primary_11x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 15.0">
- <rect x="0.5" y="0.5" width="73.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 18.0">
+ <rect x="0.5" y="0.5" width="77.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x1_z16.svg b/symbols/shields/primary_11x1_z16.svg
index d545256..613b124 100644
--- a/symbols/shields/primary_11x1_z16.svg
+++ b/symbols/shields/primary_11x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 16.0">
- <rect x="0.5" y="0.5" width="80.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 20.0">
+ <rect x="0.5" y="0.5" width="76.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x1_z18.svg b/symbols/shields/primary_11x1_z18.svg
index 4647f17..d840156 100644
--- a/symbols/shields/primary_11x1_z18.svg
+++ b/symbols/shields/primary_11x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 17.0">
- <rect x="0.5" y="0.5" width="88.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 21.0">
+ <rect x="0.5" y="0.5" width="84.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x2.svg b/symbols/shields/primary_11x2.svg
index 4ae792c..fc5edef 100644
--- a/symbols/shields/primary_11x2.svg
+++ b/symbols/shields/primary_11x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 24.0">
- <rect x="0.5" y="0.5" width="73.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 30.0">
+ <rect x="0.5" y="0.5" width="77.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x2_z16.svg b/symbols/shields/primary_11x2_z16.svg
index 6de6f7f..d72f4c3 100644
--- a/symbols/shields/primary_11x2_z16.svg
+++ b/symbols/shields/primary_11x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 26.0">
- <rect x="0.5" y="0.5" width="80.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 34.0">
+ <rect x="0.5" y="0.5" width="76.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x2_z18.svg b/symbols/shields/primary_11x2_z18.svg
index c93ddb4..811c60d 100644
--- a/symbols/shields/primary_11x2_z18.svg
+++ b/symbols/shields/primary_11x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 28.0">
- <rect x="0.5" y="0.5" width="88.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 36.0">
+ <rect x="0.5" y="0.5" width="84.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x3.svg b/symbols/shields/primary_11x3.svg
index 38a52b5..e62afb7 100644
--- a/symbols/shields/primary_11x3.svg
+++ b/symbols/shields/primary_11x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 33.0">
- <rect x="0.5" y="0.5" width="73.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 42.0">
+ <rect x="0.5" y="0.5" width="77.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x3_z16.svg b/symbols/shields/primary_11x3_z16.svg
index 5a7dbbb..276364d 100644
--- a/symbols/shields/primary_11x3_z16.svg
+++ b/symbols/shields/primary_11x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 36.0">
- <rect x="0.5" y="0.5" width="80.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 48.0">
+ <rect x="0.5" y="0.5" width="76.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x3_z18.svg b/symbols/shields/primary_11x3_z18.svg
index bcea4ae..9b2857e 100644
--- a/symbols/shields/primary_11x3_z18.svg
+++ b/symbols/shields/primary_11x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 39.0">
- <rect x="0.5" y="0.5" width="88.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 51.0">
+ <rect x="0.5" y="0.5" width="84.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x4.svg b/symbols/shields/primary_11x4.svg
index e3bf5f3..9849277 100644
--- a/symbols/shields/primary_11x4.svg
+++ b/symbols/shields/primary_11x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 42.0">
- <rect x="0.5" y="0.5" width="73.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 54.0">
+ <rect x="0.5" y="0.5" width="77.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x4_z16.svg b/symbols/shields/primary_11x4_z16.svg
index 720cc31..9cc4f87 100644
--- a/symbols/shields/primary_11x4_z16.svg
+++ b/symbols/shields/primary_11x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 46.0">
- <rect x="0.5" y="0.5" width="80.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 62.0">
+ <rect x="0.5" y="0.5" width="76.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_11x4_z18.svg b/symbols/shields/primary_11x4_z18.svg
index b0a7104..cae36e9 100644
--- a/symbols/shields/primary_11x4_z18.svg
+++ b/symbols/shields/primary_11x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 50.0">
- <rect x="0.5" y="0.5" width="88.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 66.0">
+ <rect x="0.5" y="0.5" width="84.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x1.svg b/symbols/shields/primary_1x1.svg
index ad125b6..967a72f 100644
--- a/symbols/shields/primary_1x1.svg
+++ b/symbols/shields/primary_1x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 15.0">
- <rect x="0.5" y="0.5" width="14.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 18.0">
+ <rect x="0.5" y="0.5" width="15.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x1_z16.svg b/symbols/shields/primary_1x1_z16.svg
index 876eb43..7605be3 100644
--- a/symbols/shields/primary_1x1_z16.svg
+++ b/symbols/shields/primary_1x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 16.0">
- <rect x="0.5" y="0.5" width="15.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 20.0">
+ <rect x="0.5" y="0.5" width="15.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x1_z18.svg b/symbols/shields/primary_1x1_z18.svg
index f51cc8b..c05f19e 100644
--- a/symbols/shields/primary_1x1_z18.svg
+++ b/symbols/shields/primary_1x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 17.0">
- <rect x="0.5" y="0.5" width="16.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 21.0">
+ <rect x="0.5" y="0.5" width="15.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x2.svg b/symbols/shields/primary_1x2.svg
index 7392c75..266997e 100644
--- a/symbols/shields/primary_1x2.svg
+++ b/symbols/shields/primary_1x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 24.0">
- <rect x="0.5" y="0.5" width="14.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 30.0">
+ <rect x="0.5" y="0.5" width="15.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x2_z16.svg b/symbols/shields/primary_1x2_z16.svg
index 6325d8b..be91e48 100644
--- a/symbols/shields/primary_1x2_z16.svg
+++ b/symbols/shields/primary_1x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 26.0">
- <rect x="0.5" y="0.5" width="15.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 34.0">
+ <rect x="0.5" y="0.5" width="15.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x2_z18.svg b/symbols/shields/primary_1x2_z18.svg
index 97eb3dc..18e4dcc 100644
--- a/symbols/shields/primary_1x2_z18.svg
+++ b/symbols/shields/primary_1x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 28.0">
- <rect x="0.5" y="0.5" width="16.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 36.0">
+ <rect x="0.5" y="0.5" width="15.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x3.svg b/symbols/shields/primary_1x3.svg
index 6475806..fda4b42 100644
--- a/symbols/shields/primary_1x3.svg
+++ b/symbols/shields/primary_1x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 33.0">
- <rect x="0.5" y="0.5" width="14.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 42.0">
+ <rect x="0.5" y="0.5" width="15.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x3_z16.svg b/symbols/shields/primary_1x3_z16.svg
index 18e4dcc..1937a86 100644
--- a/symbols/shields/primary_1x3_z16.svg
+++ b/symbols/shields/primary_1x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 36.0">
- <rect x="0.5" y="0.5" width="15.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 48.0">
+ <rect x="0.5" y="0.5" width="15.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x3_z18.svg b/symbols/shields/primary_1x3_z18.svg
index a3e5a65..811817a 100644
--- a/symbols/shields/primary_1x3_z18.svg
+++ b/symbols/shields/primary_1x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 39.0">
- <rect x="0.5" y="0.5" width="16.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 51.0">
+ <rect x="0.5" y="0.5" width="15.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x4.svg b/symbols/shields/primary_1x4.svg
index 5cc73a6..26e6da2 100644
--- a/symbols/shields/primary_1x4.svg
+++ b/symbols/shields/primary_1x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 42.0">
- <rect x="0.5" y="0.5" width="14.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 54.0">
+ <rect x="0.5" y="0.5" width="15.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x4_z16.svg b/symbols/shields/primary_1x4_z16.svg
index 500ff62..0dc8102 100644
--- a/symbols/shields/primary_1x4_z16.svg
+++ b/symbols/shields/primary_1x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 46.0">
- <rect x="0.5" y="0.5" width="15.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 62.0">
+ <rect x="0.5" y="0.5" width="15.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_1x4_z18.svg b/symbols/shields/primary_1x4_z18.svg
index c2a0d2b..2a03226 100644
--- a/symbols/shields/primary_1x4_z18.svg
+++ b/symbols/shields/primary_1x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 50.0">
- <rect x="0.5" y="0.5" width="16.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 66.0">
+ <rect x="0.5" y="0.5" width="15.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x1.svg b/symbols/shields/primary_2x1.svg
index c61f078..4fb6897 100644
--- a/symbols/shields/primary_2x1.svg
+++ b/symbols/shields/primary_2x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 15.0">
- <rect x="0.5" y="0.5" width="20.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 18.0">
+ <rect x="0.5" y="0.5" width="21.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x1_z16.svg b/symbols/shields/primary_2x1_z16.svg
index 859671b..9c2d07b 100644
--- a/symbols/shields/primary_2x1_z16.svg
+++ b/symbols/shields/primary_2x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 16.0">
- <rect x="0.5" y="0.5" width="21.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 20.0">
+ <rect x="0.5" y="0.5" width="21.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x1_z18.svg b/symbols/shields/primary_2x1_z18.svg
index 41f487f..5287b04 100644
--- a/symbols/shields/primary_2x1_z18.svg
+++ b/symbols/shields/primary_2x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 17.0">
- <rect x="0.5" y="0.5" width="23.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 21.0">
+ <rect x="0.5" y="0.5" width="22.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x2.svg b/symbols/shields/primary_2x2.svg
index 5ae799a..b1fc29c 100644
--- a/symbols/shields/primary_2x2.svg
+++ b/symbols/shields/primary_2x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 24.0">
- <rect x="0.5" y="0.5" width="20.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 30.0">
+ <rect x="0.5" y="0.5" width="21.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x2_z16.svg b/symbols/shields/primary_2x2_z16.svg
index 5355d1c..9e476d6 100644
--- a/symbols/shields/primary_2x2_z16.svg
+++ b/symbols/shields/primary_2x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 26.0">
- <rect x="0.5" y="0.5" width="21.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 34.0">
+ <rect x="0.5" y="0.5" width="21.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x2_z18.svg b/symbols/shields/primary_2x2_z18.svg
index a95f840..052d5eb 100644
--- a/symbols/shields/primary_2x2_z18.svg
+++ b/symbols/shields/primary_2x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 28.0">
- <rect x="0.5" y="0.5" width="23.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 36.0">
+ <rect x="0.5" y="0.5" width="22.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x3.svg b/symbols/shields/primary_2x3.svg
index e6305da..00e9843 100644
--- a/symbols/shields/primary_2x3.svg
+++ b/symbols/shields/primary_2x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 33.0">
- <rect x="0.5" y="0.5" width="20.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 42.0">
+ <rect x="0.5" y="0.5" width="21.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x3_z16.svg b/symbols/shields/primary_2x3_z16.svg
index 36dec2d..8832732 100644
--- a/symbols/shields/primary_2x3_z16.svg
+++ b/symbols/shields/primary_2x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 36.0">
- <rect x="0.5" y="0.5" width="21.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 48.0">
+ <rect x="0.5" y="0.5" width="21.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x3_z18.svg b/symbols/shields/primary_2x3_z18.svg
index d239a78..27320d7 100644
--- a/symbols/shields/primary_2x3_z18.svg
+++ b/symbols/shields/primary_2x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 39.0">
- <rect x="0.5" y="0.5" width="23.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 51.0">
+ <rect x="0.5" y="0.5" width="22.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x4.svg b/symbols/shields/primary_2x4.svg
index b4959d5..35b4864 100644
--- a/symbols/shields/primary_2x4.svg
+++ b/symbols/shields/primary_2x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 42.0">
- <rect x="0.5" y="0.5" width="20.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 54.0">
+ <rect x="0.5" y="0.5" width="21.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x4_z16.svg b/symbols/shields/primary_2x4_z16.svg
index 6a517db..95e6f42 100644
--- a/symbols/shields/primary_2x4_z16.svg
+++ b/symbols/shields/primary_2x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 46.0">
- <rect x="0.5" y="0.5" width="21.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 62.0">
+ <rect x="0.5" y="0.5" width="21.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_2x4_z18.svg b/symbols/shields/primary_2x4_z18.svg
index 293a73b..edafd21 100644
--- a/symbols/shields/primary_2x4_z18.svg
+++ b/symbols/shields/primary_2x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 50.0">
- <rect x="0.5" y="0.5" width="23.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 66.0">
+ <rect x="0.5" y="0.5" width="22.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x1.svg b/symbols/shields/primary_3x1.svg
index ee55795..a93375d 100644
--- a/symbols/shields/primary_3x1.svg
+++ b/symbols/shields/primary_3x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 15.0">
- <rect x="0.5" y="0.5" width="26.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 18.0">
+ <rect x="0.5" y="0.5" width="27.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x1_z16.svg b/symbols/shields/primary_3x1_z16.svg
index e3306b6..f2b5a14 100644
--- a/symbols/shields/primary_3x1_z16.svg
+++ b/symbols/shields/primary_3x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 16.0">
- <rect x="0.5" y="0.5" width="28.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 20.0">
+ <rect x="0.5" y="0.5" width="27.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x1_z18.svg b/symbols/shields/primary_3x1_z18.svg
index 9fb809b..e70f3b2 100644
--- a/symbols/shields/primary_3x1_z18.svg
+++ b/symbols/shields/primary_3x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 17.0">
- <rect x="0.5" y="0.5" width="30.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 21.0">
+ <rect x="0.5" y="0.5" width="29.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x2.svg b/symbols/shields/primary_3x2.svg
index 32b148c..421f863 100644
--- a/symbols/shields/primary_3x2.svg
+++ b/symbols/shields/primary_3x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 24.0">
- <rect x="0.5" y="0.5" width="26.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 30.0">
+ <rect x="0.5" y="0.5" width="27.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x2_z16.svg b/symbols/shields/primary_3x2_z16.svg
index 76d2707..88f5b95 100644
--- a/symbols/shields/primary_3x2_z16.svg
+++ b/symbols/shields/primary_3x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 26.0">
- <rect x="0.5" y="0.5" width="28.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 34.0">
+ <rect x="0.5" y="0.5" width="27.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x2_z18.svg b/symbols/shields/primary_3x2_z18.svg
index 546ab70..176b74b 100644
--- a/symbols/shields/primary_3x2_z18.svg
+++ b/symbols/shields/primary_3x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 28.0">
- <rect x="0.5" y="0.5" width="30.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 36.0">
+ <rect x="0.5" y="0.5" width="29.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x3.svg b/symbols/shields/primary_3x3.svg
index cf4ec25..20abde8 100644
--- a/symbols/shields/primary_3x3.svg
+++ b/symbols/shields/primary_3x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 33.0">
- <rect x="0.5" y="0.5" width="26.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 42.0">
+ <rect x="0.5" y="0.5" width="27.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x3_z16.svg b/symbols/shields/primary_3x3_z16.svg
index 12ea52b..a96168d 100644
--- a/symbols/shields/primary_3x3_z16.svg
+++ b/symbols/shields/primary_3x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 36.0">
- <rect x="0.5" y="0.5" width="28.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 48.0">
+ <rect x="0.5" y="0.5" width="27.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x3_z18.svg b/symbols/shields/primary_3x3_z18.svg
index 26b7c29..3944d68 100644
--- a/symbols/shields/primary_3x3_z18.svg
+++ b/symbols/shields/primary_3x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 39.0">
- <rect x="0.5" y="0.5" width="30.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 51.0">
+ <rect x="0.5" y="0.5" width="29.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x4.svg b/symbols/shields/primary_3x4.svg
index d257f51..de78c83 100644
--- a/symbols/shields/primary_3x4.svg
+++ b/symbols/shields/primary_3x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 42.0">
- <rect x="0.5" y="0.5" width="26.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 54.0">
+ <rect x="0.5" y="0.5" width="27.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x4_z16.svg b/symbols/shields/primary_3x4_z16.svg
index d9ec29e..820ca96 100644
--- a/symbols/shields/primary_3x4_z16.svg
+++ b/symbols/shields/primary_3x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 46.0">
- <rect x="0.5" y="0.5" width="28.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 62.0">
+ <rect x="0.5" y="0.5" width="27.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_3x4_z18.svg b/symbols/shields/primary_3x4_z18.svg
index 3a623d1..0a372e9 100644
--- a/symbols/shields/primary_3x4_z18.svg
+++ b/symbols/shields/primary_3x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 50.0">
- <rect x="0.5" y="0.5" width="30.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 66.0">
+ <rect x="0.5" y="0.5" width="29.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x1.svg b/symbols/shields/primary_4x1.svg
index 14307fd..f1721e7 100644
--- a/symbols/shields/primary_4x1.svg
+++ b/symbols/shields/primary_4x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 15.0">
- <rect x="0.5" y="0.5" width="32.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 18.0">
+ <rect x="0.5" y="0.5" width="33.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x1_z16.svg b/symbols/shields/primary_4x1_z16.svg
index 7d3333a..ee9676a 100644
--- a/symbols/shields/primary_4x1_z16.svg
+++ b/symbols/shields/primary_4x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 16.0">
- <rect x="0.5" y="0.5" width="34.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 20.0">
+ <rect x="0.5" y="0.5" width="33.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x1_z18.svg b/symbols/shields/primary_4x1_z18.svg
index 4fd0f49..1d88b90 100644
--- a/symbols/shields/primary_4x1_z18.svg
+++ b/symbols/shields/primary_4x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 17.0">
- <rect x="0.5" y="0.5" width="37.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 21.0">
+ <rect x="0.5" y="0.5" width="36.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x2.svg b/symbols/shields/primary_4x2.svg
index 00701ef..164b35d 100644
--- a/symbols/shields/primary_4x2.svg
+++ b/symbols/shields/primary_4x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 24.0">
- <rect x="0.5" y="0.5" width="32.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 30.0">
+ <rect x="0.5" y="0.5" width="33.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x2_z16.svg b/symbols/shields/primary_4x2_z16.svg
index 9be10b4..1f85f1b 100644
--- a/symbols/shields/primary_4x2_z16.svg
+++ b/symbols/shields/primary_4x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 26.0">
- <rect x="0.5" y="0.5" width="34.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 34.0">
+ <rect x="0.5" y="0.5" width="33.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x2_z18.svg b/symbols/shields/primary_4x2_z18.svg
index c2684c3..fa28836 100644
--- a/symbols/shields/primary_4x2_z18.svg
+++ b/symbols/shields/primary_4x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 28.0">
- <rect x="0.5" y="0.5" width="37.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 36.0">
+ <rect x="0.5" y="0.5" width="36.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x3.svg b/symbols/shields/primary_4x3.svg
index e9b023f..f373c00 100644
--- a/symbols/shields/primary_4x3.svg
+++ b/symbols/shields/primary_4x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 33.0">
- <rect x="0.5" y="0.5" width="32.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 42.0">
+ <rect x="0.5" y="0.5" width="33.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x3_z16.svg b/symbols/shields/primary_4x3_z16.svg
index b42f57c..3d80408 100644
--- a/symbols/shields/primary_4x3_z16.svg
+++ b/symbols/shields/primary_4x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 36.0">
- <rect x="0.5" y="0.5" width="34.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 48.0">
+ <rect x="0.5" y="0.5" width="33.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x3_z18.svg b/symbols/shields/primary_4x3_z18.svg
index 6904c2a..db94cf9 100644
--- a/symbols/shields/primary_4x3_z18.svg
+++ b/symbols/shields/primary_4x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 39.0">
- <rect x="0.5" y="0.5" width="37.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 51.0">
+ <rect x="0.5" y="0.5" width="36.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x4.svg b/symbols/shields/primary_4x4.svg
index a66da4c..f00b43c 100644
--- a/symbols/shields/primary_4x4.svg
+++ b/symbols/shields/primary_4x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 42.0">
- <rect x="0.5" y="0.5" width="32.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 54.0">
+ <rect x="0.5" y="0.5" width="33.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x4_z16.svg b/symbols/shields/primary_4x4_z16.svg
index 8983129..534e282 100644
--- a/symbols/shields/primary_4x4_z16.svg
+++ b/symbols/shields/primary_4x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 46.0">
- <rect x="0.5" y="0.5" width="34.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 62.0">
+ <rect x="0.5" y="0.5" width="33.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_4x4_z18.svg b/symbols/shields/primary_4x4_z18.svg
index a8031fe..2dffae9 100644
--- a/symbols/shields/primary_4x4_z18.svg
+++ b/symbols/shields/primary_4x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 50.0">
- <rect x="0.5" y="0.5" width="37.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 66.0">
+ <rect x="0.5" y="0.5" width="36.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x1.svg b/symbols/shields/primary_5x1.svg
index 310276b..8c71b02 100644
--- a/symbols/shields/primary_5x1.svg
+++ b/symbols/shields/primary_5x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 15.0">
- <rect x="0.5" y="0.5" width="38.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 18.0">
+ <rect x="0.5" y="0.5" width="39.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x1_z16.svg b/symbols/shields/primary_5x1_z16.svg
index 41507b5..56a3c56 100644
--- a/symbols/shields/primary_5x1_z16.svg
+++ b/symbols/shields/primary_5x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 16.0">
- <rect x="0.5" y="0.5" width="41.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 20.0">
+ <rect x="0.5" y="0.5" width="39.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x1_z18.svg b/symbols/shields/primary_5x1_z18.svg
index 75df44d..0024bce 100644
--- a/symbols/shields/primary_5x1_z18.svg
+++ b/symbols/shields/primary_5x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 17.0">
- <rect x="0.5" y="0.5" width="44.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 21.0">
+ <rect x="0.5" y="0.5" width="43.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x2.svg b/symbols/shields/primary_5x2.svg
index 4c00a50..bcbe539 100644
--- a/symbols/shields/primary_5x2.svg
+++ b/symbols/shields/primary_5x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 24.0">
- <rect x="0.5" y="0.5" width="38.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 30.0">
+ <rect x="0.5" y="0.5" width="39.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x2_z16.svg b/symbols/shields/primary_5x2_z16.svg
index 194f746..0f1dad5 100644
--- a/symbols/shields/primary_5x2_z16.svg
+++ b/symbols/shields/primary_5x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 26.0">
- <rect x="0.5" y="0.5" width="41.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 34.0">
+ <rect x="0.5" y="0.5" width="39.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x2_z18.svg b/symbols/shields/primary_5x2_z18.svg
index a55aa3d..f9ff645 100644
--- a/symbols/shields/primary_5x2_z18.svg
+++ b/symbols/shields/primary_5x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 28.0">
- <rect x="0.5" y="0.5" width="44.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 36.0">
+ <rect x="0.5" y="0.5" width="43.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x3.svg b/symbols/shields/primary_5x3.svg
index 89e7e3c..0c6de57 100644
--- a/symbols/shields/primary_5x3.svg
+++ b/symbols/shields/primary_5x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 33.0">
- <rect x="0.5" y="0.5" width="38.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 42.0">
+ <rect x="0.5" y="0.5" width="39.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x3_z16.svg b/symbols/shields/primary_5x3_z16.svg
index dd71f8c..d9a76b5 100644
--- a/symbols/shields/primary_5x3_z16.svg
+++ b/symbols/shields/primary_5x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 36.0">
- <rect x="0.5" y="0.5" width="41.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 48.0">
+ <rect x="0.5" y="0.5" width="39.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x3_z18.svg b/symbols/shields/primary_5x3_z18.svg
index d80ad49..4c8bdb9 100644
--- a/symbols/shields/primary_5x3_z18.svg
+++ b/symbols/shields/primary_5x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 39.0">
- <rect x="0.5" y="0.5" width="44.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 51.0">
+ <rect x="0.5" y="0.5" width="43.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x4.svg b/symbols/shields/primary_5x4.svg
index 86b2744..f9b9473 100644
--- a/symbols/shields/primary_5x4.svg
+++ b/symbols/shields/primary_5x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 42.0">
- <rect x="0.5" y="0.5" width="38.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 54.0">
+ <rect x="0.5" y="0.5" width="39.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x4_z16.svg b/symbols/shields/primary_5x4_z16.svg
index 7442798..dc775e1 100644
--- a/symbols/shields/primary_5x4_z16.svg
+++ b/symbols/shields/primary_5x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 46.0">
- <rect x="0.5" y="0.5" width="41.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 62.0">
+ <rect x="0.5" y="0.5" width="39.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_5x4_z18.svg b/symbols/shields/primary_5x4_z18.svg
index 8847e8f..101b5a0 100644
--- a/symbols/shields/primary_5x4_z18.svg
+++ b/symbols/shields/primary_5x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 50.0">
- <rect x="0.5" y="0.5" width="44.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 66.0">
+ <rect x="0.5" y="0.5" width="43.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x1.svg b/symbols/shields/primary_6x1.svg
index e9b619d..92ef23f 100644
--- a/symbols/shields/primary_6x1.svg
+++ b/symbols/shields/primary_6x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 15.0">
- <rect x="0.5" y="0.5" width="44.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 18.0">
+ <rect x="0.5" y="0.5" width="46.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x1_z16.svg b/symbols/shields/primary_6x1_z16.svg
index fbf288a..640aa61 100644
--- a/symbols/shields/primary_6x1_z16.svg
+++ b/symbols/shields/primary_6x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 16.0">
- <rect x="0.5" y="0.5" width="47.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 20.0">
+ <rect x="0.5" y="0.5" width="45.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x1_z18.svg b/symbols/shields/primary_6x1_z18.svg
index 9a87d2c..e65d6ff 100644
--- a/symbols/shields/primary_6x1_z18.svg
+++ b/symbols/shields/primary_6x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 17.0">
- <rect x="0.5" y="0.5" width="52.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 21.0">
+ <rect x="0.5" y="0.5" width="50.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x2.svg b/symbols/shields/primary_6x2.svg
index 5d77480..d6c172f 100644
--- a/symbols/shields/primary_6x2.svg
+++ b/symbols/shields/primary_6x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 24.0">
- <rect x="0.5" y="0.5" width="44.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 30.0">
+ <rect x="0.5" y="0.5" width="46.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x2_z16.svg b/symbols/shields/primary_6x2_z16.svg
index ebed884..d891d4a 100644
--- a/symbols/shields/primary_6x2_z16.svg
+++ b/symbols/shields/primary_6x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 26.0">
- <rect x="0.5" y="0.5" width="47.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 34.0">
+ <rect x="0.5" y="0.5" width="45.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x2_z18.svg b/symbols/shields/primary_6x2_z18.svg
index 73e3a17..4ba3713 100644
--- a/symbols/shields/primary_6x2_z18.svg
+++ b/symbols/shields/primary_6x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 28.0">
- <rect x="0.5" y="0.5" width="52.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 36.0">
+ <rect x="0.5" y="0.5" width="50.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x3.svg b/symbols/shields/primary_6x3.svg
index 205a90b..295493d 100644
--- a/symbols/shields/primary_6x3.svg
+++ b/symbols/shields/primary_6x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 33.0">
- <rect x="0.5" y="0.5" width="44.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 42.0">
+ <rect x="0.5" y="0.5" width="46.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x3_z16.svg b/symbols/shields/primary_6x3_z16.svg
index b9460e7..40cb34a 100644
--- a/symbols/shields/primary_6x3_z16.svg
+++ b/symbols/shields/primary_6x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 36.0">
- <rect x="0.5" y="0.5" width="47.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 48.0">
+ <rect x="0.5" y="0.5" width="45.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x3_z18.svg b/symbols/shields/primary_6x3_z18.svg
index f1f8b94..1863d93 100644
--- a/symbols/shields/primary_6x3_z18.svg
+++ b/symbols/shields/primary_6x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 39.0">
- <rect x="0.5" y="0.5" width="52.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 51.0">
+ <rect x="0.5" y="0.5" width="50.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x4.svg b/symbols/shields/primary_6x4.svg
index 43c1af2..f079aa5 100644
--- a/symbols/shields/primary_6x4.svg
+++ b/symbols/shields/primary_6x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 42.0">
- <rect x="0.5" y="0.5" width="44.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 54.0">
+ <rect x="0.5" y="0.5" width="46.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x4_z16.svg b/symbols/shields/primary_6x4_z16.svg
index 7f632d4..8c2f271 100644
--- a/symbols/shields/primary_6x4_z16.svg
+++ b/symbols/shields/primary_6x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 46.0">
- <rect x="0.5" y="0.5" width="47.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 62.0">
+ <rect x="0.5" y="0.5" width="45.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_6x4_z18.svg b/symbols/shields/primary_6x4_z18.svg
index e8a8c28..0a2286f 100644
--- a/symbols/shields/primary_6x4_z18.svg
+++ b/symbols/shields/primary_6x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 50.0">
- <rect x="0.5" y="0.5" width="52.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 66.0">
+ <rect x="0.5" y="0.5" width="50.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x1.svg b/symbols/shields/primary_7x1.svg
index cb5811b..77db473 100644
--- a/symbols/shields/primary_7x1.svg
+++ b/symbols/shields/primary_7x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 15.0">
- <rect x="0.5" y="0.5" width="50.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 18.0">
+ <rect x="0.5" y="0.5" width="52.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x1_z16.svg b/symbols/shields/primary_7x1_z16.svg
index a6efad3..368823d 100644
--- a/symbols/shields/primary_7x1_z16.svg
+++ b/symbols/shields/primary_7x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 16.0">
- <rect x="0.5" y="0.5" width="54.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 20.0">
+ <rect x="0.5" y="0.5" width="51.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x1_z18.svg b/symbols/shields/primary_7x1_z18.svg
index a30187e..7b8b513 100644
--- a/symbols/shields/primary_7x1_z18.svg
+++ b/symbols/shields/primary_7x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 17.0">
- <rect x="0.5" y="0.5" width="59.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 21.0">
+ <rect x="0.5" y="0.5" width="57.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x2.svg b/symbols/shields/primary_7x2.svg
index 3fdbaf3..2d0ffa8 100644
--- a/symbols/shields/primary_7x2.svg
+++ b/symbols/shields/primary_7x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 24.0">
- <rect x="0.5" y="0.5" width="50.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 30.0">
+ <rect x="0.5" y="0.5" width="52.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x2_z16.svg b/symbols/shields/primary_7x2_z16.svg
index 6a56c09..96695e5 100644
--- a/symbols/shields/primary_7x2_z16.svg
+++ b/symbols/shields/primary_7x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 26.0">
- <rect x="0.5" y="0.5" width="54.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 34.0">
+ <rect x="0.5" y="0.5" width="51.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x2_z18.svg b/symbols/shields/primary_7x2_z18.svg
index a8bbcf9..f6e49f4 100644
--- a/symbols/shields/primary_7x2_z18.svg
+++ b/symbols/shields/primary_7x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 28.0">
- <rect x="0.5" y="0.5" width="59.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 36.0">
+ <rect x="0.5" y="0.5" width="57.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x3.svg b/symbols/shields/primary_7x3.svg
index 304ce42..7ea4954 100644
--- a/symbols/shields/primary_7x3.svg
+++ b/symbols/shields/primary_7x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 33.0">
- <rect x="0.5" y="0.5" width="50.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 42.0">
+ <rect x="0.5" y="0.5" width="52.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x3_z16.svg b/symbols/shields/primary_7x3_z16.svg
index 39c50be..30bf2e7 100644
--- a/symbols/shields/primary_7x3_z16.svg
+++ b/symbols/shields/primary_7x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 36.0">
- <rect x="0.5" y="0.5" width="54.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 48.0">
+ <rect x="0.5" y="0.5" width="51.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x3_z18.svg b/symbols/shields/primary_7x3_z18.svg
index ecefdf3..81ef8b6 100644
--- a/symbols/shields/primary_7x3_z18.svg
+++ b/symbols/shields/primary_7x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 39.0">
- <rect x="0.5" y="0.5" width="59.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 51.0">
+ <rect x="0.5" y="0.5" width="57.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x4.svg b/symbols/shields/primary_7x4.svg
index 680b9b9..1e4aa02 100644
--- a/symbols/shields/primary_7x4.svg
+++ b/symbols/shields/primary_7x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 42.0">
- <rect x="0.5" y="0.5" width="50.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 54.0">
+ <rect x="0.5" y="0.5" width="52.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x4_z16.svg b/symbols/shields/primary_7x4_z16.svg
index 477c313..88a4808 100644
--- a/symbols/shields/primary_7x4_z16.svg
+++ b/symbols/shields/primary_7x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 46.0">
- <rect x="0.5" y="0.5" width="54.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 62.0">
+ <rect x="0.5" y="0.5" width="51.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_7x4_z18.svg b/symbols/shields/primary_7x4_z18.svg
index 334149b..ae88e36 100644
--- a/symbols/shields/primary_7x4_z18.svg
+++ b/symbols/shields/primary_7x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 50.0">
- <rect x="0.5" y="0.5" width="59.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 66.0">
+ <rect x="0.5" y="0.5" width="57.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x1.svg b/symbols/shields/primary_8x1.svg
index 650d959..cb1c929 100644
--- a/symbols/shields/primary_8x1.svg
+++ b/symbols/shields/primary_8x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 15.0">
- <rect x="0.5" y="0.5" width="56.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 18.0">
+ <rect x="0.5" y="0.5" width="58.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x1_z16.svg b/symbols/shields/primary_8x1_z16.svg
index 98076d4..5275f8d 100644
--- a/symbols/shields/primary_8x1_z16.svg
+++ b/symbols/shields/primary_8x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 16.0">
- <rect x="0.5" y="0.5" width="60.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 20.0">
+ <rect x="0.5" y="0.5" width="57.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x1_z18.svg b/symbols/shields/primary_8x1_z18.svg
index 6039b0a..d8cb890 100644
--- a/symbols/shields/primary_8x1_z18.svg
+++ b/symbols/shields/primary_8x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 17.0">
- <rect x="0.5" y="0.5" width="66.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 21.0">
+ <rect x="0.5" y="0.5" width="64.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x2.svg b/symbols/shields/primary_8x2.svg
index 1cb546c..93258aa 100644
--- a/symbols/shields/primary_8x2.svg
+++ b/symbols/shields/primary_8x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 24.0">
- <rect x="0.5" y="0.5" width="56.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 30.0">
+ <rect x="0.5" y="0.5" width="58.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x2_z16.svg b/symbols/shields/primary_8x2_z16.svg
index 264468f..4de9b10 100644
--- a/symbols/shields/primary_8x2_z16.svg
+++ b/symbols/shields/primary_8x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 26.0">
- <rect x="0.5" y="0.5" width="60.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 34.0">
+ <rect x="0.5" y="0.5" width="57.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x2_z18.svg b/symbols/shields/primary_8x2_z18.svg
index f38bf9e..7f0dfea 100644
--- a/symbols/shields/primary_8x2_z18.svg
+++ b/symbols/shields/primary_8x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 28.0">
- <rect x="0.5" y="0.5" width="66.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 36.0">
+ <rect x="0.5" y="0.5" width="64.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x3.svg b/symbols/shields/primary_8x3.svg
index 7bd91fe..0af65ae 100644
--- a/symbols/shields/primary_8x3.svg
+++ b/symbols/shields/primary_8x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 33.0">
- <rect x="0.5" y="0.5" width="56.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 42.0">
+ <rect x="0.5" y="0.5" width="58.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x3_z16.svg b/symbols/shields/primary_8x3_z16.svg
index 9f8416d..16d1c43 100644
--- a/symbols/shields/primary_8x3_z16.svg
+++ b/symbols/shields/primary_8x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 36.0">
- <rect x="0.5" y="0.5" width="60.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 48.0">
+ <rect x="0.5" y="0.5" width="57.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x3_z18.svg b/symbols/shields/primary_8x3_z18.svg
index 61b16fb..66bf0a0 100644
--- a/symbols/shields/primary_8x3_z18.svg
+++ b/symbols/shields/primary_8x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 39.0">
- <rect x="0.5" y="0.5" width="66.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 51.0">
+ <rect x="0.5" y="0.5" width="64.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x4.svg b/symbols/shields/primary_8x4.svg
index 9d8aab5..a526ff5 100644
--- a/symbols/shields/primary_8x4.svg
+++ b/symbols/shields/primary_8x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 42.0">
- <rect x="0.5" y="0.5" width="56.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 54.0">
+ <rect x="0.5" y="0.5" width="58.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x4_z16.svg b/symbols/shields/primary_8x4_z16.svg
index 3e5f79f..2b0b6b3 100644
--- a/symbols/shields/primary_8x4_z16.svg
+++ b/symbols/shields/primary_8x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 46.0">
- <rect x="0.5" y="0.5" width="60.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 62.0">
+ <rect x="0.5" y="0.5" width="57.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_8x4_z18.svg b/symbols/shields/primary_8x4_z18.svg
index 4286df3..98d7e3d 100644
--- a/symbols/shields/primary_8x4_z18.svg
+++ b/symbols/shields/primary_8x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 50.0">
- <rect x="0.5" y="0.5" width="66.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 66.0">
+ <rect x="0.5" y="0.5" width="64.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x1.svg b/symbols/shields/primary_9x1.svg
index 53575fb..1499a87 100644
--- a/symbols/shields/primary_9x1.svg
+++ b/symbols/shields/primary_9x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 15.0">
- <rect x="0.5" y="0.5" width="62.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 18.0">
+ <rect x="0.5" y="0.5" width="64.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x1_z16.svg b/symbols/shields/primary_9x1_z16.svg
index aa67cd6..97091a6 100644
--- a/symbols/shields/primary_9x1_z16.svg
+++ b/symbols/shields/primary_9x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 16.0">
- <rect x="0.5" y="0.5" width="67.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 20.0">
+ <rect x="0.5" y="0.5" width="63.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x1_z18.svg b/symbols/shields/primary_9x1_z18.svg
index b657ce4..48e9e52 100644
--- a/symbols/shields/primary_9x1_z18.svg
+++ b/symbols/shields/primary_9x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 17.0">
- <rect x="0.5" y="0.5" width="73.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 21.0">
+ <rect x="0.5" y="0.5" width="71.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x2.svg b/symbols/shields/primary_9x2.svg
index 8354b57..9d14008 100644
--- a/symbols/shields/primary_9x2.svg
+++ b/symbols/shields/primary_9x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 24.0">
- <rect x="0.5" y="0.5" width="62.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 30.0">
+ <rect x="0.5" y="0.5" width="64.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x2_z16.svg b/symbols/shields/primary_9x2_z16.svg
index 01e8882..b705901 100644
--- a/symbols/shields/primary_9x2_z16.svg
+++ b/symbols/shields/primary_9x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 26.0">
- <rect x="0.5" y="0.5" width="67.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 34.0">
+ <rect x="0.5" y="0.5" width="63.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x2_z18.svg b/symbols/shields/primary_9x2_z18.svg
index c35ed36..bc6e88c 100644
--- a/symbols/shields/primary_9x2_z18.svg
+++ b/symbols/shields/primary_9x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 28.0">
- <rect x="0.5" y="0.5" width="73.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 36.0">
+ <rect x="0.5" y="0.5" width="71.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x3.svg b/symbols/shields/primary_9x3.svg
index 0f802ef..2211921 100644
--- a/symbols/shields/primary_9x3.svg
+++ b/symbols/shields/primary_9x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 33.0">
- <rect x="0.5" y="0.5" width="62.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 42.0">
+ <rect x="0.5" y="0.5" width="64.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x3_z16.svg b/symbols/shields/primary_9x3_z16.svg
index 5d45a7d..dcda746 100644
--- a/symbols/shields/primary_9x3_z16.svg
+++ b/symbols/shields/primary_9x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 36.0">
- <rect x="0.5" y="0.5" width="67.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 48.0">
+ <rect x="0.5" y="0.5" width="63.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x3_z18.svg b/symbols/shields/primary_9x3_z18.svg
index f51579c..a9bb0df 100644
--- a/symbols/shields/primary_9x3_z18.svg
+++ b/symbols/shields/primary_9x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 39.0">
- <rect x="0.5" y="0.5" width="73.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 51.0">
+ <rect x="0.5" y="0.5" width="71.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x4.svg b/symbols/shields/primary_9x4.svg
index cece204..7409eff 100644
--- a/symbols/shields/primary_9x4.svg
+++ b/symbols/shields/primary_9x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 42.0">
- <rect x="0.5" y="0.5" width="62.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 54.0">
+ <rect x="0.5" y="0.5" width="64.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x4_z16.svg b/symbols/shields/primary_9x4_z16.svg
index a0f6e05..aa4ff05 100644
--- a/symbols/shields/primary_9x4_z16.svg
+++ b/symbols/shields/primary_9x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 46.0">
- <rect x="0.5" y="0.5" width="67.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 62.0">
+ <rect x="0.5" y="0.5" width="63.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/primary_9x4_z18.svg b/symbols/shields/primary_9x4_z18.svg
index 6494042..292ac37 100644
--- a/symbols/shields/primary_9x4_z18.svg
+++ b/symbols/shields/primary_9x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 50.0">
- <rect x="0.5" y="0.5" width="73.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 66.0">
+ <rect x="0.5" y="0.5" width="71.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f3e3cf;stroke:#d1b795;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x1.svg b/symbols/shields/secondary_10x1.svg
index 7578db6..5849b0a 100644
--- a/symbols/shields/secondary_10x1.svg
+++ b/symbols/shields/secondary_10x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 15.0">
- <rect x="0.5" y="0.5" width="67.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 18.0">
+ <rect x="0.5" y="0.5" width="70.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x1_z16.svg b/symbols/shields/secondary_10x1_z16.svg
index 28c68e7..3ab4cb1 100644
--- a/symbols/shields/secondary_10x1_z16.svg
+++ b/symbols/shields/secondary_10x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 16.0">
- <rect x="0.5" y="0.5" width="73.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 20.0">
+ <rect x="0.5" y="0.5" width="69.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x1_z18.svg b/symbols/shields/secondary_10x1_z18.svg
index 1143bfe..e5f1ca4 100644
--- a/symbols/shields/secondary_10x1_z18.svg
+++ b/symbols/shields/secondary_10x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 17.0">
- <rect x="0.5" y="0.5" width="80.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 21.0">
+ <rect x="0.5" y="0.5" width="77.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x2.svg b/symbols/shields/secondary_10x2.svg
index 52f68f1..d14fabc 100644
--- a/symbols/shields/secondary_10x2.svg
+++ b/symbols/shields/secondary_10x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 24.0">
- <rect x="0.5" y="0.5" width="67.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 30.0">
+ <rect x="0.5" y="0.5" width="70.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x2_z16.svg b/symbols/shields/secondary_10x2_z16.svg
index 7718f80..218b2d0 100644
--- a/symbols/shields/secondary_10x2_z16.svg
+++ b/symbols/shields/secondary_10x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 26.0">
- <rect x="0.5" y="0.5" width="73.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 34.0">
+ <rect x="0.5" y="0.5" width="69.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x2_z18.svg b/symbols/shields/secondary_10x2_z18.svg
index bc891a9..1262d85 100644
--- a/symbols/shields/secondary_10x2_z18.svg
+++ b/symbols/shields/secondary_10x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 28.0">
- <rect x="0.5" y="0.5" width="80.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 36.0">
+ <rect x="0.5" y="0.5" width="77.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x3.svg b/symbols/shields/secondary_10x3.svg
index 297011b..21a6e94 100644
--- a/symbols/shields/secondary_10x3.svg
+++ b/symbols/shields/secondary_10x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 33.0">
- <rect x="0.5" y="0.5" width="67.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 42.0">
+ <rect x="0.5" y="0.5" width="70.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x3_z16.svg b/symbols/shields/secondary_10x3_z16.svg
index 29ed97d..80588aa 100644
--- a/symbols/shields/secondary_10x3_z16.svg
+++ b/symbols/shields/secondary_10x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 36.0">
- <rect x="0.5" y="0.5" width="73.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 48.0">
+ <rect x="0.5" y="0.5" width="69.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x3_z18.svg b/symbols/shields/secondary_10x3_z18.svg
index 5646038..8c1dd7a 100644
--- a/symbols/shields/secondary_10x3_z18.svg
+++ b/symbols/shields/secondary_10x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 39.0">
- <rect x="0.5" y="0.5" width="80.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 51.0">
+ <rect x="0.5" y="0.5" width="77.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x4.svg b/symbols/shields/secondary_10x4.svg
index 9ae62ee..4e4ed6a 100644
--- a/symbols/shields/secondary_10x4.svg
+++ b/symbols/shields/secondary_10x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 42.0">
- <rect x="0.5" y="0.5" width="67.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 54.0">
+ <rect x="0.5" y="0.5" width="70.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x4_z16.svg b/symbols/shields/secondary_10x4_z16.svg
index 3bb5fd1..decadd2 100644
--- a/symbols/shields/secondary_10x4_z16.svg
+++ b/symbols/shields/secondary_10x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 46.0">
- <rect x="0.5" y="0.5" width="73.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 62.0">
+ <rect x="0.5" y="0.5" width="69.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_10x4_z18.svg b/symbols/shields/secondary_10x4_z18.svg
index 4ab633b..3ef9d80 100644
--- a/symbols/shields/secondary_10x4_z18.svg
+++ b/symbols/shields/secondary_10x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 50.0">
- <rect x="0.5" y="0.5" width="80.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 66.0">
+ <rect x="0.5" y="0.5" width="77.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x1.svg b/symbols/shields/secondary_11x1.svg
index c777f73..6d80801 100644
--- a/symbols/shields/secondary_11x1.svg
+++ b/symbols/shields/secondary_11x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 15.0">
- <rect x="0.5" y="0.5" width="73.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 18.0">
+ <rect x="0.5" y="0.5" width="77.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x1_z16.svg b/symbols/shields/secondary_11x1_z16.svg
index 373008d..d85b5f6 100644
--- a/symbols/shields/secondary_11x1_z16.svg
+++ b/symbols/shields/secondary_11x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 16.0">
- <rect x="0.5" y="0.5" width="80.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 20.0">
+ <rect x="0.5" y="0.5" width="76.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x1_z18.svg b/symbols/shields/secondary_11x1_z18.svg
index e3a824a..edde8c2 100644
--- a/symbols/shields/secondary_11x1_z18.svg
+++ b/symbols/shields/secondary_11x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 17.0">
- <rect x="0.5" y="0.5" width="88.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 21.0">
+ <rect x="0.5" y="0.5" width="84.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x2.svg b/symbols/shields/secondary_11x2.svg
index 73d77aa..862f6b4 100644
--- a/symbols/shields/secondary_11x2.svg
+++ b/symbols/shields/secondary_11x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 24.0">
- <rect x="0.5" y="0.5" width="73.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 30.0">
+ <rect x="0.5" y="0.5" width="77.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x2_z16.svg b/symbols/shields/secondary_11x2_z16.svg
index 4a290ce..a4f7053 100644
--- a/symbols/shields/secondary_11x2_z16.svg
+++ b/symbols/shields/secondary_11x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 26.0">
- <rect x="0.5" y="0.5" width="80.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 34.0">
+ <rect x="0.5" y="0.5" width="76.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x2_z18.svg b/symbols/shields/secondary_11x2_z18.svg
index 79f41b9..758ba23 100644
--- a/symbols/shields/secondary_11x2_z18.svg
+++ b/symbols/shields/secondary_11x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 28.0">
- <rect x="0.5" y="0.5" width="88.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 36.0">
+ <rect x="0.5" y="0.5" width="84.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x3.svg b/symbols/shields/secondary_11x3.svg
index b98c7bb..bccab49 100644
--- a/symbols/shields/secondary_11x3.svg
+++ b/symbols/shields/secondary_11x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 33.0">
- <rect x="0.5" y="0.5" width="73.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 42.0">
+ <rect x="0.5" y="0.5" width="77.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x3_z16.svg b/symbols/shields/secondary_11x3_z16.svg
index 10d67f5..fd0e02e 100644
--- a/symbols/shields/secondary_11x3_z16.svg
+++ b/symbols/shields/secondary_11x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 36.0">
- <rect x="0.5" y="0.5" width="80.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 48.0">
+ <rect x="0.5" y="0.5" width="76.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x3_z18.svg b/symbols/shields/secondary_11x3_z18.svg
index 0b573ed..27b7492 100644
--- a/symbols/shields/secondary_11x3_z18.svg
+++ b/symbols/shields/secondary_11x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 39.0">
- <rect x="0.5" y="0.5" width="88.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 51.0">
+ <rect x="0.5" y="0.5" width="84.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x4.svg b/symbols/shields/secondary_11x4.svg
index a67dec2..636e18a 100644
--- a/symbols/shields/secondary_11x4.svg
+++ b/symbols/shields/secondary_11x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 42.0">
- <rect x="0.5" y="0.5" width="73.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 54.0">
+ <rect x="0.5" y="0.5" width="77.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x4_z16.svg b/symbols/shields/secondary_11x4_z16.svg
index 9bc83bb..b47b52d 100644
--- a/symbols/shields/secondary_11x4_z16.svg
+++ b/symbols/shields/secondary_11x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 46.0">
- <rect x="0.5" y="0.5" width="80.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 62.0">
+ <rect x="0.5" y="0.5" width="76.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_11x4_z18.svg b/symbols/shields/secondary_11x4_z18.svg
index 0960fda..935dfda 100644
--- a/symbols/shields/secondary_11x4_z18.svg
+++ b/symbols/shields/secondary_11x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 50.0">
- <rect x="0.5" y="0.5" width="88.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 66.0">
+ <rect x="0.5" y="0.5" width="84.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x1.svg b/symbols/shields/secondary_1x1.svg
index 4ca39e4..3596efc 100644
--- a/symbols/shields/secondary_1x1.svg
+++ b/symbols/shields/secondary_1x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 15.0">
- <rect x="0.5" y="0.5" width="14.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 18.0">
+ <rect x="0.5" y="0.5" width="15.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x1_z16.svg b/symbols/shields/secondary_1x1_z16.svg
index 25b20cd..7af4db2 100644
--- a/symbols/shields/secondary_1x1_z16.svg
+++ b/symbols/shields/secondary_1x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 16.0">
- <rect x="0.5" y="0.5" width="15.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 20.0">
+ <rect x="0.5" y="0.5" width="15.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x1_z18.svg b/symbols/shields/secondary_1x1_z18.svg
index 47fa846..9ec5fe3 100644
--- a/symbols/shields/secondary_1x1_z18.svg
+++ b/symbols/shields/secondary_1x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 17.0">
- <rect x="0.5" y="0.5" width="16.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 21.0">
+ <rect x="0.5" y="0.5" width="15.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x2.svg b/symbols/shields/secondary_1x2.svg
index 354de04..0d753cf 100644
--- a/symbols/shields/secondary_1x2.svg
+++ b/symbols/shields/secondary_1x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 24.0">
- <rect x="0.5" y="0.5" width="14.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 30.0">
+ <rect x="0.5" y="0.5" width="15.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x2_z16.svg b/symbols/shields/secondary_1x2_z16.svg
index cb3cec6..5e1e8c2 100644
--- a/symbols/shields/secondary_1x2_z16.svg
+++ b/symbols/shields/secondary_1x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 26.0">
- <rect x="0.5" y="0.5" width="15.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 34.0">
+ <rect x="0.5" y="0.5" width="15.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x2_z18.svg b/symbols/shields/secondary_1x2_z18.svg
index 3676a0f..b637f50 100644
--- a/symbols/shields/secondary_1x2_z18.svg
+++ b/symbols/shields/secondary_1x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 28.0">
- <rect x="0.5" y="0.5" width="16.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 36.0">
+ <rect x="0.5" y="0.5" width="15.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x3.svg b/symbols/shields/secondary_1x3.svg
index a538615..479ff9b 100644
--- a/symbols/shields/secondary_1x3.svg
+++ b/symbols/shields/secondary_1x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 33.0">
- <rect x="0.5" y="0.5" width="14.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 42.0">
+ <rect x="0.5" y="0.5" width="15.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x3_z16.svg b/symbols/shields/secondary_1x3_z16.svg
index b637f50..73a4873 100644
--- a/symbols/shields/secondary_1x3_z16.svg
+++ b/symbols/shields/secondary_1x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 36.0">
- <rect x="0.5" y="0.5" width="15.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 48.0">
+ <rect x="0.5" y="0.5" width="15.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x3_z18.svg b/symbols/shields/secondary_1x3_z18.svg
index 28de77f..6e14a18 100644
--- a/symbols/shields/secondary_1x3_z18.svg
+++ b/symbols/shields/secondary_1x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 39.0">
- <rect x="0.5" y="0.5" width="16.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 51.0">
+ <rect x="0.5" y="0.5" width="15.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x4.svg b/symbols/shields/secondary_1x4.svg
index 0bab86f..7767bfa 100644
--- a/symbols/shields/secondary_1x4.svg
+++ b/symbols/shields/secondary_1x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 42.0">
- <rect x="0.5" y="0.5" width="14.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 54.0">
+ <rect x="0.5" y="0.5" width="15.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x4_z16.svg b/symbols/shields/secondary_1x4_z16.svg
index b615068..a6861c0 100644
--- a/symbols/shields/secondary_1x4_z16.svg
+++ b/symbols/shields/secondary_1x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 46.0">
- <rect x="0.5" y="0.5" width="15.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 62.0">
+ <rect x="0.5" y="0.5" width="15.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_1x4_z18.svg b/symbols/shields/secondary_1x4_z18.svg
index a3b5876..b308e43 100644
--- a/symbols/shields/secondary_1x4_z18.svg
+++ b/symbols/shields/secondary_1x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 50.0">
- <rect x="0.5" y="0.5" width="16.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 66.0">
+ <rect x="0.5" y="0.5" width="15.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x1.svg b/symbols/shields/secondary_2x1.svg
index 2735f50..a1f8522 100644
--- a/symbols/shields/secondary_2x1.svg
+++ b/symbols/shields/secondary_2x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 15.0">
- <rect x="0.5" y="0.5" width="20.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 18.0">
+ <rect x="0.5" y="0.5" width="21.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x1_z16.svg b/symbols/shields/secondary_2x1_z16.svg
index 02762af..628a5c8 100644
--- a/symbols/shields/secondary_2x1_z16.svg
+++ b/symbols/shields/secondary_2x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 16.0">
- <rect x="0.5" y="0.5" width="21.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 20.0">
+ <rect x="0.5" y="0.5" width="21.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x1_z18.svg b/symbols/shields/secondary_2x1_z18.svg
index bde5c03..0b5cc05 100644
--- a/symbols/shields/secondary_2x1_z18.svg
+++ b/symbols/shields/secondary_2x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 17.0">
- <rect x="0.5" y="0.5" width="23.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 21.0">
+ <rect x="0.5" y="0.5" width="22.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x2.svg b/symbols/shields/secondary_2x2.svg
index 34c02e9..0076711 100644
--- a/symbols/shields/secondary_2x2.svg
+++ b/symbols/shields/secondary_2x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 24.0">
- <rect x="0.5" y="0.5" width="20.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 30.0">
+ <rect x="0.5" y="0.5" width="21.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x2_z16.svg b/symbols/shields/secondary_2x2_z16.svg
index 0599393..202d0d1 100644
--- a/symbols/shields/secondary_2x2_z16.svg
+++ b/symbols/shields/secondary_2x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 26.0">
- <rect x="0.5" y="0.5" width="21.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 34.0">
+ <rect x="0.5" y="0.5" width="21.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x2_z18.svg b/symbols/shields/secondary_2x2_z18.svg
index 50fc543..1e85fe4 100644
--- a/symbols/shields/secondary_2x2_z18.svg
+++ b/symbols/shields/secondary_2x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 28.0">
- <rect x="0.5" y="0.5" width="23.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 36.0">
+ <rect x="0.5" y="0.5" width="22.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x3.svg b/symbols/shields/secondary_2x3.svg
index 808c4fb..465d7ad 100644
--- a/symbols/shields/secondary_2x3.svg
+++ b/symbols/shields/secondary_2x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 33.0">
- <rect x="0.5" y="0.5" width="20.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 42.0">
+ <rect x="0.5" y="0.5" width="21.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x3_z16.svg b/symbols/shields/secondary_2x3_z16.svg
index d52a2b9..b430c05 100644
--- a/symbols/shields/secondary_2x3_z16.svg
+++ b/symbols/shields/secondary_2x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 36.0">
- <rect x="0.5" y="0.5" width="21.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 48.0">
+ <rect x="0.5" y="0.5" width="21.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x3_z18.svg b/symbols/shields/secondary_2x3_z18.svg
index 07b3f28..fc956c1 100644
--- a/symbols/shields/secondary_2x3_z18.svg
+++ b/symbols/shields/secondary_2x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 39.0">
- <rect x="0.5" y="0.5" width="23.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 51.0">
+ <rect x="0.5" y="0.5" width="22.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x4.svg b/symbols/shields/secondary_2x4.svg
index 81c4a0a..2dba556 100644
--- a/symbols/shields/secondary_2x4.svg
+++ b/symbols/shields/secondary_2x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 42.0">
- <rect x="0.5" y="0.5" width="20.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 54.0">
+ <rect x="0.5" y="0.5" width="21.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x4_z16.svg b/symbols/shields/secondary_2x4_z16.svg
index cfb3892..e09ff35 100644
--- a/symbols/shields/secondary_2x4_z16.svg
+++ b/symbols/shields/secondary_2x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 46.0">
- <rect x="0.5" y="0.5" width="21.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 62.0">
+ <rect x="0.5" y="0.5" width="21.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_2x4_z18.svg b/symbols/shields/secondary_2x4_z18.svg
index 33f73bb..57bb7f2 100644
--- a/symbols/shields/secondary_2x4_z18.svg
+++ b/symbols/shields/secondary_2x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 50.0">
- <rect x="0.5" y="0.5" width="23.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 66.0">
+ <rect x="0.5" y="0.5" width="22.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x1.svg b/symbols/shields/secondary_3x1.svg
index 5be3e4c..76b00cb 100644
--- a/symbols/shields/secondary_3x1.svg
+++ b/symbols/shields/secondary_3x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 15.0">
- <rect x="0.5" y="0.5" width="26.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 18.0">
+ <rect x="0.5" y="0.5" width="27.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x1_z16.svg b/symbols/shields/secondary_3x1_z16.svg
index 39bbbdc..2c075dc 100644
--- a/symbols/shields/secondary_3x1_z16.svg
+++ b/symbols/shields/secondary_3x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 16.0">
- <rect x="0.5" y="0.5" width="28.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 20.0">
+ <rect x="0.5" y="0.5" width="27.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x1_z18.svg b/symbols/shields/secondary_3x1_z18.svg
index 8538abe..f922986 100644
--- a/symbols/shields/secondary_3x1_z18.svg
+++ b/symbols/shields/secondary_3x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 17.0">
- <rect x="0.5" y="0.5" width="30.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 21.0">
+ <rect x="0.5" y="0.5" width="29.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x2.svg b/symbols/shields/secondary_3x2.svg
index 6ff7107..1c88cb0 100644
--- a/symbols/shields/secondary_3x2.svg
+++ b/symbols/shields/secondary_3x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 24.0">
- <rect x="0.5" y="0.5" width="26.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 30.0">
+ <rect x="0.5" y="0.5" width="27.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x2_z16.svg b/symbols/shields/secondary_3x2_z16.svg
index e5a745c..ed1889e 100644
--- a/symbols/shields/secondary_3x2_z16.svg
+++ b/symbols/shields/secondary_3x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 26.0">
- <rect x="0.5" y="0.5" width="28.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 34.0">
+ <rect x="0.5" y="0.5" width="27.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x2_z18.svg b/symbols/shields/secondary_3x2_z18.svg
index 8dbee48..6eee4f5 100644
--- a/symbols/shields/secondary_3x2_z18.svg
+++ b/symbols/shields/secondary_3x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 28.0">
- <rect x="0.5" y="0.5" width="30.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 36.0">
+ <rect x="0.5" y="0.5" width="29.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x3.svg b/symbols/shields/secondary_3x3.svg
index d16ecb3..eb004a5 100644
--- a/symbols/shields/secondary_3x3.svg
+++ b/symbols/shields/secondary_3x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 33.0">
- <rect x="0.5" y="0.5" width="26.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 42.0">
+ <rect x="0.5" y="0.5" width="27.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x3_z16.svg b/symbols/shields/secondary_3x3_z16.svg
index 8eb1031..6f335be 100644
--- a/symbols/shields/secondary_3x3_z16.svg
+++ b/symbols/shields/secondary_3x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 36.0">
- <rect x="0.5" y="0.5" width="28.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 48.0">
+ <rect x="0.5" y="0.5" width="27.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x3_z18.svg b/symbols/shields/secondary_3x3_z18.svg
index 072b861..b6a6096 100644
--- a/symbols/shields/secondary_3x3_z18.svg
+++ b/symbols/shields/secondary_3x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 39.0">
- <rect x="0.5" y="0.5" width="30.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 51.0">
+ <rect x="0.5" y="0.5" width="29.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x4.svg b/symbols/shields/secondary_3x4.svg
index 241aafb..9dfe03b 100644
--- a/symbols/shields/secondary_3x4.svg
+++ b/symbols/shields/secondary_3x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 42.0">
- <rect x="0.5" y="0.5" width="26.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 54.0">
+ <rect x="0.5" y="0.5" width="27.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x4_z16.svg b/symbols/shields/secondary_3x4_z16.svg
index 2934d35..53a0a41 100644
--- a/symbols/shields/secondary_3x4_z16.svg
+++ b/symbols/shields/secondary_3x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 46.0">
- <rect x="0.5" y="0.5" width="28.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 62.0">
+ <rect x="0.5" y="0.5" width="27.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_3x4_z18.svg b/symbols/shields/secondary_3x4_z18.svg
index 7c4a3de..63d3d1b 100644
--- a/symbols/shields/secondary_3x4_z18.svg
+++ b/symbols/shields/secondary_3x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 50.0">
- <rect x="0.5" y="0.5" width="30.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 66.0">
+ <rect x="0.5" y="0.5" width="29.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x1.svg b/symbols/shields/secondary_4x1.svg
index 37cc6f0..ad7aee5 100644
--- a/symbols/shields/secondary_4x1.svg
+++ b/symbols/shields/secondary_4x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 15.0">
- <rect x="0.5" y="0.5" width="32.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 18.0">
+ <rect x="0.5" y="0.5" width="33.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x1_z16.svg b/symbols/shields/secondary_4x1_z16.svg
index 1acf8ee..5ccc6cf 100644
--- a/symbols/shields/secondary_4x1_z16.svg
+++ b/symbols/shields/secondary_4x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 16.0">
- <rect x="0.5" y="0.5" width="34.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 20.0">
+ <rect x="0.5" y="0.5" width="33.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x1_z18.svg b/symbols/shields/secondary_4x1_z18.svg
index f3abd2b..d510051 100644
--- a/symbols/shields/secondary_4x1_z18.svg
+++ b/symbols/shields/secondary_4x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 17.0">
- <rect x="0.5" y="0.5" width="37.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 21.0">
+ <rect x="0.5" y="0.5" width="36.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x2.svg b/symbols/shields/secondary_4x2.svg
index 4ec48bd..11aa078 100644
--- a/symbols/shields/secondary_4x2.svg
+++ b/symbols/shields/secondary_4x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 24.0">
- <rect x="0.5" y="0.5" width="32.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 30.0">
+ <rect x="0.5" y="0.5" width="33.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x2_z16.svg b/symbols/shields/secondary_4x2_z16.svg
index 3c78924..0d9e6bc 100644
--- a/symbols/shields/secondary_4x2_z16.svg
+++ b/symbols/shields/secondary_4x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 26.0">
- <rect x="0.5" y="0.5" width="34.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 34.0">
+ <rect x="0.5" y="0.5" width="33.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x2_z18.svg b/symbols/shields/secondary_4x2_z18.svg
index 49ef862..0773234 100644
--- a/symbols/shields/secondary_4x2_z18.svg
+++ b/symbols/shields/secondary_4x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 28.0">
- <rect x="0.5" y="0.5" width="37.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 36.0">
+ <rect x="0.5" y="0.5" width="36.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x3.svg b/symbols/shields/secondary_4x3.svg
index 07dcbe9..f5e0ba7 100644
--- a/symbols/shields/secondary_4x3.svg
+++ b/symbols/shields/secondary_4x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 33.0">
- <rect x="0.5" y="0.5" width="32.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 42.0">
+ <rect x="0.5" y="0.5" width="33.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x3_z16.svg b/symbols/shields/secondary_4x3_z16.svg
index 0476975..87b249b 100644
--- a/symbols/shields/secondary_4x3_z16.svg
+++ b/symbols/shields/secondary_4x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 36.0">
- <rect x="0.5" y="0.5" width="34.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 48.0">
+ <rect x="0.5" y="0.5" width="33.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x3_z18.svg b/symbols/shields/secondary_4x3_z18.svg
index d7e3428..c78c56f 100644
--- a/symbols/shields/secondary_4x3_z18.svg
+++ b/symbols/shields/secondary_4x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 39.0">
- <rect x="0.5" y="0.5" width="37.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 51.0">
+ <rect x="0.5" y="0.5" width="36.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x4.svg b/symbols/shields/secondary_4x4.svg
index 5b3ca94..3e098fc 100644
--- a/symbols/shields/secondary_4x4.svg
+++ b/symbols/shields/secondary_4x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 42.0">
- <rect x="0.5" y="0.5" width="32.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 54.0">
+ <rect x="0.5" y="0.5" width="33.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x4_z16.svg b/symbols/shields/secondary_4x4_z16.svg
index d98bca0..cd91d11 100644
--- a/symbols/shields/secondary_4x4_z16.svg
+++ b/symbols/shields/secondary_4x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 46.0">
- <rect x="0.5" y="0.5" width="34.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 62.0">
+ <rect x="0.5" y="0.5" width="33.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_4x4_z18.svg b/symbols/shields/secondary_4x4_z18.svg
index e0a27d3..6c45f96 100644
--- a/symbols/shields/secondary_4x4_z18.svg
+++ b/symbols/shields/secondary_4x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 50.0">
- <rect x="0.5" y="0.5" width="37.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 66.0">
+ <rect x="0.5" y="0.5" width="36.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x1.svg b/symbols/shields/secondary_5x1.svg
index a8f9155..b2b37c2 100644
--- a/symbols/shields/secondary_5x1.svg
+++ b/symbols/shields/secondary_5x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 15.0">
- <rect x="0.5" y="0.5" width="38.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 18.0">
+ <rect x="0.5" y="0.5" width="39.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x1_z16.svg b/symbols/shields/secondary_5x1_z16.svg
index 1a78b38..afa9e54 100644
--- a/symbols/shields/secondary_5x1_z16.svg
+++ b/symbols/shields/secondary_5x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 16.0">
- <rect x="0.5" y="0.5" width="41.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 20.0">
+ <rect x="0.5" y="0.5" width="39.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x1_z18.svg b/symbols/shields/secondary_5x1_z18.svg
index d166702..3c546c5 100644
--- a/symbols/shields/secondary_5x1_z18.svg
+++ b/symbols/shields/secondary_5x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 17.0">
- <rect x="0.5" y="0.5" width="44.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 21.0">
+ <rect x="0.5" y="0.5" width="43.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x2.svg b/symbols/shields/secondary_5x2.svg
index a45399c..bf1ba4c 100644
--- a/symbols/shields/secondary_5x2.svg
+++ b/symbols/shields/secondary_5x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 24.0">
- <rect x="0.5" y="0.5" width="38.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 30.0">
+ <rect x="0.5" y="0.5" width="39.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x2_z16.svg b/symbols/shields/secondary_5x2_z16.svg
index 8a25b39..87e2298 100644
--- a/symbols/shields/secondary_5x2_z16.svg
+++ b/symbols/shields/secondary_5x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 26.0">
- <rect x="0.5" y="0.5" width="41.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 34.0">
+ <rect x="0.5" y="0.5" width="39.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x2_z18.svg b/symbols/shields/secondary_5x2_z18.svg
index 62d6600..66e0c15 100644
--- a/symbols/shields/secondary_5x2_z18.svg
+++ b/symbols/shields/secondary_5x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 28.0">
- <rect x="0.5" y="0.5" width="44.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 36.0">
+ <rect x="0.5" y="0.5" width="43.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x3.svg b/symbols/shields/secondary_5x3.svg
index 00ff7e7..91f90d5 100644
--- a/symbols/shields/secondary_5x3.svg
+++ b/symbols/shields/secondary_5x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 33.0">
- <rect x="0.5" y="0.5" width="38.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 42.0">
+ <rect x="0.5" y="0.5" width="39.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x3_z16.svg b/symbols/shields/secondary_5x3_z16.svg
index 2d90b9f..921ba22 100644
--- a/symbols/shields/secondary_5x3_z16.svg
+++ b/symbols/shields/secondary_5x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 36.0">
- <rect x="0.5" y="0.5" width="41.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 48.0">
+ <rect x="0.5" y="0.5" width="39.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x3_z18.svg b/symbols/shields/secondary_5x3_z18.svg
index c268d49..2f2e9fa 100644
--- a/symbols/shields/secondary_5x3_z18.svg
+++ b/symbols/shields/secondary_5x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 39.0">
- <rect x="0.5" y="0.5" width="44.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 51.0">
+ <rect x="0.5" y="0.5" width="43.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x4.svg b/symbols/shields/secondary_5x4.svg
index 1a2bbb7..6a16ffe 100644
--- a/symbols/shields/secondary_5x4.svg
+++ b/symbols/shields/secondary_5x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 42.0">
- <rect x="0.5" y="0.5" width="38.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 54.0">
+ <rect x="0.5" y="0.5" width="39.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x4_z16.svg b/symbols/shields/secondary_5x4_z16.svg
index 66c8888..e9ec3f8 100644
--- a/symbols/shields/secondary_5x4_z16.svg
+++ b/symbols/shields/secondary_5x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 46.0">
- <rect x="0.5" y="0.5" width="41.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 62.0">
+ <rect x="0.5" y="0.5" width="39.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_5x4_z18.svg b/symbols/shields/secondary_5x4_z18.svg
index 690ab04..d8a01df 100644
--- a/symbols/shields/secondary_5x4_z18.svg
+++ b/symbols/shields/secondary_5x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 50.0">
- <rect x="0.5" y="0.5" width="44.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 66.0">
+ <rect x="0.5" y="0.5" width="43.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x1.svg b/symbols/shields/secondary_6x1.svg
index b7a2852..49dface 100644
--- a/symbols/shields/secondary_6x1.svg
+++ b/symbols/shields/secondary_6x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 15.0">
- <rect x="0.5" y="0.5" width="44.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 18.0">
+ <rect x="0.5" y="0.5" width="46.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x1_z16.svg b/symbols/shields/secondary_6x1_z16.svg
index 06836d9..ae1a9f1 100644
--- a/symbols/shields/secondary_6x1_z16.svg
+++ b/symbols/shields/secondary_6x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 16.0">
- <rect x="0.5" y="0.5" width="47.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 20.0">
+ <rect x="0.5" y="0.5" width="45.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x1_z18.svg b/symbols/shields/secondary_6x1_z18.svg
index edfa125..b352c4a 100644
--- a/symbols/shields/secondary_6x1_z18.svg
+++ b/symbols/shields/secondary_6x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 17.0">
- <rect x="0.5" y="0.5" width="52.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 21.0">
+ <rect x="0.5" y="0.5" width="50.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x2.svg b/symbols/shields/secondary_6x2.svg
index b83066b..63fc70a 100644
--- a/symbols/shields/secondary_6x2.svg
+++ b/symbols/shields/secondary_6x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 24.0">
- <rect x="0.5" y="0.5" width="44.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 30.0">
+ <rect x="0.5" y="0.5" width="46.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x2_z16.svg b/symbols/shields/secondary_6x2_z16.svg
index c549ff1..5378d72 100644
--- a/symbols/shields/secondary_6x2_z16.svg
+++ b/symbols/shields/secondary_6x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 26.0">
- <rect x="0.5" y="0.5" width="47.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 34.0">
+ <rect x="0.5" y="0.5" width="45.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x2_z18.svg b/symbols/shields/secondary_6x2_z18.svg
index b8396da..76b28eb 100644
--- a/symbols/shields/secondary_6x2_z18.svg
+++ b/symbols/shields/secondary_6x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 28.0">
- <rect x="0.5" y="0.5" width="52.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 36.0">
+ <rect x="0.5" y="0.5" width="50.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x3.svg b/symbols/shields/secondary_6x3.svg
index ed85863..7854c60 100644
--- a/symbols/shields/secondary_6x3.svg
+++ b/symbols/shields/secondary_6x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 33.0">
- <rect x="0.5" y="0.5" width="44.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 42.0">
+ <rect x="0.5" y="0.5" width="46.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x3_z16.svg b/symbols/shields/secondary_6x3_z16.svg
index 1da86b5..696b7f8 100644
--- a/symbols/shields/secondary_6x3_z16.svg
+++ b/symbols/shields/secondary_6x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 36.0">
- <rect x="0.5" y="0.5" width="47.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 48.0">
+ <rect x="0.5" y="0.5" width="45.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x3_z18.svg b/symbols/shields/secondary_6x3_z18.svg
index 04f68d7..7554369 100644
--- a/symbols/shields/secondary_6x3_z18.svg
+++ b/symbols/shields/secondary_6x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 39.0">
- <rect x="0.5" y="0.5" width="52.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 51.0">
+ <rect x="0.5" y="0.5" width="50.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x4.svg b/symbols/shields/secondary_6x4.svg
index 98b7f14..63a1c7a 100644
--- a/symbols/shields/secondary_6x4.svg
+++ b/symbols/shields/secondary_6x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 42.0">
- <rect x="0.5" y="0.5" width="44.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 54.0">
+ <rect x="0.5" y="0.5" width="46.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x4_z16.svg b/symbols/shields/secondary_6x4_z16.svg
index 8db9050..f234fe3 100644
--- a/symbols/shields/secondary_6x4_z16.svg
+++ b/symbols/shields/secondary_6x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 46.0">
- <rect x="0.5" y="0.5" width="47.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 62.0">
+ <rect x="0.5" y="0.5" width="45.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_6x4_z18.svg b/symbols/shields/secondary_6x4_z18.svg
index 94d82cf..5b736f2 100644
--- a/symbols/shields/secondary_6x4_z18.svg
+++ b/symbols/shields/secondary_6x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 50.0">
- <rect x="0.5" y="0.5" width="52.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 66.0">
+ <rect x="0.5" y="0.5" width="50.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x1.svg b/symbols/shields/secondary_7x1.svg
index 7292e3d..5e66f27 100644
--- a/symbols/shields/secondary_7x1.svg
+++ b/symbols/shields/secondary_7x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 15.0">
- <rect x="0.5" y="0.5" width="50.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 18.0">
+ <rect x="0.5" y="0.5" width="52.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x1_z16.svg b/symbols/shields/secondary_7x1_z16.svg
index 0bebf49..bca1531 100644
--- a/symbols/shields/secondary_7x1_z16.svg
+++ b/symbols/shields/secondary_7x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 16.0">
- <rect x="0.5" y="0.5" width="54.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 20.0">
+ <rect x="0.5" y="0.5" width="51.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x1_z18.svg b/symbols/shields/secondary_7x1_z18.svg
index 890d21d..a8d9901 100644
--- a/symbols/shields/secondary_7x1_z18.svg
+++ b/symbols/shields/secondary_7x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 17.0">
- <rect x="0.5" y="0.5" width="59.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 21.0">
+ <rect x="0.5" y="0.5" width="57.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x2.svg b/symbols/shields/secondary_7x2.svg
index 3f9be0c..868b1e6 100644
--- a/symbols/shields/secondary_7x2.svg
+++ b/symbols/shields/secondary_7x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 24.0">
- <rect x="0.5" y="0.5" width="50.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 30.0">
+ <rect x="0.5" y="0.5" width="52.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x2_z16.svg b/symbols/shields/secondary_7x2_z16.svg
index 70adeff..88b072a 100644
--- a/symbols/shields/secondary_7x2_z16.svg
+++ b/symbols/shields/secondary_7x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 26.0">
- <rect x="0.5" y="0.5" width="54.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 34.0">
+ <rect x="0.5" y="0.5" width="51.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x2_z18.svg b/symbols/shields/secondary_7x2_z18.svg
index fee9108..0578822 100644
--- a/symbols/shields/secondary_7x2_z18.svg
+++ b/symbols/shields/secondary_7x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 28.0">
- <rect x="0.5" y="0.5" width="59.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 36.0">
+ <rect x="0.5" y="0.5" width="57.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x3.svg b/symbols/shields/secondary_7x3.svg
index 5f1a785..8bcdf00 100644
--- a/symbols/shields/secondary_7x3.svg
+++ b/symbols/shields/secondary_7x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 33.0">
- <rect x="0.5" y="0.5" width="50.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 42.0">
+ <rect x="0.5" y="0.5" width="52.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x3_z16.svg b/symbols/shields/secondary_7x3_z16.svg
index fadfd1c..00aae34 100644
--- a/symbols/shields/secondary_7x3_z16.svg
+++ b/symbols/shields/secondary_7x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 36.0">
- <rect x="0.5" y="0.5" width="54.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 48.0">
+ <rect x="0.5" y="0.5" width="51.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x3_z18.svg b/symbols/shields/secondary_7x3_z18.svg
index 5583879..8f264be 100644
--- a/symbols/shields/secondary_7x3_z18.svg
+++ b/symbols/shields/secondary_7x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 39.0">
- <rect x="0.5" y="0.5" width="59.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 51.0">
+ <rect x="0.5" y="0.5" width="57.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x4.svg b/symbols/shields/secondary_7x4.svg
index 1d6965a..d48c3a4 100644
--- a/symbols/shields/secondary_7x4.svg
+++ b/symbols/shields/secondary_7x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 42.0">
- <rect x="0.5" y="0.5" width="50.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 54.0">
+ <rect x="0.5" y="0.5" width="52.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x4_z16.svg b/symbols/shields/secondary_7x4_z16.svg
index b29dae4..890d7a6 100644
--- a/symbols/shields/secondary_7x4_z16.svg
+++ b/symbols/shields/secondary_7x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 46.0">
- <rect x="0.5" y="0.5" width="54.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 62.0">
+ <rect x="0.5" y="0.5" width="51.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_7x4_z18.svg b/symbols/shields/secondary_7x4_z18.svg
index 8312713..1dcb522 100644
--- a/symbols/shields/secondary_7x4_z18.svg
+++ b/symbols/shields/secondary_7x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 50.0">
- <rect x="0.5" y="0.5" width="59.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 66.0">
+ <rect x="0.5" y="0.5" width="57.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x1.svg b/symbols/shields/secondary_8x1.svg
index 2ce0625..b24123d 100644
--- a/symbols/shields/secondary_8x1.svg
+++ b/symbols/shields/secondary_8x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 15.0">
- <rect x="0.5" y="0.5" width="56.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 18.0">
+ <rect x="0.5" y="0.5" width="58.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x1_z16.svg b/symbols/shields/secondary_8x1_z16.svg
index ad8b0ab..8d60d15 100644
--- a/symbols/shields/secondary_8x1_z16.svg
+++ b/symbols/shields/secondary_8x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 16.0">
- <rect x="0.5" y="0.5" width="60.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 20.0">
+ <rect x="0.5" y="0.5" width="57.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x1_z18.svg b/symbols/shields/secondary_8x1_z18.svg
index fe81800..ce2a9d6 100644
--- a/symbols/shields/secondary_8x1_z18.svg
+++ b/symbols/shields/secondary_8x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 17.0">
- <rect x="0.5" y="0.5" width="66.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 21.0">
+ <rect x="0.5" y="0.5" width="64.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x2.svg b/symbols/shields/secondary_8x2.svg
index 819b337..5c80976 100644
--- a/symbols/shields/secondary_8x2.svg
+++ b/symbols/shields/secondary_8x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 24.0">
- <rect x="0.5" y="0.5" width="56.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 30.0">
+ <rect x="0.5" y="0.5" width="58.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x2_z16.svg b/symbols/shields/secondary_8x2_z16.svg
index 8b0c8c3..1fce061 100644
--- a/symbols/shields/secondary_8x2_z16.svg
+++ b/symbols/shields/secondary_8x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 26.0">
- <rect x="0.5" y="0.5" width="60.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 34.0">
+ <rect x="0.5" y="0.5" width="57.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x2_z18.svg b/symbols/shields/secondary_8x2_z18.svg
index 23942d5..f784295 100644
--- a/symbols/shields/secondary_8x2_z18.svg
+++ b/symbols/shields/secondary_8x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 28.0">
- <rect x="0.5" y="0.5" width="66.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 36.0">
+ <rect x="0.5" y="0.5" width="64.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x3.svg b/symbols/shields/secondary_8x3.svg
index 00a48ff..36d7f5c 100644
--- a/symbols/shields/secondary_8x3.svg
+++ b/symbols/shields/secondary_8x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 33.0">
- <rect x="0.5" y="0.5" width="56.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 42.0">
+ <rect x="0.5" y="0.5" width="58.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x3_z16.svg b/symbols/shields/secondary_8x3_z16.svg
index 0594232..44012e5 100644
--- a/symbols/shields/secondary_8x3_z16.svg
+++ b/symbols/shields/secondary_8x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 36.0">
- <rect x="0.5" y="0.5" width="60.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 48.0">
+ <rect x="0.5" y="0.5" width="57.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x3_z18.svg b/symbols/shields/secondary_8x3_z18.svg
index e306492..f86b809 100644
--- a/symbols/shields/secondary_8x3_z18.svg
+++ b/symbols/shields/secondary_8x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 39.0">
- <rect x="0.5" y="0.5" width="66.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 51.0">
+ <rect x="0.5" y="0.5" width="64.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x4.svg b/symbols/shields/secondary_8x4.svg
index b92dede..e299ddd 100644
--- a/symbols/shields/secondary_8x4.svg
+++ b/symbols/shields/secondary_8x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 42.0">
- <rect x="0.5" y="0.5" width="56.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 54.0">
+ <rect x="0.5" y="0.5" width="58.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x4_z16.svg b/symbols/shields/secondary_8x4_z16.svg
index f64e47c..86ac5d0 100644
--- a/symbols/shields/secondary_8x4_z16.svg
+++ b/symbols/shields/secondary_8x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 46.0">
- <rect x="0.5" y="0.5" width="60.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 62.0">
+ <rect x="0.5" y="0.5" width="57.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_8x4_z18.svg b/symbols/shields/secondary_8x4_z18.svg
index 8a87d91..4c7cfd8 100644
--- a/symbols/shields/secondary_8x4_z18.svg
+++ b/symbols/shields/secondary_8x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 50.0">
- <rect x="0.5" y="0.5" width="66.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 66.0">
+ <rect x="0.5" y="0.5" width="64.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x1.svg b/symbols/shields/secondary_9x1.svg
index 7169d76..063b0b5 100644
--- a/symbols/shields/secondary_9x1.svg
+++ b/symbols/shields/secondary_9x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 15.0">
- <rect x="0.5" y="0.5" width="62.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 18.0">
+ <rect x="0.5" y="0.5" width="64.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x1_z16.svg b/symbols/shields/secondary_9x1_z16.svg
index cc65e80..3e77918 100644
--- a/symbols/shields/secondary_9x1_z16.svg
+++ b/symbols/shields/secondary_9x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 16.0">
- <rect x="0.5" y="0.5" width="67.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 20.0">
+ <rect x="0.5" y="0.5" width="63.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x1_z18.svg b/symbols/shields/secondary_9x1_z18.svg
index fba3629..eb2cfab 100644
--- a/symbols/shields/secondary_9x1_z18.svg
+++ b/symbols/shields/secondary_9x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 17.0">
- <rect x="0.5" y="0.5" width="73.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 21.0">
+ <rect x="0.5" y="0.5" width="71.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x2.svg b/symbols/shields/secondary_9x2.svg
index 6b1c383..5bef23d 100644
--- a/symbols/shields/secondary_9x2.svg
+++ b/symbols/shields/secondary_9x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 24.0">
- <rect x="0.5" y="0.5" width="62.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 30.0">
+ <rect x="0.5" y="0.5" width="64.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x2_z16.svg b/symbols/shields/secondary_9x2_z16.svg
index 08384d9..38b00d5 100644
--- a/symbols/shields/secondary_9x2_z16.svg
+++ b/symbols/shields/secondary_9x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 26.0">
- <rect x="0.5" y="0.5" width="67.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 34.0">
+ <rect x="0.5" y="0.5" width="63.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x2_z18.svg b/symbols/shields/secondary_9x2_z18.svg
index 37c9ea2..8285161 100644
--- a/symbols/shields/secondary_9x2_z18.svg
+++ b/symbols/shields/secondary_9x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 28.0">
- <rect x="0.5" y="0.5" width="73.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 36.0">
+ <rect x="0.5" y="0.5" width="71.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x3.svg b/symbols/shields/secondary_9x3.svg
index 3826531..226c87a 100644
--- a/symbols/shields/secondary_9x3.svg
+++ b/symbols/shields/secondary_9x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 33.0">
- <rect x="0.5" y="0.5" width="62.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 42.0">
+ <rect x="0.5" y="0.5" width="64.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x3_z16.svg b/symbols/shields/secondary_9x3_z16.svg
index e84d6a3..97e7bc0 100644
--- a/symbols/shields/secondary_9x3_z16.svg
+++ b/symbols/shields/secondary_9x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 36.0">
- <rect x="0.5" y="0.5" width="67.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 48.0">
+ <rect x="0.5" y="0.5" width="63.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x3_z18.svg b/symbols/shields/secondary_9x3_z18.svg
index 159631e..06bbc06 100644
--- a/symbols/shields/secondary_9x3_z18.svg
+++ b/symbols/shields/secondary_9x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 39.0">
- <rect x="0.5" y="0.5" width="73.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 51.0">
+ <rect x="0.5" y="0.5" width="71.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x4.svg b/symbols/shields/secondary_9x4.svg
index e12754d..4e720ab 100644
--- a/symbols/shields/secondary_9x4.svg
+++ b/symbols/shields/secondary_9x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 42.0">
- <rect x="0.5" y="0.5" width="62.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 54.0">
+ <rect x="0.5" y="0.5" width="64.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x4_z16.svg b/symbols/shields/secondary_9x4_z16.svg
index 7e6e9a7..72d6689 100644
--- a/symbols/shields/secondary_9x4_z16.svg
+++ b/symbols/shields/secondary_9x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 46.0">
- <rect x="0.5" y="0.5" width="67.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 62.0">
+ <rect x="0.5" y="0.5" width="63.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/secondary_9x4_z18.svg b/symbols/shields/secondary_9x4_z18.svg
index 58cd31e..421a24d 100644
--- a/symbols/shields/secondary_9x4_z18.svg
+++ b/symbols/shields/secondary_9x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 50.0">
- <rect x="0.5" y="0.5" width="73.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 66.0">
+ <rect x="0.5" y="0.5" width="71.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#eeefd7;stroke:#c4c69c;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x1.svg b/symbols/shields/tertiary_10x1.svg
index 14f5b6d..f1f2d48 100644
--- a/symbols/shields/tertiary_10x1.svg
+++ b/symbols/shields/tertiary_10x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 15.0">
- <rect x="0.5" y="0.5" width="67.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 18.0">
+ <rect x="0.5" y="0.5" width="70.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x1_z16.svg b/symbols/shields/tertiary_10x1_z16.svg
index 060fdfd..6a9d826 100644
--- a/symbols/shields/tertiary_10x1_z16.svg
+++ b/symbols/shields/tertiary_10x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 16.0">
- <rect x="0.5" y="0.5" width="73.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 20.0">
+ <rect x="0.5" y="0.5" width="69.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x1_z18.svg b/symbols/shields/tertiary_10x1_z18.svg
index 4840181..698e306 100644
--- a/symbols/shields/tertiary_10x1_z18.svg
+++ b/symbols/shields/tertiary_10x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 17.0">
- <rect x="0.5" y="0.5" width="80.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 21.0">
+ <rect x="0.5" y="0.5" width="77.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x2.svg b/symbols/shields/tertiary_10x2.svg
index 06fdb09..28ba4d0 100644
--- a/symbols/shields/tertiary_10x2.svg
+++ b/symbols/shields/tertiary_10x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 24.0">
- <rect x="0.5" y="0.5" width="67.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 30.0">
+ <rect x="0.5" y="0.5" width="70.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x2_z16.svg b/symbols/shields/tertiary_10x2_z16.svg
index 8a65c4e..a7cdac8 100644
--- a/symbols/shields/tertiary_10x2_z16.svg
+++ b/symbols/shields/tertiary_10x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 26.0">
- <rect x="0.5" y="0.5" width="73.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 34.0">
+ <rect x="0.5" y="0.5" width="69.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x2_z18.svg b/symbols/shields/tertiary_10x2_z18.svg
index 8999c31..7380c0e 100644
--- a/symbols/shields/tertiary_10x2_z18.svg
+++ b/symbols/shields/tertiary_10x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 28.0">
- <rect x="0.5" y="0.5" width="80.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 36.0">
+ <rect x="0.5" y="0.5" width="77.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x3.svg b/symbols/shields/tertiary_10x3.svg
index 0fb6b64..91e087a 100644
--- a/symbols/shields/tertiary_10x3.svg
+++ b/symbols/shields/tertiary_10x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 33.0">
- <rect x="0.5" y="0.5" width="67.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 42.0">
+ <rect x="0.5" y="0.5" width="70.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x3_z16.svg b/symbols/shields/tertiary_10x3_z16.svg
index 99a13bf..c4a82ac 100644
--- a/symbols/shields/tertiary_10x3_z16.svg
+++ b/symbols/shields/tertiary_10x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 36.0">
- <rect x="0.5" y="0.5" width="73.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 48.0">
+ <rect x="0.5" y="0.5" width="69.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x3_z18.svg b/symbols/shields/tertiary_10x3_z18.svg
index 35deb7e..97b3ff4 100644
--- a/symbols/shields/tertiary_10x3_z18.svg
+++ b/symbols/shields/tertiary_10x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 39.0">
- <rect x="0.5" y="0.5" width="80.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 51.0">
+ <rect x="0.5" y="0.5" width="77.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x4.svg b/symbols/shields/tertiary_10x4.svg
index def502c..d4d5f9b 100644
--- a/symbols/shields/tertiary_10x4.svg
+++ b/symbols/shields/tertiary_10x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 42.0">
- <rect x="0.5" y="0.5" width="67.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 54.0">
+ <rect x="0.5" y="0.5" width="70.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x4_z16.svg b/symbols/shields/tertiary_10x4_z16.svg
index abd5a34..dbca95c 100644
--- a/symbols/shields/tertiary_10x4_z16.svg
+++ b/symbols/shields/tertiary_10x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 46.0">
- <rect x="0.5" y="0.5" width="73.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 62.0">
+ <rect x="0.5" y="0.5" width="69.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_10x4_z18.svg b/symbols/shields/tertiary_10x4_z18.svg
index b246fa3..a07e895 100644
--- a/symbols/shields/tertiary_10x4_z18.svg
+++ b/symbols/shields/tertiary_10x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 50.0">
- <rect x="0.5" y="0.5" width="80.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 66.0">
+ <rect x="0.5" y="0.5" width="77.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x1.svg b/symbols/shields/tertiary_11x1.svg
index 8ed1802..b22f3a7 100644
--- a/symbols/shields/tertiary_11x1.svg
+++ b/symbols/shields/tertiary_11x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 15.0">
- <rect x="0.5" y="0.5" width="73.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 18.0">
+ <rect x="0.5" y="0.5" width="77.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x1_z16.svg b/symbols/shields/tertiary_11x1_z16.svg
index a29470a..9f48b8c 100644
--- a/symbols/shields/tertiary_11x1_z16.svg
+++ b/symbols/shields/tertiary_11x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 16.0">
- <rect x="0.5" y="0.5" width="80.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 20.0">
+ <rect x="0.5" y="0.5" width="76.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x1_z18.svg b/symbols/shields/tertiary_11x1_z18.svg
index 52712f8..2b94e1e 100644
--- a/symbols/shields/tertiary_11x1_z18.svg
+++ b/symbols/shields/tertiary_11x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 17.0">
- <rect x="0.5" y="0.5" width="88.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 21.0">
+ <rect x="0.5" y="0.5" width="84.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x2.svg b/symbols/shields/tertiary_11x2.svg
index 6664788..f255327 100644
--- a/symbols/shields/tertiary_11x2.svg
+++ b/symbols/shields/tertiary_11x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 24.0">
- <rect x="0.5" y="0.5" width="73.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 30.0">
+ <rect x="0.5" y="0.5" width="77.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x2_z16.svg b/symbols/shields/tertiary_11x2_z16.svg
index 4a0c1f0..81934ef 100644
--- a/symbols/shields/tertiary_11x2_z16.svg
+++ b/symbols/shields/tertiary_11x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 26.0">
- <rect x="0.5" y="0.5" width="80.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 34.0">
+ <rect x="0.5" y="0.5" width="76.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x2_z18.svg b/symbols/shields/tertiary_11x2_z18.svg
index 7dbd36f..feb9062 100644
--- a/symbols/shields/tertiary_11x2_z18.svg
+++ b/symbols/shields/tertiary_11x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 28.0">
- <rect x="0.5" y="0.5" width="88.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 36.0">
+ <rect x="0.5" y="0.5" width="84.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x3.svg b/symbols/shields/tertiary_11x3.svg
index cf58fbb..5e337ad 100644
--- a/symbols/shields/tertiary_11x3.svg
+++ b/symbols/shields/tertiary_11x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 33.0">
- <rect x="0.5" y="0.5" width="73.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 42.0">
+ <rect x="0.5" y="0.5" width="77.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x3_z16.svg b/symbols/shields/tertiary_11x3_z16.svg
index e5eaabc..cf0580e 100644
--- a/symbols/shields/tertiary_11x3_z16.svg
+++ b/symbols/shields/tertiary_11x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 36.0">
- <rect x="0.5" y="0.5" width="80.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 48.0">
+ <rect x="0.5" y="0.5" width="76.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x3_z18.svg b/symbols/shields/tertiary_11x3_z18.svg
index 4ac877e..8a36a28 100644
--- a/symbols/shields/tertiary_11x3_z18.svg
+++ b/symbols/shields/tertiary_11x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 39.0">
- <rect x="0.5" y="0.5" width="88.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 51.0">
+ <rect x="0.5" y="0.5" width="84.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x4.svg b/symbols/shields/tertiary_11x4.svg
index 3d008d4..b999725 100644
--- a/symbols/shields/tertiary_11x4.svg
+++ b/symbols/shields/tertiary_11x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 42.0">
- <rect x="0.5" y="0.5" width="73.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 54.0">
+ <rect x="0.5" y="0.5" width="77.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x4_z16.svg b/symbols/shields/tertiary_11x4_z16.svg
index ad6f2df..7e04155 100644
--- a/symbols/shields/tertiary_11x4_z16.svg
+++ b/symbols/shields/tertiary_11x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 46.0">
- <rect x="0.5" y="0.5" width="80.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 62.0">
+ <rect x="0.5" y="0.5" width="76.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_11x4_z18.svg b/symbols/shields/tertiary_11x4_z18.svg
index 50ce611..ba336ea 100644
--- a/symbols/shields/tertiary_11x4_z18.svg
+++ b/symbols/shields/tertiary_11x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 50.0">
- <rect x="0.5" y="0.5" width="88.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 66.0">
+ <rect x="0.5" y="0.5" width="84.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x1.svg b/symbols/shields/tertiary_1x1.svg
index 8a96ef2..06c8d68 100644
--- a/symbols/shields/tertiary_1x1.svg
+++ b/symbols/shields/tertiary_1x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 15.0">
- <rect x="0.5" y="0.5" width="14.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 18.0">
+ <rect x="0.5" y="0.5" width="15.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x1_z16.svg b/symbols/shields/tertiary_1x1_z16.svg
index ba40c8b..bdd8bc9 100644
--- a/symbols/shields/tertiary_1x1_z16.svg
+++ b/symbols/shields/tertiary_1x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 16.0">
- <rect x="0.5" y="0.5" width="15.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 20.0">
+ <rect x="0.5" y="0.5" width="15.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x1_z18.svg b/symbols/shields/tertiary_1x1_z18.svg
index f9bdde8..84167f2 100644
--- a/symbols/shields/tertiary_1x1_z18.svg
+++ b/symbols/shields/tertiary_1x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 17.0">
- <rect x="0.5" y="0.5" width="16.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 21.0">
+ <rect x="0.5" y="0.5" width="15.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x2.svg b/symbols/shields/tertiary_1x2.svg
index d20df5e..5ef495d 100644
--- a/symbols/shields/tertiary_1x2.svg
+++ b/symbols/shields/tertiary_1x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 24.0">
- <rect x="0.5" y="0.5" width="14.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 30.0">
+ <rect x="0.5" y="0.5" width="15.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x2_z16.svg b/symbols/shields/tertiary_1x2_z16.svg
index ea4f211..51b991e 100644
--- a/symbols/shields/tertiary_1x2_z16.svg
+++ b/symbols/shields/tertiary_1x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 26.0">
- <rect x="0.5" y="0.5" width="15.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 34.0">
+ <rect x="0.5" y="0.5" width="15.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x2_z18.svg b/symbols/shields/tertiary_1x2_z18.svg
index 84f90f9..5dc6f1e 100644
--- a/symbols/shields/tertiary_1x2_z18.svg
+++ b/symbols/shields/tertiary_1x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 28.0">
- <rect x="0.5" y="0.5" width="16.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 36.0">
+ <rect x="0.5" y="0.5" width="15.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x3.svg b/symbols/shields/tertiary_1x3.svg
index 577346d..657fc28 100644
--- a/symbols/shields/tertiary_1x3.svg
+++ b/symbols/shields/tertiary_1x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 33.0">
- <rect x="0.5" y="0.5" width="14.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 42.0">
+ <rect x="0.5" y="0.5" width="15.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x3_z16.svg b/symbols/shields/tertiary_1x3_z16.svg
index 5dc6f1e..1cdb5df 100644
--- a/symbols/shields/tertiary_1x3_z16.svg
+++ b/symbols/shields/tertiary_1x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 36.0">
- <rect x="0.5" y="0.5" width="15.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 48.0">
+ <rect x="0.5" y="0.5" width="15.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x3_z18.svg b/symbols/shields/tertiary_1x3_z18.svg
index 506dbc2..5f17c14 100644
--- a/symbols/shields/tertiary_1x3_z18.svg
+++ b/symbols/shields/tertiary_1x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 39.0">
- <rect x="0.5" y="0.5" width="16.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 51.0">
+ <rect x="0.5" y="0.5" width="15.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x4.svg b/symbols/shields/tertiary_1x4.svg
index 3473fd5..da57d30 100644
--- a/symbols/shields/tertiary_1x4.svg
+++ b/symbols/shields/tertiary_1x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 42.0">
- <rect x="0.5" y="0.5" width="14.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 54.0">
+ <rect x="0.5" y="0.5" width="15.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x4_z16.svg b/symbols/shields/tertiary_1x4_z16.svg
index 3a1a109..cc3f293 100644
--- a/symbols/shields/tertiary_1x4_z16.svg
+++ b/symbols/shields/tertiary_1x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 46.0">
- <rect x="0.5" y="0.5" width="15.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 62.0">
+ <rect x="0.5" y="0.5" width="15.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_1x4_z18.svg b/symbols/shields/tertiary_1x4_z18.svg
index 2a8a2bb..db40324 100644
--- a/symbols/shields/tertiary_1x4_z18.svg
+++ b/symbols/shields/tertiary_1x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 50.0">
- <rect x="0.5" y="0.5" width="16.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 66.0">
+ <rect x="0.5" y="0.5" width="15.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x1.svg b/symbols/shields/tertiary_2x1.svg
index c8959ca..10a864b 100644
--- a/symbols/shields/tertiary_2x1.svg
+++ b/symbols/shields/tertiary_2x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 15.0">
- <rect x="0.5" y="0.5" width="20.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 18.0">
+ <rect x="0.5" y="0.5" width="21.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x1_z16.svg b/symbols/shields/tertiary_2x1_z16.svg
index e28b685..c2ab4cf 100644
--- a/symbols/shields/tertiary_2x1_z16.svg
+++ b/symbols/shields/tertiary_2x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 16.0">
- <rect x="0.5" y="0.5" width="21.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 20.0">
+ <rect x="0.5" y="0.5" width="21.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x1_z18.svg b/symbols/shields/tertiary_2x1_z18.svg
index aae9495..ba1a241 100644
--- a/symbols/shields/tertiary_2x1_z18.svg
+++ b/symbols/shields/tertiary_2x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 17.0">
- <rect x="0.5" y="0.5" width="23.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 21.0">
+ <rect x="0.5" y="0.5" width="22.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x2.svg b/symbols/shields/tertiary_2x2.svg
index 49c5438..5cd1b02 100644
--- a/symbols/shields/tertiary_2x2.svg
+++ b/symbols/shields/tertiary_2x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 24.0">
- <rect x="0.5" y="0.5" width="20.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 30.0">
+ <rect x="0.5" y="0.5" width="21.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x2_z16.svg b/symbols/shields/tertiary_2x2_z16.svg
index 658593e..33ea776 100644
--- a/symbols/shields/tertiary_2x2_z16.svg
+++ b/symbols/shields/tertiary_2x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 26.0">
- <rect x="0.5" y="0.5" width="21.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 34.0">
+ <rect x="0.5" y="0.5" width="21.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x2_z18.svg b/symbols/shields/tertiary_2x2_z18.svg
index 6c4d3a1..fa1106b 100644
--- a/symbols/shields/tertiary_2x2_z18.svg
+++ b/symbols/shields/tertiary_2x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 28.0">
- <rect x="0.5" y="0.5" width="23.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 36.0">
+ <rect x="0.5" y="0.5" width="22.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x3.svg b/symbols/shields/tertiary_2x3.svg
index f63dcdc..4a6d809 100644
--- a/symbols/shields/tertiary_2x3.svg
+++ b/symbols/shields/tertiary_2x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 33.0">
- <rect x="0.5" y="0.5" width="20.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 42.0">
+ <rect x="0.5" y="0.5" width="21.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x3_z16.svg b/symbols/shields/tertiary_2x3_z16.svg
index d3cceef..b896dba 100644
--- a/symbols/shields/tertiary_2x3_z16.svg
+++ b/symbols/shields/tertiary_2x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 36.0">
- <rect x="0.5" y="0.5" width="21.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 48.0">
+ <rect x="0.5" y="0.5" width="21.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x3_z18.svg b/symbols/shields/tertiary_2x3_z18.svg
index 3073649..23cec05 100644
--- a/symbols/shields/tertiary_2x3_z18.svg
+++ b/symbols/shields/tertiary_2x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 39.0">
- <rect x="0.5" y="0.5" width="23.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 51.0">
+ <rect x="0.5" y="0.5" width="22.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x4.svg b/symbols/shields/tertiary_2x4.svg
index fcc2d2a..5e952fd 100644
--- a/symbols/shields/tertiary_2x4.svg
+++ b/symbols/shields/tertiary_2x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 42.0">
- <rect x="0.5" y="0.5" width="20.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 54.0">
+ <rect x="0.5" y="0.5" width="21.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x4_z16.svg b/symbols/shields/tertiary_2x4_z16.svg
index 41f432d..25d5de3 100644
--- a/symbols/shields/tertiary_2x4_z16.svg
+++ b/symbols/shields/tertiary_2x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 46.0">
- <rect x="0.5" y="0.5" width="21.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 62.0">
+ <rect x="0.5" y="0.5" width="21.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_2x4_z18.svg b/symbols/shields/tertiary_2x4_z18.svg
index 378b557..97e7cba 100644
--- a/symbols/shields/tertiary_2x4_z18.svg
+++ b/symbols/shields/tertiary_2x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 50.0">
- <rect x="0.5" y="0.5" width="23.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 66.0">
+ <rect x="0.5" y="0.5" width="22.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x1.svg b/symbols/shields/tertiary_3x1.svg
index ccb7b4e..aa0113d 100644
--- a/symbols/shields/tertiary_3x1.svg
+++ b/symbols/shields/tertiary_3x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 15.0">
- <rect x="0.5" y="0.5" width="26.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 18.0">
+ <rect x="0.5" y="0.5" width="27.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x1_z16.svg b/symbols/shields/tertiary_3x1_z16.svg
index 678450d..6df558d 100644
--- a/symbols/shields/tertiary_3x1_z16.svg
+++ b/symbols/shields/tertiary_3x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 16.0">
- <rect x="0.5" y="0.5" width="28.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 20.0">
+ <rect x="0.5" y="0.5" width="27.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x1_z18.svg b/symbols/shields/tertiary_3x1_z18.svg
index 1508677..1b197d3 100644
--- a/symbols/shields/tertiary_3x1_z18.svg
+++ b/symbols/shields/tertiary_3x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 17.0">
- <rect x="0.5" y="0.5" width="30.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 21.0">
+ <rect x="0.5" y="0.5" width="29.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x2.svg b/symbols/shields/tertiary_3x2.svg
index 9b42efe..cc4a048 100644
--- a/symbols/shields/tertiary_3x2.svg
+++ b/symbols/shields/tertiary_3x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 24.0">
- <rect x="0.5" y="0.5" width="26.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 30.0">
+ <rect x="0.5" y="0.5" width="27.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x2_z16.svg b/symbols/shields/tertiary_3x2_z16.svg
index dd851d9..9ca7171 100644
--- a/symbols/shields/tertiary_3x2_z16.svg
+++ b/symbols/shields/tertiary_3x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 26.0">
- <rect x="0.5" y="0.5" width="28.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 34.0">
+ <rect x="0.5" y="0.5" width="27.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x2_z18.svg b/symbols/shields/tertiary_3x2_z18.svg
index 5f41be3..f498be7 100644
--- a/symbols/shields/tertiary_3x2_z18.svg
+++ b/symbols/shields/tertiary_3x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 28.0">
- <rect x="0.5" y="0.5" width="30.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 36.0">
+ <rect x="0.5" y="0.5" width="29.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x3.svg b/symbols/shields/tertiary_3x3.svg
index bad8e66..e903850 100644
--- a/symbols/shields/tertiary_3x3.svg
+++ b/symbols/shields/tertiary_3x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 33.0">
- <rect x="0.5" y="0.5" width="26.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 42.0">
+ <rect x="0.5" y="0.5" width="27.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x3_z16.svg b/symbols/shields/tertiary_3x3_z16.svg
index 77098ba..8d175bd 100644
--- a/symbols/shields/tertiary_3x3_z16.svg
+++ b/symbols/shields/tertiary_3x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 36.0">
- <rect x="0.5" y="0.5" width="28.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 48.0">
+ <rect x="0.5" y="0.5" width="27.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x3_z18.svg b/symbols/shields/tertiary_3x3_z18.svg
index 9bb32fe..0790f6f 100644
--- a/symbols/shields/tertiary_3x3_z18.svg
+++ b/symbols/shields/tertiary_3x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 39.0">
- <rect x="0.5" y="0.5" width="30.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 51.0">
+ <rect x="0.5" y="0.5" width="29.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x4.svg b/symbols/shields/tertiary_3x4.svg
index d3dc923..cb4bc47 100644
--- a/symbols/shields/tertiary_3x4.svg
+++ b/symbols/shields/tertiary_3x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 42.0">
- <rect x="0.5" y="0.5" width="26.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 54.0">
+ <rect x="0.5" y="0.5" width="27.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x4_z16.svg b/symbols/shields/tertiary_3x4_z16.svg
index 1d94c13..875439f 100644
--- a/symbols/shields/tertiary_3x4_z16.svg
+++ b/symbols/shields/tertiary_3x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 46.0">
- <rect x="0.5" y="0.5" width="28.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 62.0">
+ <rect x="0.5" y="0.5" width="27.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_3x4_z18.svg b/symbols/shields/tertiary_3x4_z18.svg
index ff51439..6216dfd 100644
--- a/symbols/shields/tertiary_3x4_z18.svg
+++ b/symbols/shields/tertiary_3x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 50.0">
- <rect x="0.5" y="0.5" width="30.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 66.0">
+ <rect x="0.5" y="0.5" width="29.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x1.svg b/symbols/shields/tertiary_4x1.svg
index d59813f..8794c8e 100644
--- a/symbols/shields/tertiary_4x1.svg
+++ b/symbols/shields/tertiary_4x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 15.0">
- <rect x="0.5" y="0.5" width="32.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 18.0">
+ <rect x="0.5" y="0.5" width="33.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x1_z16.svg b/symbols/shields/tertiary_4x1_z16.svg
index 52634b1..75e1ec4 100644
--- a/symbols/shields/tertiary_4x1_z16.svg
+++ b/symbols/shields/tertiary_4x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 16.0">
- <rect x="0.5" y="0.5" width="34.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 20.0">
+ <rect x="0.5" y="0.5" width="33.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x1_z18.svg b/symbols/shields/tertiary_4x1_z18.svg
index f6ec547..8390a4f 100644
--- a/symbols/shields/tertiary_4x1_z18.svg
+++ b/symbols/shields/tertiary_4x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 17.0">
- <rect x="0.5" y="0.5" width="37.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 21.0">
+ <rect x="0.5" y="0.5" width="36.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x2.svg b/symbols/shields/tertiary_4x2.svg
index dab5990..c185cef 100644
--- a/symbols/shields/tertiary_4x2.svg
+++ b/symbols/shields/tertiary_4x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 24.0">
- <rect x="0.5" y="0.5" width="32.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 30.0">
+ <rect x="0.5" y="0.5" width="33.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x2_z16.svg b/symbols/shields/tertiary_4x2_z16.svg
index 99c6ee0..f9f1b58 100644
--- a/symbols/shields/tertiary_4x2_z16.svg
+++ b/symbols/shields/tertiary_4x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 26.0">
- <rect x="0.5" y="0.5" width="34.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 34.0">
+ <rect x="0.5" y="0.5" width="33.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x2_z18.svg b/symbols/shields/tertiary_4x2_z18.svg
index e31d33f..e3f3df6 100644
--- a/symbols/shields/tertiary_4x2_z18.svg
+++ b/symbols/shields/tertiary_4x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 28.0">
- <rect x="0.5" y="0.5" width="37.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 36.0">
+ <rect x="0.5" y="0.5" width="36.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x3.svg b/symbols/shields/tertiary_4x3.svg
index 107a98d..00d9959 100644
--- a/symbols/shields/tertiary_4x3.svg
+++ b/symbols/shields/tertiary_4x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 33.0">
- <rect x="0.5" y="0.5" width="32.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 42.0">
+ <rect x="0.5" y="0.5" width="33.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x3_z16.svg b/symbols/shields/tertiary_4x3_z16.svg
index 339167e..b61a199 100644
--- a/symbols/shields/tertiary_4x3_z16.svg
+++ b/symbols/shields/tertiary_4x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 36.0">
- <rect x="0.5" y="0.5" width="34.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 48.0">
+ <rect x="0.5" y="0.5" width="33.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x3_z18.svg b/symbols/shields/tertiary_4x3_z18.svg
index 168431b..41bf686 100644
--- a/symbols/shields/tertiary_4x3_z18.svg
+++ b/symbols/shields/tertiary_4x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 39.0">
- <rect x="0.5" y="0.5" width="37.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 51.0">
+ <rect x="0.5" y="0.5" width="36.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x4.svg b/symbols/shields/tertiary_4x4.svg
index 379129f..dd39ef5 100644
--- a/symbols/shields/tertiary_4x4.svg
+++ b/symbols/shields/tertiary_4x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 42.0">
- <rect x="0.5" y="0.5" width="32.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 54.0">
+ <rect x="0.5" y="0.5" width="33.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x4_z16.svg b/symbols/shields/tertiary_4x4_z16.svg
index ae0da51..ed112e9 100644
--- a/symbols/shields/tertiary_4x4_z16.svg
+++ b/symbols/shields/tertiary_4x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 46.0">
- <rect x="0.5" y="0.5" width="34.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 62.0">
+ <rect x="0.5" y="0.5" width="33.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_4x4_z18.svg b/symbols/shields/tertiary_4x4_z18.svg
index 62ba2b7..1fb78e8 100644
--- a/symbols/shields/tertiary_4x4_z18.svg
+++ b/symbols/shields/tertiary_4x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 50.0">
- <rect x="0.5" y="0.5" width="37.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 66.0">
+ <rect x="0.5" y="0.5" width="36.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x1.svg b/symbols/shields/tertiary_5x1.svg
index b07a178..5d494bf 100644
--- a/symbols/shields/tertiary_5x1.svg
+++ b/symbols/shields/tertiary_5x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 15.0">
- <rect x="0.5" y="0.5" width="38.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 18.0">
+ <rect x="0.5" y="0.5" width="39.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x1_z16.svg b/symbols/shields/tertiary_5x1_z16.svg
index e6379ba..2b83d09 100644
--- a/symbols/shields/tertiary_5x1_z16.svg
+++ b/symbols/shields/tertiary_5x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 16.0">
- <rect x="0.5" y="0.5" width="41.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 20.0">
+ <rect x="0.5" y="0.5" width="39.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x1_z18.svg b/symbols/shields/tertiary_5x1_z18.svg
index 2060b31..c832dcd 100644
--- a/symbols/shields/tertiary_5x1_z18.svg
+++ b/symbols/shields/tertiary_5x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 17.0">
- <rect x="0.5" y="0.5" width="44.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 21.0">
+ <rect x="0.5" y="0.5" width="43.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x2.svg b/symbols/shields/tertiary_5x2.svg
index 0198a09..55ee3d7 100644
--- a/symbols/shields/tertiary_5x2.svg
+++ b/symbols/shields/tertiary_5x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 24.0">
- <rect x="0.5" y="0.5" width="38.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 30.0">
+ <rect x="0.5" y="0.5" width="39.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x2_z16.svg b/symbols/shields/tertiary_5x2_z16.svg
index 5f040b6..a6e6d71 100644
--- a/symbols/shields/tertiary_5x2_z16.svg
+++ b/symbols/shields/tertiary_5x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 26.0">
- <rect x="0.5" y="0.5" width="41.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 34.0">
+ <rect x="0.5" y="0.5" width="39.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x2_z18.svg b/symbols/shields/tertiary_5x2_z18.svg
index dc5bd0f..7776025 100644
--- a/symbols/shields/tertiary_5x2_z18.svg
+++ b/symbols/shields/tertiary_5x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 28.0">
- <rect x="0.5" y="0.5" width="44.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 36.0">
+ <rect x="0.5" y="0.5" width="43.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x3.svg b/symbols/shields/tertiary_5x3.svg
index 7e43dbd..f8fa344 100644
--- a/symbols/shields/tertiary_5x3.svg
+++ b/symbols/shields/tertiary_5x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 33.0">
- <rect x="0.5" y="0.5" width="38.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 42.0">
+ <rect x="0.5" y="0.5" width="39.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x3_z16.svg b/symbols/shields/tertiary_5x3_z16.svg
index c12efa4..cef1356 100644
--- a/symbols/shields/tertiary_5x3_z16.svg
+++ b/symbols/shields/tertiary_5x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 36.0">
- <rect x="0.5" y="0.5" width="41.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 48.0">
+ <rect x="0.5" y="0.5" width="39.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x3_z18.svg b/symbols/shields/tertiary_5x3_z18.svg
index 1910280..0fcab6b 100644
--- a/symbols/shields/tertiary_5x3_z18.svg
+++ b/symbols/shields/tertiary_5x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 39.0">
- <rect x="0.5" y="0.5" width="44.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 51.0">
+ <rect x="0.5" y="0.5" width="43.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x4.svg b/symbols/shields/tertiary_5x4.svg
index 632d2ab..51805da 100644
--- a/symbols/shields/tertiary_5x4.svg
+++ b/symbols/shields/tertiary_5x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 42.0">
- <rect x="0.5" y="0.5" width="38.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 54.0">
+ <rect x="0.5" y="0.5" width="39.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x4_z16.svg b/symbols/shields/tertiary_5x4_z16.svg
index 93b4a72..741c5dc 100644
--- a/symbols/shields/tertiary_5x4_z16.svg
+++ b/symbols/shields/tertiary_5x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 46.0">
- <rect x="0.5" y="0.5" width="41.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 62.0">
+ <rect x="0.5" y="0.5" width="39.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_5x4_z18.svg b/symbols/shields/tertiary_5x4_z18.svg
index bf146c4..5773499 100644
--- a/symbols/shields/tertiary_5x4_z18.svg
+++ b/symbols/shields/tertiary_5x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 50.0">
- <rect x="0.5" y="0.5" width="44.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 66.0">
+ <rect x="0.5" y="0.5" width="43.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x1.svg b/symbols/shields/tertiary_6x1.svg
index e4a9472..06f783a 100644
--- a/symbols/shields/tertiary_6x1.svg
+++ b/symbols/shields/tertiary_6x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 15.0">
- <rect x="0.5" y="0.5" width="44.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 18.0">
+ <rect x="0.5" y="0.5" width="46.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x1_z16.svg b/symbols/shields/tertiary_6x1_z16.svg
index 55b4469..16320f8 100644
--- a/symbols/shields/tertiary_6x1_z16.svg
+++ b/symbols/shields/tertiary_6x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 16.0">
- <rect x="0.5" y="0.5" width="47.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 20.0">
+ <rect x="0.5" y="0.5" width="45.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x1_z18.svg b/symbols/shields/tertiary_6x1_z18.svg
index 38681f3..0f8bd35 100644
--- a/symbols/shields/tertiary_6x1_z18.svg
+++ b/symbols/shields/tertiary_6x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 17.0">
- <rect x="0.5" y="0.5" width="52.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 21.0">
+ <rect x="0.5" y="0.5" width="50.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x2.svg b/symbols/shields/tertiary_6x2.svg
index f484aa3..7e824fd 100644
--- a/symbols/shields/tertiary_6x2.svg
+++ b/symbols/shields/tertiary_6x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 24.0">
- <rect x="0.5" y="0.5" width="44.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 30.0">
+ <rect x="0.5" y="0.5" width="46.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x2_z16.svg b/symbols/shields/tertiary_6x2_z16.svg
index 7b382df..9775b9b 100644
--- a/symbols/shields/tertiary_6x2_z16.svg
+++ b/symbols/shields/tertiary_6x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 26.0">
- <rect x="0.5" y="0.5" width="47.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 34.0">
+ <rect x="0.5" y="0.5" width="45.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x2_z18.svg b/symbols/shields/tertiary_6x2_z18.svg
index 7c79bc6..f276f4d 100644
--- a/symbols/shields/tertiary_6x2_z18.svg
+++ b/symbols/shields/tertiary_6x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 28.0">
- <rect x="0.5" y="0.5" width="52.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 36.0">
+ <rect x="0.5" y="0.5" width="50.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x3.svg b/symbols/shields/tertiary_6x3.svg
index d703c21..bf87577 100644
--- a/symbols/shields/tertiary_6x3.svg
+++ b/symbols/shields/tertiary_6x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 33.0">
- <rect x="0.5" y="0.5" width="44.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 42.0">
+ <rect x="0.5" y="0.5" width="46.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x3_z16.svg b/symbols/shields/tertiary_6x3_z16.svg
index b7d03f1..7fd0b7d 100644
--- a/symbols/shields/tertiary_6x3_z16.svg
+++ b/symbols/shields/tertiary_6x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 36.0">
- <rect x="0.5" y="0.5" width="47.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 48.0">
+ <rect x="0.5" y="0.5" width="45.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x3_z18.svg b/symbols/shields/tertiary_6x3_z18.svg
index e96eff6..5c4fefc 100644
--- a/symbols/shields/tertiary_6x3_z18.svg
+++ b/symbols/shields/tertiary_6x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 39.0">
- <rect x="0.5" y="0.5" width="52.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 51.0">
+ <rect x="0.5" y="0.5" width="50.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x4.svg b/symbols/shields/tertiary_6x4.svg
index d6acb7d..d76bc6f 100644
--- a/symbols/shields/tertiary_6x4.svg
+++ b/symbols/shields/tertiary_6x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 42.0">
- <rect x="0.5" y="0.5" width="44.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 54.0">
+ <rect x="0.5" y="0.5" width="46.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x4_z16.svg b/symbols/shields/tertiary_6x4_z16.svg
index 464116f..25a38d7 100644
--- a/symbols/shields/tertiary_6x4_z16.svg
+++ b/symbols/shields/tertiary_6x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 46.0">
- <rect x="0.5" y="0.5" width="47.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 62.0">
+ <rect x="0.5" y="0.5" width="45.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_6x4_z18.svg b/symbols/shields/tertiary_6x4_z18.svg
index 48316ed..0c30899 100644
--- a/symbols/shields/tertiary_6x4_z18.svg
+++ b/symbols/shields/tertiary_6x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 50.0">
- <rect x="0.5" y="0.5" width="52.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 66.0">
+ <rect x="0.5" y="0.5" width="50.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x1.svg b/symbols/shields/tertiary_7x1.svg
index e21edba..60d4b99 100644
--- a/symbols/shields/tertiary_7x1.svg
+++ b/symbols/shields/tertiary_7x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 15.0">
- <rect x="0.5" y="0.5" width="50.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 18.0">
+ <rect x="0.5" y="0.5" width="52.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x1_z16.svg b/symbols/shields/tertiary_7x1_z16.svg
index cdf05f9..1e7943b 100644
--- a/symbols/shields/tertiary_7x1_z16.svg
+++ b/symbols/shields/tertiary_7x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 16.0">
- <rect x="0.5" y="0.5" width="54.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 20.0">
+ <rect x="0.5" y="0.5" width="51.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x1_z18.svg b/symbols/shields/tertiary_7x1_z18.svg
index ac38aa9..856844f 100644
--- a/symbols/shields/tertiary_7x1_z18.svg
+++ b/symbols/shields/tertiary_7x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 17.0">
- <rect x="0.5" y="0.5" width="59.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 21.0">
+ <rect x="0.5" y="0.5" width="57.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x2.svg b/symbols/shields/tertiary_7x2.svg
index 6eba0ee..7ba2317 100644
--- a/symbols/shields/tertiary_7x2.svg
+++ b/symbols/shields/tertiary_7x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 24.0">
- <rect x="0.5" y="0.5" width="50.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 30.0">
+ <rect x="0.5" y="0.5" width="52.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x2_z16.svg b/symbols/shields/tertiary_7x2_z16.svg
index fba86e6..222b56d 100644
--- a/symbols/shields/tertiary_7x2_z16.svg
+++ b/symbols/shields/tertiary_7x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 26.0">
- <rect x="0.5" y="0.5" width="54.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 34.0">
+ <rect x="0.5" y="0.5" width="51.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x2_z18.svg b/symbols/shields/tertiary_7x2_z18.svg
index e024c23..318aefe 100644
--- a/symbols/shields/tertiary_7x2_z18.svg
+++ b/symbols/shields/tertiary_7x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 28.0">
- <rect x="0.5" y="0.5" width="59.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 36.0">
+ <rect x="0.5" y="0.5" width="57.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x3.svg b/symbols/shields/tertiary_7x3.svg
index 43e62c6..f983bb6 100644
--- a/symbols/shields/tertiary_7x3.svg
+++ b/symbols/shields/tertiary_7x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 33.0">
- <rect x="0.5" y="0.5" width="50.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 42.0">
+ <rect x="0.5" y="0.5" width="52.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x3_z16.svg b/symbols/shields/tertiary_7x3_z16.svg
index f2eb53f..6092869 100644
--- a/symbols/shields/tertiary_7x3_z16.svg
+++ b/symbols/shields/tertiary_7x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 36.0">
- <rect x="0.5" y="0.5" width="54.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 48.0">
+ <rect x="0.5" y="0.5" width="51.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x3_z18.svg b/symbols/shields/tertiary_7x3_z18.svg
index 8e5f6d1..1407c8f 100644
--- a/symbols/shields/tertiary_7x3_z18.svg
+++ b/symbols/shields/tertiary_7x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 39.0">
- <rect x="0.5" y="0.5" width="59.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 51.0">
+ <rect x="0.5" y="0.5" width="57.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x4.svg b/symbols/shields/tertiary_7x4.svg
index 32312f5..7938b1b 100644
--- a/symbols/shields/tertiary_7x4.svg
+++ b/symbols/shields/tertiary_7x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 42.0">
- <rect x="0.5" y="0.5" width="50.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 54.0">
+ <rect x="0.5" y="0.5" width="52.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x4_z16.svg b/symbols/shields/tertiary_7x4_z16.svg
index c97febf..5105742 100644
--- a/symbols/shields/tertiary_7x4_z16.svg
+++ b/symbols/shields/tertiary_7x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 46.0">
- <rect x="0.5" y="0.5" width="54.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 62.0">
+ <rect x="0.5" y="0.5" width="51.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_7x4_z18.svg b/symbols/shields/tertiary_7x4_z18.svg
index bab1772..6c46d8c 100644
--- a/symbols/shields/tertiary_7x4_z18.svg
+++ b/symbols/shields/tertiary_7x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 50.0">
- <rect x="0.5" y="0.5" width="59.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 66.0">
+ <rect x="0.5" y="0.5" width="57.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x1.svg b/symbols/shields/tertiary_8x1.svg
index 96bc71a..f7338d8 100644
--- a/symbols/shields/tertiary_8x1.svg
+++ b/symbols/shields/tertiary_8x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 15.0">
- <rect x="0.5" y="0.5" width="56.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 18.0">
+ <rect x="0.5" y="0.5" width="58.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x1_z16.svg b/symbols/shields/tertiary_8x1_z16.svg
index c25ddad..48d5a16 100644
--- a/symbols/shields/tertiary_8x1_z16.svg
+++ b/symbols/shields/tertiary_8x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 16.0">
- <rect x="0.5" y="0.5" width="60.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 20.0">
+ <rect x="0.5" y="0.5" width="57.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x1_z18.svg b/symbols/shields/tertiary_8x1_z18.svg
index 9b416bf..cc2be0f 100644
--- a/symbols/shields/tertiary_8x1_z18.svg
+++ b/symbols/shields/tertiary_8x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 17.0">
- <rect x="0.5" y="0.5" width="66.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 21.0">
+ <rect x="0.5" y="0.5" width="64.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x2.svg b/symbols/shields/tertiary_8x2.svg
index 467586c..9658e10 100644
--- a/symbols/shields/tertiary_8x2.svg
+++ b/symbols/shields/tertiary_8x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 24.0">
- <rect x="0.5" y="0.5" width="56.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 30.0">
+ <rect x="0.5" y="0.5" width="58.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x2_z16.svg b/symbols/shields/tertiary_8x2_z16.svg
index d8d4125..6c4b4cf 100644
--- a/symbols/shields/tertiary_8x2_z16.svg
+++ b/symbols/shields/tertiary_8x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 26.0">
- <rect x="0.5" y="0.5" width="60.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 34.0">
+ <rect x="0.5" y="0.5" width="57.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x2_z18.svg b/symbols/shields/tertiary_8x2_z18.svg
index 78bede5..3a0d66e 100644
--- a/symbols/shields/tertiary_8x2_z18.svg
+++ b/symbols/shields/tertiary_8x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 28.0">
- <rect x="0.5" y="0.5" width="66.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 36.0">
+ <rect x="0.5" y="0.5" width="64.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x3.svg b/symbols/shields/tertiary_8x3.svg
index 9b96750..debd6a9 100644
--- a/symbols/shields/tertiary_8x3.svg
+++ b/symbols/shields/tertiary_8x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 33.0">
- <rect x="0.5" y="0.5" width="56.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 42.0">
+ <rect x="0.5" y="0.5" width="58.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x3_z16.svg b/symbols/shields/tertiary_8x3_z16.svg
index d577fec..4b1c7bd 100644
--- a/symbols/shields/tertiary_8x3_z16.svg
+++ b/symbols/shields/tertiary_8x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 36.0">
- <rect x="0.5" y="0.5" width="60.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 48.0">
+ <rect x="0.5" y="0.5" width="57.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x3_z18.svg b/symbols/shields/tertiary_8x3_z18.svg
index 12d0c35..aa37aa6 100644
--- a/symbols/shields/tertiary_8x3_z18.svg
+++ b/symbols/shields/tertiary_8x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 39.0">
- <rect x="0.5" y="0.5" width="66.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 51.0">
+ <rect x="0.5" y="0.5" width="64.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x4.svg b/symbols/shields/tertiary_8x4.svg
index 9f6189f..89cf40d 100644
--- a/symbols/shields/tertiary_8x4.svg
+++ b/symbols/shields/tertiary_8x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 42.0">
- <rect x="0.5" y="0.5" width="56.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 54.0">
+ <rect x="0.5" y="0.5" width="58.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x4_z16.svg b/symbols/shields/tertiary_8x4_z16.svg
index 99aed6b..6a8a878 100644
--- a/symbols/shields/tertiary_8x4_z16.svg
+++ b/symbols/shields/tertiary_8x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 46.0">
- <rect x="0.5" y="0.5" width="60.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 62.0">
+ <rect x="0.5" y="0.5" width="57.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_8x4_z18.svg b/symbols/shields/tertiary_8x4_z18.svg
index f98208e..c032633 100644
--- a/symbols/shields/tertiary_8x4_z18.svg
+++ b/symbols/shields/tertiary_8x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 50.0">
- <rect x="0.5" y="0.5" width="66.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 66.0">
+ <rect x="0.5" y="0.5" width="64.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x1.svg b/symbols/shields/tertiary_9x1.svg
index 5c275b3..aedd583 100644
--- a/symbols/shields/tertiary_9x1.svg
+++ b/symbols/shields/tertiary_9x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 15.0">
- <rect x="0.5" y="0.5" width="62.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 18.0">
+ <rect x="0.5" y="0.5" width="64.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x1_z16.svg b/symbols/shields/tertiary_9x1_z16.svg
index b1fba21..cdf2162 100644
--- a/symbols/shields/tertiary_9x1_z16.svg
+++ b/symbols/shields/tertiary_9x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 16.0">
- <rect x="0.5" y="0.5" width="67.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 20.0">
+ <rect x="0.5" y="0.5" width="63.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x1_z18.svg b/symbols/shields/tertiary_9x1_z18.svg
index 7eac6cb..b0f76ef 100644
--- a/symbols/shields/tertiary_9x1_z18.svg
+++ b/symbols/shields/tertiary_9x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 17.0">
- <rect x="0.5" y="0.5" width="73.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 21.0">
+ <rect x="0.5" y="0.5" width="71.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x2.svg b/symbols/shields/tertiary_9x2.svg
index 93df955..136a755 100644
--- a/symbols/shields/tertiary_9x2.svg
+++ b/symbols/shields/tertiary_9x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 24.0">
- <rect x="0.5" y="0.5" width="62.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 30.0">
+ <rect x="0.5" y="0.5" width="64.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x2_z16.svg b/symbols/shields/tertiary_9x2_z16.svg
index bbdda89..a8910ed 100644
--- a/symbols/shields/tertiary_9x2_z16.svg
+++ b/symbols/shields/tertiary_9x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 26.0">
- <rect x="0.5" y="0.5" width="67.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 34.0">
+ <rect x="0.5" y="0.5" width="63.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x2_z18.svg b/symbols/shields/tertiary_9x2_z18.svg
index c22afed..8350e56 100644
--- a/symbols/shields/tertiary_9x2_z18.svg
+++ b/symbols/shields/tertiary_9x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 28.0">
- <rect x="0.5" y="0.5" width="73.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 36.0">
+ <rect x="0.5" y="0.5" width="71.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x3.svg b/symbols/shields/tertiary_9x3.svg
index 82a0a4e..9c6a34b 100644
--- a/symbols/shields/tertiary_9x3.svg
+++ b/symbols/shields/tertiary_9x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 33.0">
- <rect x="0.5" y="0.5" width="62.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 42.0">
+ <rect x="0.5" y="0.5" width="64.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x3_z16.svg b/symbols/shields/tertiary_9x3_z16.svg
index 4f5c06c..327a62f 100644
--- a/symbols/shields/tertiary_9x3_z16.svg
+++ b/symbols/shields/tertiary_9x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 36.0">
- <rect x="0.5" y="0.5" width="67.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 48.0">
+ <rect x="0.5" y="0.5" width="63.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x3_z18.svg b/symbols/shields/tertiary_9x3_z18.svg
index 6e2d753..fcb19ed 100644
--- a/symbols/shields/tertiary_9x3_z18.svg
+++ b/symbols/shields/tertiary_9x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 39.0">
- <rect x="0.5" y="0.5" width="73.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 51.0">
+ <rect x="0.5" y="0.5" width="71.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x4.svg b/symbols/shields/tertiary_9x4.svg
index d522ff1..5e8bd59 100644
--- a/symbols/shields/tertiary_9x4.svg
+++ b/symbols/shields/tertiary_9x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 42.0">
- <rect x="0.5" y="0.5" width="62.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 54.0">
+ <rect x="0.5" y="0.5" width="64.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x4_z16.svg b/symbols/shields/tertiary_9x4_z16.svg
index 1401c16..6dab483 100644
--- a/symbols/shields/tertiary_9x4_z16.svg
+++ b/symbols/shields/tertiary_9x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 46.0">
- <rect x="0.5" y="0.5" width="67.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 62.0">
+ <rect x="0.5" y="0.5" width="63.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/tertiary_9x4_z18.svg b/symbols/shields/tertiary_9x4_z18.svg
index a0eb960..dfdc2d8 100644
--- a/symbols/shields/tertiary_9x4_z18.svg
+++ b/symbols/shields/tertiary_9x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 50.0">
- <rect x="0.5" y="0.5" width="73.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 66.0">
+ <rect x="0.5" y="0.5" width="71.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f1f1f1;stroke:#c6c6c6;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x1.svg b/symbols/shields/trunk_10x1.svg
index d62a87b..6078d1f 100644
--- a/symbols/shields/trunk_10x1.svg
+++ b/symbols/shields/trunk_10x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 15.0">
- <rect x="0.5" y="0.5" width="67.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 18.0">
+ <rect x="0.5" y="0.5" width="70.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x1_z16.svg b/symbols/shields/trunk_10x1_z16.svg
index c7c0805..b727de6 100644
--- a/symbols/shields/trunk_10x1_z16.svg
+++ b/symbols/shields/trunk_10x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 16.0">
- <rect x="0.5" y="0.5" width="73.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 20.0">
+ <rect x="0.5" y="0.5" width="69.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x1_z18.svg b/symbols/shields/trunk_10x1_z18.svg
index 8ecad29..bfa93cd 100644
--- a/symbols/shields/trunk_10x1_z18.svg
+++ b/symbols/shields/trunk_10x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 17.0">
- <rect x="0.5" y="0.5" width="80.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 21.0">
+ <rect x="0.5" y="0.5" width="77.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x2.svg b/symbols/shields/trunk_10x2.svg
index efe0289..cc185c6 100644
--- a/symbols/shields/trunk_10x2.svg
+++ b/symbols/shields/trunk_10x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 24.0">
- <rect x="0.5" y="0.5" width="67.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 30.0">
+ <rect x="0.5" y="0.5" width="70.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x2_z16.svg b/symbols/shields/trunk_10x2_z16.svg
index e27e149..d645b22 100644
--- a/symbols/shields/trunk_10x2_z16.svg
+++ b/symbols/shields/trunk_10x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 26.0">
- <rect x="0.5" y="0.5" width="73.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 34.0">
+ <rect x="0.5" y="0.5" width="69.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x2_z18.svg b/symbols/shields/trunk_10x2_z18.svg
index 49901b5..4e22df1 100644
--- a/symbols/shields/trunk_10x2_z18.svg
+++ b/symbols/shields/trunk_10x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 28.0">
- <rect x="0.5" y="0.5" width="80.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 36.0">
+ <rect x="0.5" y="0.5" width="77.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x3.svg b/symbols/shields/trunk_10x3.svg
index 964c7c2..5f1d8bc 100644
--- a/symbols/shields/trunk_10x3.svg
+++ b/symbols/shields/trunk_10x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 33.0">
- <rect x="0.5" y="0.5" width="67.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 42.0">
+ <rect x="0.5" y="0.5" width="70.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x3_z16.svg b/symbols/shields/trunk_10x3_z16.svg
index ccb4a37..cd9a1cd 100644
--- a/symbols/shields/trunk_10x3_z16.svg
+++ b/symbols/shields/trunk_10x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 36.0">
- <rect x="0.5" y="0.5" width="73.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 48.0">
+ <rect x="0.5" y="0.5" width="69.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x3_z18.svg b/symbols/shields/trunk_10x3_z18.svg
index 4f7750e..aca646d 100644
--- a/symbols/shields/trunk_10x3_z18.svg
+++ b/symbols/shields/trunk_10x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 39.0">
- <rect x="0.5" y="0.5" width="80.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 51.0">
+ <rect x="0.5" y="0.5" width="77.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x4.svg b/symbols/shields/trunk_10x4.svg
index ea47655..a91f4e5 100644
--- a/symbols/shields/trunk_10x4.svg
+++ b/symbols/shields/trunk_10x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 42.0">
- <rect x="0.5" y="0.5" width="67.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 71.0 54.0">
+ <rect x="0.5" y="0.5" width="70.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x4_z16.svg b/symbols/shields/trunk_10x4_z16.svg
index 1f17ffe..f426ab2 100644
--- a/symbols/shields/trunk_10x4_z16.svg
+++ b/symbols/shields/trunk_10x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 46.0">
- <rect x="0.5" y="0.5" width="73.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 70.0 62.0">
+ <rect x="0.5" y="0.5" width="69.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_10x4_z18.svg b/symbols/shields/trunk_10x4_z18.svg
index aaa39db..243ace0 100644
--- a/symbols/shields/trunk_10x4_z18.svg
+++ b/symbols/shields/trunk_10x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 50.0">
- <rect x="0.5" y="0.5" width="80.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 66.0">
+ <rect x="0.5" y="0.5" width="77.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x1.svg b/symbols/shields/trunk_11x1.svg
index d1c1f6a..28f7287 100644
--- a/symbols/shields/trunk_11x1.svg
+++ b/symbols/shields/trunk_11x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 15.0">
- <rect x="0.5" y="0.5" width="73.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 18.0">
+ <rect x="0.5" y="0.5" width="77.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x1_z16.svg b/symbols/shields/trunk_11x1_z16.svg
index 80fe054..56c3876 100644
--- a/symbols/shields/trunk_11x1_z16.svg
+++ b/symbols/shields/trunk_11x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 16.0">
- <rect x="0.5" y="0.5" width="80.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 20.0">
+ <rect x="0.5" y="0.5" width="76.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x1_z18.svg b/symbols/shields/trunk_11x1_z18.svg
index 3d06f45..5cea566 100644
--- a/symbols/shields/trunk_11x1_z18.svg
+++ b/symbols/shields/trunk_11x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 17.0">
- <rect x="0.5" y="0.5" width="88.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 21.0">
+ <rect x="0.5" y="0.5" width="84.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x2.svg b/symbols/shields/trunk_11x2.svg
index a6c1e39..4f9edd5 100644
--- a/symbols/shields/trunk_11x2.svg
+++ b/symbols/shields/trunk_11x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 24.0">
- <rect x="0.5" y="0.5" width="73.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 30.0">
+ <rect x="0.5" y="0.5" width="77.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x2_z16.svg b/symbols/shields/trunk_11x2_z16.svg
index eaf6477..a1229f3 100644
--- a/symbols/shields/trunk_11x2_z16.svg
+++ b/symbols/shields/trunk_11x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 26.0">
- <rect x="0.5" y="0.5" width="80.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 34.0">
+ <rect x="0.5" y="0.5" width="76.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x2_z18.svg b/symbols/shields/trunk_11x2_z18.svg
index e18b4fe..6be928b 100644
--- a/symbols/shields/trunk_11x2_z18.svg
+++ b/symbols/shields/trunk_11x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 28.0">
- <rect x="0.5" y="0.5" width="88.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 36.0">
+ <rect x="0.5" y="0.5" width="84.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x3.svg b/symbols/shields/trunk_11x3.svg
index 4b3af5a..a309754 100644
--- a/symbols/shields/trunk_11x3.svg
+++ b/symbols/shields/trunk_11x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 33.0">
- <rect x="0.5" y="0.5" width="73.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 42.0">
+ <rect x="0.5" y="0.5" width="77.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x3_z16.svg b/symbols/shields/trunk_11x3_z16.svg
index bf4c2c6..be63dbc 100644
--- a/symbols/shields/trunk_11x3_z16.svg
+++ b/symbols/shields/trunk_11x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 36.0">
- <rect x="0.5" y="0.5" width="80.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 48.0">
+ <rect x="0.5" y="0.5" width="76.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x3_z18.svg b/symbols/shields/trunk_11x3_z18.svg
index 123ba32..bc62ba6 100644
--- a/symbols/shields/trunk_11x3_z18.svg
+++ b/symbols/shields/trunk_11x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 39.0">
- <rect x="0.5" y="0.5" width="88.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 51.0">
+ <rect x="0.5" y="0.5" width="84.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x4.svg b/symbols/shields/trunk_11x4.svg
index f413b78..708889a 100644
--- a/symbols/shields/trunk_11x4.svg
+++ b/symbols/shields/trunk_11x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 42.0">
- <rect x="0.5" y="0.5" width="73.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 78.0 54.0">
+ <rect x="0.5" y="0.5" width="77.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x4_z16.svg b/symbols/shields/trunk_11x4_z16.svg
index 42ef2da..776b42d 100644
--- a/symbols/shields/trunk_11x4_z16.svg
+++ b/symbols/shields/trunk_11x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 81.0 46.0">
- <rect x="0.5" y="0.5" width="80.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 77.0 62.0">
+ <rect x="0.5" y="0.5" width="76.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_11x4_z18.svg b/symbols/shields/trunk_11x4_z18.svg
index 374a749..ed2ecb2 100644
--- a/symbols/shields/trunk_11x4_z18.svg
+++ b/symbols/shields/trunk_11x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 89.0 50.0">
- <rect x="0.5" y="0.5" width="88.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 85.0 66.0">
+ <rect x="0.5" y="0.5" width="84.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x1.svg b/symbols/shields/trunk_1x1.svg
index c61d47a..b86fe4b 100644
--- a/symbols/shields/trunk_1x1.svg
+++ b/symbols/shields/trunk_1x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 15.0">
- <rect x="0.5" y="0.5" width="14.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 18.0">
+ <rect x="0.5" y="0.5" width="15.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x1_z16.svg b/symbols/shields/trunk_1x1_z16.svg
index ed66a64..b2868ad 100644
--- a/symbols/shields/trunk_1x1_z16.svg
+++ b/symbols/shields/trunk_1x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 16.0">
- <rect x="0.5" y="0.5" width="15.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 20.0">
+ <rect x="0.5" y="0.5" width="15.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x1_z18.svg b/symbols/shields/trunk_1x1_z18.svg
index d139ce7..b7c8b0b 100644
--- a/symbols/shields/trunk_1x1_z18.svg
+++ b/symbols/shields/trunk_1x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 17.0">
- <rect x="0.5" y="0.5" width="16.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 21.0">
+ <rect x="0.5" y="0.5" width="15.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x2.svg b/symbols/shields/trunk_1x2.svg
index 734852c..6c2370c 100644
--- a/symbols/shields/trunk_1x2.svg
+++ b/symbols/shields/trunk_1x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 24.0">
- <rect x="0.5" y="0.5" width="14.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 30.0">
+ <rect x="0.5" y="0.5" width="15.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x2_z16.svg b/symbols/shields/trunk_1x2_z16.svg
index e44c0ea..65d43f3 100644
--- a/symbols/shields/trunk_1x2_z16.svg
+++ b/symbols/shields/trunk_1x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 26.0">
- <rect x="0.5" y="0.5" width="15.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 34.0">
+ <rect x="0.5" y="0.5" width="15.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x2_z18.svg b/symbols/shields/trunk_1x2_z18.svg
index e07cc54..219e89e 100644
--- a/symbols/shields/trunk_1x2_z18.svg
+++ b/symbols/shields/trunk_1x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 28.0">
- <rect x="0.5" y="0.5" width="16.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 36.0">
+ <rect x="0.5" y="0.5" width="15.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x3.svg b/symbols/shields/trunk_1x3.svg
index 14afc6e..e2059eb 100644
--- a/symbols/shields/trunk_1x3.svg
+++ b/symbols/shields/trunk_1x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 33.0">
- <rect x="0.5" y="0.5" width="14.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 42.0">
+ <rect x="0.5" y="0.5" width="15.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x3_z16.svg b/symbols/shields/trunk_1x3_z16.svg
index 219e89e..bc8b340 100644
--- a/symbols/shields/trunk_1x3_z16.svg
+++ b/symbols/shields/trunk_1x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 36.0">
- <rect x="0.5" y="0.5" width="15.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 48.0">
+ <rect x="0.5" y="0.5" width="15.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x3_z18.svg b/symbols/shields/trunk_1x3_z18.svg
index 2ad666c..d03f0dc 100644
--- a/symbols/shields/trunk_1x3_z18.svg
+++ b/symbols/shields/trunk_1x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 39.0">
- <rect x="0.5" y="0.5" width="16.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 51.0">
+ <rect x="0.5" y="0.5" width="15.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x4.svg b/symbols/shields/trunk_1x4.svg
index 4c81714..081991e 100644
--- a/symbols/shields/trunk_1x4.svg
+++ b/symbols/shields/trunk_1x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 15.0 42.0">
- <rect x="0.5" y="0.5" width="14.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 54.0">
+ <rect x="0.5" y="0.5" width="15.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x4_z16.svg b/symbols/shields/trunk_1x4_z16.svg
index bf3d610..d2feef1 100644
--- a/symbols/shields/trunk_1x4_z16.svg
+++ b/symbols/shields/trunk_1x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 46.0">
- <rect x="0.5" y="0.5" width="15.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 62.0">
+ <rect x="0.5" y="0.5" width="15.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_1x4_z18.svg b/symbols/shields/trunk_1x4_z18.svg
index 053f907..cfd74aa 100644
--- a/symbols/shields/trunk_1x4_z18.svg
+++ b/symbols/shields/trunk_1x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 17.0 50.0">
- <rect x="0.5" y="0.5" width="16.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16.0 66.0">
+ <rect x="0.5" y="0.5" width="15.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x1.svg b/symbols/shields/trunk_2x1.svg
index 26adeb9..5711908 100644
--- a/symbols/shields/trunk_2x1.svg
+++ b/symbols/shields/trunk_2x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 15.0">
- <rect x="0.5" y="0.5" width="20.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 18.0">
+ <rect x="0.5" y="0.5" width="21.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x1_z16.svg b/symbols/shields/trunk_2x1_z16.svg
index 10ed6df..953a09b 100644
--- a/symbols/shields/trunk_2x1_z16.svg
+++ b/symbols/shields/trunk_2x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 16.0">
- <rect x="0.5" y="0.5" width="21.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 20.0">
+ <rect x="0.5" y="0.5" width="21.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x1_z18.svg b/symbols/shields/trunk_2x1_z18.svg
index c736193..65cbfbc 100644
--- a/symbols/shields/trunk_2x1_z18.svg
+++ b/symbols/shields/trunk_2x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 17.0">
- <rect x="0.5" y="0.5" width="23.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 21.0">
+ <rect x="0.5" y="0.5" width="22.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x2.svg b/symbols/shields/trunk_2x2.svg
index 26be901..ea8b5bb 100644
--- a/symbols/shields/trunk_2x2.svg
+++ b/symbols/shields/trunk_2x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 24.0">
- <rect x="0.5" y="0.5" width="20.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 30.0">
+ <rect x="0.5" y="0.5" width="21.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x2_z16.svg b/symbols/shields/trunk_2x2_z16.svg
index 46b1ffa..6cf298c 100644
--- a/symbols/shields/trunk_2x2_z16.svg
+++ b/symbols/shields/trunk_2x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 26.0">
- <rect x="0.5" y="0.5" width="21.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 34.0">
+ <rect x="0.5" y="0.5" width="21.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x2_z18.svg b/symbols/shields/trunk_2x2_z18.svg
index bdd57fe..b91b625 100644
--- a/symbols/shields/trunk_2x2_z18.svg
+++ b/symbols/shields/trunk_2x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 28.0">
- <rect x="0.5" y="0.5" width="23.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 36.0">
+ <rect x="0.5" y="0.5" width="22.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x3.svg b/symbols/shields/trunk_2x3.svg
index 15bf28b..dcd3476 100644
--- a/symbols/shields/trunk_2x3.svg
+++ b/symbols/shields/trunk_2x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 33.0">
- <rect x="0.5" y="0.5" width="20.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 42.0">
+ <rect x="0.5" y="0.5" width="21.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x3_z16.svg b/symbols/shields/trunk_2x3_z16.svg
index 0a50562..151d042 100644
--- a/symbols/shields/trunk_2x3_z16.svg
+++ b/symbols/shields/trunk_2x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 36.0">
- <rect x="0.5" y="0.5" width="21.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 48.0">
+ <rect x="0.5" y="0.5" width="21.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x3_z18.svg b/symbols/shields/trunk_2x3_z18.svg
index bfc1935..d1632cc 100644
--- a/symbols/shields/trunk_2x3_z18.svg
+++ b/symbols/shields/trunk_2x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 39.0">
- <rect x="0.5" y="0.5" width="23.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 51.0">
+ <rect x="0.5" y="0.5" width="22.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x4.svg b/symbols/shields/trunk_2x4.svg
index ccf361b..ee0d85c 100644
--- a/symbols/shields/trunk_2x4.svg
+++ b/symbols/shields/trunk_2x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 21.0 42.0">
- <rect x="0.5" y="0.5" width="20.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 54.0">
+ <rect x="0.5" y="0.5" width="21.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x4_z16.svg b/symbols/shields/trunk_2x4_z16.svg
index 4ce6002..71af9d9 100644
--- a/symbols/shields/trunk_2x4_z16.svg
+++ b/symbols/shields/trunk_2x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 46.0">
- <rect x="0.5" y="0.5" width="21.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 22.0 62.0">
+ <rect x="0.5" y="0.5" width="21.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_2x4_z18.svg b/symbols/shields/trunk_2x4_z18.svg
index 1fdf978..aa9402e 100644
--- a/symbols/shields/trunk_2x4_z18.svg
+++ b/symbols/shields/trunk_2x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 24.0 50.0">
- <rect x="0.5" y="0.5" width="23.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 23.0 66.0">
+ <rect x="0.5" y="0.5" width="22.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x1.svg b/symbols/shields/trunk_3x1.svg
index 3165d86..6a2291f 100644
--- a/symbols/shields/trunk_3x1.svg
+++ b/symbols/shields/trunk_3x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 15.0">
- <rect x="0.5" y="0.5" width="26.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 18.0">
+ <rect x="0.5" y="0.5" width="27.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x1_z16.svg b/symbols/shields/trunk_3x1_z16.svg
index 40ae330..7c1d35e 100644
--- a/symbols/shields/trunk_3x1_z16.svg
+++ b/symbols/shields/trunk_3x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 16.0">
- <rect x="0.5" y="0.5" width="28.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 20.0">
+ <rect x="0.5" y="0.5" width="27.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x1_z18.svg b/symbols/shields/trunk_3x1_z18.svg
index 9bb6159..14a6dee 100644
--- a/symbols/shields/trunk_3x1_z18.svg
+++ b/symbols/shields/trunk_3x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 17.0">
- <rect x="0.5" y="0.5" width="30.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 21.0">
+ <rect x="0.5" y="0.5" width="29.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x2.svg b/symbols/shields/trunk_3x2.svg
index 5fa788b..ae4adbc 100644
--- a/symbols/shields/trunk_3x2.svg
+++ b/symbols/shields/trunk_3x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 24.0">
- <rect x="0.5" y="0.5" width="26.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 30.0">
+ <rect x="0.5" y="0.5" width="27.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x2_z16.svg b/symbols/shields/trunk_3x2_z16.svg
index 1741edc..4de5772 100644
--- a/symbols/shields/trunk_3x2_z16.svg
+++ b/symbols/shields/trunk_3x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 26.0">
- <rect x="0.5" y="0.5" width="28.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 34.0">
+ <rect x="0.5" y="0.5" width="27.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x2_z18.svg b/symbols/shields/trunk_3x2_z18.svg
index 78e1b3d..716044d 100644
--- a/symbols/shields/trunk_3x2_z18.svg
+++ b/symbols/shields/trunk_3x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 28.0">
- <rect x="0.5" y="0.5" width="30.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 36.0">
+ <rect x="0.5" y="0.5" width="29.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x3.svg b/symbols/shields/trunk_3x3.svg
index f982509..693e482 100644
--- a/symbols/shields/trunk_3x3.svg
+++ b/symbols/shields/trunk_3x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 33.0">
- <rect x="0.5" y="0.5" width="26.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 42.0">
+ <rect x="0.5" y="0.5" width="27.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x3_z16.svg b/symbols/shields/trunk_3x3_z16.svg
index 1b1bfa4..17dc189 100644
--- a/symbols/shields/trunk_3x3_z16.svg
+++ b/symbols/shields/trunk_3x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 36.0">
- <rect x="0.5" y="0.5" width="28.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 48.0">
+ <rect x="0.5" y="0.5" width="27.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x3_z18.svg b/symbols/shields/trunk_3x3_z18.svg
index 9640957..27429e1 100644
--- a/symbols/shields/trunk_3x3_z18.svg
+++ b/symbols/shields/trunk_3x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 39.0">
- <rect x="0.5" y="0.5" width="30.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 51.0">
+ <rect x="0.5" y="0.5" width="29.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x4.svg b/symbols/shields/trunk_3x4.svg
index d41a5a7..36553cc 100644
--- a/symbols/shields/trunk_3x4.svg
+++ b/symbols/shields/trunk_3x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 27.0 42.0">
- <rect x="0.5" y="0.5" width="26.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 54.0">
+ <rect x="0.5" y="0.5" width="27.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x4_z16.svg b/symbols/shields/trunk_3x4_z16.svg
index cfd7ea7..d38e2bc 100644
--- a/symbols/shields/trunk_3x4_z16.svg
+++ b/symbols/shields/trunk_3x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 29.0 46.0">
- <rect x="0.5" y="0.5" width="28.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 28.0 62.0">
+ <rect x="0.5" y="0.5" width="27.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_3x4_z18.svg b/symbols/shields/trunk_3x4_z18.svg
index 9174bc8..f28a2ff 100644
--- a/symbols/shields/trunk_3x4_z18.svg
+++ b/symbols/shields/trunk_3x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 31.0 50.0">
- <rect x="0.5" y="0.5" width="30.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 30.0 66.0">
+ <rect x="0.5" y="0.5" width="29.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x1.svg b/symbols/shields/trunk_4x1.svg
index 56d1004..66e310d 100644
--- a/symbols/shields/trunk_4x1.svg
+++ b/symbols/shields/trunk_4x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 15.0">
- <rect x="0.5" y="0.5" width="32.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 18.0">
+ <rect x="0.5" y="0.5" width="33.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x1_z16.svg b/symbols/shields/trunk_4x1_z16.svg
index ec014fd..fa92fca 100644
--- a/symbols/shields/trunk_4x1_z16.svg
+++ b/symbols/shields/trunk_4x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 16.0">
- <rect x="0.5" y="0.5" width="34.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 20.0">
+ <rect x="0.5" y="0.5" width="33.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x1_z18.svg b/symbols/shields/trunk_4x1_z18.svg
index 00fc6f8..1dd41d3 100644
--- a/symbols/shields/trunk_4x1_z18.svg
+++ b/symbols/shields/trunk_4x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 17.0">
- <rect x="0.5" y="0.5" width="37.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 21.0">
+ <rect x="0.5" y="0.5" width="36.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x2.svg b/symbols/shields/trunk_4x2.svg
index 0b6f466..bf6724e 100644
--- a/symbols/shields/trunk_4x2.svg
+++ b/symbols/shields/trunk_4x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 24.0">
- <rect x="0.5" y="0.5" width="32.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 30.0">
+ <rect x="0.5" y="0.5" width="33.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x2_z16.svg b/symbols/shields/trunk_4x2_z16.svg
index 4337f39..706f5ee 100644
--- a/symbols/shields/trunk_4x2_z16.svg
+++ b/symbols/shields/trunk_4x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 26.0">
- <rect x="0.5" y="0.5" width="34.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 34.0">
+ <rect x="0.5" y="0.5" width="33.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x2_z18.svg b/symbols/shields/trunk_4x2_z18.svg
index 4d3f1d0..6d4b4c8 100644
--- a/symbols/shields/trunk_4x2_z18.svg
+++ b/symbols/shields/trunk_4x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 28.0">
- <rect x="0.5" y="0.5" width="37.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 36.0">
+ <rect x="0.5" y="0.5" width="36.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x3.svg b/symbols/shields/trunk_4x3.svg
index ece5b87..3efe9d6 100644
--- a/symbols/shields/trunk_4x3.svg
+++ b/symbols/shields/trunk_4x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 33.0">
- <rect x="0.5" y="0.5" width="32.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 42.0">
+ <rect x="0.5" y="0.5" width="33.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x3_z16.svg b/symbols/shields/trunk_4x3_z16.svg
index 8f4133b..7118b87 100644
--- a/symbols/shields/trunk_4x3_z16.svg
+++ b/symbols/shields/trunk_4x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 36.0">
- <rect x="0.5" y="0.5" width="34.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 48.0">
+ <rect x="0.5" y="0.5" width="33.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x3_z18.svg b/symbols/shields/trunk_4x3_z18.svg
index 961579e..3af8d97 100644
--- a/symbols/shields/trunk_4x3_z18.svg
+++ b/symbols/shields/trunk_4x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 39.0">
- <rect x="0.5" y="0.5" width="37.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 51.0">
+ <rect x="0.5" y="0.5" width="36.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x4.svg b/symbols/shields/trunk_4x4.svg
index 77f2cac..2159a6a 100644
--- a/symbols/shields/trunk_4x4.svg
+++ b/symbols/shields/trunk_4x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 33.0 42.0">
- <rect x="0.5" y="0.5" width="32.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 54.0">
+ <rect x="0.5" y="0.5" width="33.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x4_z16.svg b/symbols/shields/trunk_4x4_z16.svg
index be237ee..86f63b7 100644
--- a/symbols/shields/trunk_4x4_z16.svg
+++ b/symbols/shields/trunk_4x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 35.0 46.0">
- <rect x="0.5" y="0.5" width="34.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 34.0 62.0">
+ <rect x="0.5" y="0.5" width="33.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_4x4_z18.svg b/symbols/shields/trunk_4x4_z18.svg
index 16be7ba..8fa7cd6 100644
--- a/symbols/shields/trunk_4x4_z18.svg
+++ b/symbols/shields/trunk_4x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 38.0 50.0">
- <rect x="0.5" y="0.5" width="37.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 37.0 66.0">
+ <rect x="0.5" y="0.5" width="36.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x1.svg b/symbols/shields/trunk_5x1.svg
index ba2af6e..caa9edf 100644
--- a/symbols/shields/trunk_5x1.svg
+++ b/symbols/shields/trunk_5x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 15.0">
- <rect x="0.5" y="0.5" width="38.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 18.0">
+ <rect x="0.5" y="0.5" width="39.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x1_z16.svg b/symbols/shields/trunk_5x1_z16.svg
index 877c148..d580ee6 100644
--- a/symbols/shields/trunk_5x1_z16.svg
+++ b/symbols/shields/trunk_5x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 16.0">
- <rect x="0.5" y="0.5" width="41.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 20.0">
+ <rect x="0.5" y="0.5" width="39.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x1_z18.svg b/symbols/shields/trunk_5x1_z18.svg
index c86ce47..50d2f3f 100644
--- a/symbols/shields/trunk_5x1_z18.svg
+++ b/symbols/shields/trunk_5x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 17.0">
- <rect x="0.5" y="0.5" width="44.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 21.0">
+ <rect x="0.5" y="0.5" width="43.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x2.svg b/symbols/shields/trunk_5x2.svg
index 52bc731..7bc8d1b 100644
--- a/symbols/shields/trunk_5x2.svg
+++ b/symbols/shields/trunk_5x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 24.0">
- <rect x="0.5" y="0.5" width="38.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 30.0">
+ <rect x="0.5" y="0.5" width="39.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x2_z16.svg b/symbols/shields/trunk_5x2_z16.svg
index 3b9cab5..3cf2045 100644
--- a/symbols/shields/trunk_5x2_z16.svg
+++ b/symbols/shields/trunk_5x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 26.0">
- <rect x="0.5" y="0.5" width="41.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 34.0">
+ <rect x="0.5" y="0.5" width="39.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x2_z18.svg b/symbols/shields/trunk_5x2_z18.svg
index 1e7cdf7..f8bd8e9 100644
--- a/symbols/shields/trunk_5x2_z18.svg
+++ b/symbols/shields/trunk_5x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 28.0">
- <rect x="0.5" y="0.5" width="44.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 36.0">
+ <rect x="0.5" y="0.5" width="43.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x3.svg b/symbols/shields/trunk_5x3.svg
index 9ddca5f..1e8a1ca 100644
--- a/symbols/shields/trunk_5x3.svg
+++ b/symbols/shields/trunk_5x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 33.0">
- <rect x="0.5" y="0.5" width="38.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 42.0">
+ <rect x="0.5" y="0.5" width="39.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x3_z16.svg b/symbols/shields/trunk_5x3_z16.svg
index acbacb7..55d9e34 100644
--- a/symbols/shields/trunk_5x3_z16.svg
+++ b/symbols/shields/trunk_5x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 36.0">
- <rect x="0.5" y="0.5" width="41.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 48.0">
+ <rect x="0.5" y="0.5" width="39.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x3_z18.svg b/symbols/shields/trunk_5x3_z18.svg
index fa1f647..92392d3 100644
--- a/symbols/shields/trunk_5x3_z18.svg
+++ b/symbols/shields/trunk_5x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 39.0">
- <rect x="0.5" y="0.5" width="44.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 51.0">
+ <rect x="0.5" y="0.5" width="43.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x4.svg b/symbols/shields/trunk_5x4.svg
index 45416b1..76572d5 100644
--- a/symbols/shields/trunk_5x4.svg
+++ b/symbols/shields/trunk_5x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 39.0 42.0">
- <rect x="0.5" y="0.5" width="38.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 54.0">
+ <rect x="0.5" y="0.5" width="39.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x4_z16.svg b/symbols/shields/trunk_5x4_z16.svg
index 9e1013f..778d751 100644
--- a/symbols/shields/trunk_5x4_z16.svg
+++ b/symbols/shields/trunk_5x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 42.0 46.0">
- <rect x="0.5" y="0.5" width="41.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 40.0 62.0">
+ <rect x="0.5" y="0.5" width="39.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_5x4_z18.svg b/symbols/shields/trunk_5x4_z18.svg
index 0febc19..bf9ca2c 100644
--- a/symbols/shields/trunk_5x4_z18.svg
+++ b/symbols/shields/trunk_5x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 50.0">
- <rect x="0.5" y="0.5" width="44.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 44.0 66.0">
+ <rect x="0.5" y="0.5" width="43.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x1.svg b/symbols/shields/trunk_6x1.svg
index adcb5f8..5e84dc3 100644
--- a/symbols/shields/trunk_6x1.svg
+++ b/symbols/shields/trunk_6x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 15.0">
- <rect x="0.5" y="0.5" width="44.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 18.0">
+ <rect x="0.5" y="0.5" width="46.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x1_z16.svg b/symbols/shields/trunk_6x1_z16.svg
index e77aeb7..076b614 100644
--- a/symbols/shields/trunk_6x1_z16.svg
+++ b/symbols/shields/trunk_6x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 16.0">
- <rect x="0.5" y="0.5" width="47.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 20.0">
+ <rect x="0.5" y="0.5" width="45.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x1_z18.svg b/symbols/shields/trunk_6x1_z18.svg
index 82a239e..cb3da20 100644
--- a/symbols/shields/trunk_6x1_z18.svg
+++ b/symbols/shields/trunk_6x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 17.0">
- <rect x="0.5" y="0.5" width="52.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 21.0">
+ <rect x="0.5" y="0.5" width="50.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x2.svg b/symbols/shields/trunk_6x2.svg
index 2d56305..2e85b75 100644
--- a/symbols/shields/trunk_6x2.svg
+++ b/symbols/shields/trunk_6x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 24.0">
- <rect x="0.5" y="0.5" width="44.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 30.0">
+ <rect x="0.5" y="0.5" width="46.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x2_z16.svg b/symbols/shields/trunk_6x2_z16.svg
index fdaa449..2596035 100644
--- a/symbols/shields/trunk_6x2_z16.svg
+++ b/symbols/shields/trunk_6x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 26.0">
- <rect x="0.5" y="0.5" width="47.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 34.0">
+ <rect x="0.5" y="0.5" width="45.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x2_z18.svg b/symbols/shields/trunk_6x2_z18.svg
index b18cfab..4293cb3 100644
--- a/symbols/shields/trunk_6x2_z18.svg
+++ b/symbols/shields/trunk_6x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 28.0">
- <rect x="0.5" y="0.5" width="52.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 36.0">
+ <rect x="0.5" y="0.5" width="50.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x3.svg b/symbols/shields/trunk_6x3.svg
index 318696c..52b32f2 100644
--- a/symbols/shields/trunk_6x3.svg
+++ b/symbols/shields/trunk_6x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 33.0">
- <rect x="0.5" y="0.5" width="44.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 42.0">
+ <rect x="0.5" y="0.5" width="46.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x3_z16.svg b/symbols/shields/trunk_6x3_z16.svg
index a73bb4a..1f0f552 100644
--- a/symbols/shields/trunk_6x3_z16.svg
+++ b/symbols/shields/trunk_6x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 36.0">
- <rect x="0.5" y="0.5" width="47.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 48.0">
+ <rect x="0.5" y="0.5" width="45.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x3_z18.svg b/symbols/shields/trunk_6x3_z18.svg
index 387bea9..0959a0d 100644
--- a/symbols/shields/trunk_6x3_z18.svg
+++ b/symbols/shields/trunk_6x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 39.0">
- <rect x="0.5" y="0.5" width="52.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 51.0">
+ <rect x="0.5" y="0.5" width="50.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x4.svg b/symbols/shields/trunk_6x4.svg
index 1af9f26..f98e4e0 100644
--- a/symbols/shields/trunk_6x4.svg
+++ b/symbols/shields/trunk_6x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 45.0 42.0">
- <rect x="0.5" y="0.5" width="44.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 47.0 54.0">
+ <rect x="0.5" y="0.5" width="46.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x4_z16.svg b/symbols/shields/trunk_6x4_z16.svg
index e7a33ad..ac189ca 100644
--- a/symbols/shields/trunk_6x4_z16.svg
+++ b/symbols/shields/trunk_6x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 48.0 46.0">
- <rect x="0.5" y="0.5" width="47.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 46.0 62.0">
+ <rect x="0.5" y="0.5" width="45.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_6x4_z18.svg b/symbols/shields/trunk_6x4_z18.svg
index 7e654e6..5fa2f9a 100644
--- a/symbols/shields/trunk_6x4_z18.svg
+++ b/symbols/shields/trunk_6x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 50.0">
- <rect x="0.5" y="0.5" width="52.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 66.0">
+ <rect x="0.5" y="0.5" width="50.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x1.svg b/symbols/shields/trunk_7x1.svg
index 3870fca..a677df9 100644
--- a/symbols/shields/trunk_7x1.svg
+++ b/symbols/shields/trunk_7x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 15.0">
- <rect x="0.5" y="0.5" width="50.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 18.0">
+ <rect x="0.5" y="0.5" width="52.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x1_z16.svg b/symbols/shields/trunk_7x1_z16.svg
index afc2dfd..9adbc62 100644
--- a/symbols/shields/trunk_7x1_z16.svg
+++ b/symbols/shields/trunk_7x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 16.0">
- <rect x="0.5" y="0.5" width="54.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 20.0">
+ <rect x="0.5" y="0.5" width="51.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x1_z18.svg b/symbols/shields/trunk_7x1_z18.svg
index 2bc1b60..8c445eb 100644
--- a/symbols/shields/trunk_7x1_z18.svg
+++ b/symbols/shields/trunk_7x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 17.0">
- <rect x="0.5" y="0.5" width="59.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 21.0">
+ <rect x="0.5" y="0.5" width="57.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x2.svg b/symbols/shields/trunk_7x2.svg
index 8ecbdcf..ba35900 100644
--- a/symbols/shields/trunk_7x2.svg
+++ b/symbols/shields/trunk_7x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 24.0">
- <rect x="0.5" y="0.5" width="50.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 30.0">
+ <rect x="0.5" y="0.5" width="52.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x2_z16.svg b/symbols/shields/trunk_7x2_z16.svg
index b1ed4f8..1a15771 100644
--- a/symbols/shields/trunk_7x2_z16.svg
+++ b/symbols/shields/trunk_7x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 26.0">
- <rect x="0.5" y="0.5" width="54.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 34.0">
+ <rect x="0.5" y="0.5" width="51.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x2_z18.svg b/symbols/shields/trunk_7x2_z18.svg
index 2f67a61..cae7a00 100644
--- a/symbols/shields/trunk_7x2_z18.svg
+++ b/symbols/shields/trunk_7x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 28.0">
- <rect x="0.5" y="0.5" width="59.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 36.0">
+ <rect x="0.5" y="0.5" width="57.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x3.svg b/symbols/shields/trunk_7x3.svg
index e6ddb62..719a671 100644
--- a/symbols/shields/trunk_7x3.svg
+++ b/symbols/shields/trunk_7x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 33.0">
- <rect x="0.5" y="0.5" width="50.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 42.0">
+ <rect x="0.5" y="0.5" width="52.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x3_z16.svg b/symbols/shields/trunk_7x3_z16.svg
index c21a633..eb61eef 100644
--- a/symbols/shields/trunk_7x3_z16.svg
+++ b/symbols/shields/trunk_7x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 36.0">
- <rect x="0.5" y="0.5" width="54.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 48.0">
+ <rect x="0.5" y="0.5" width="51.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x3_z18.svg b/symbols/shields/trunk_7x3_z18.svg
index 40734a3..088d55a 100644
--- a/symbols/shields/trunk_7x3_z18.svg
+++ b/symbols/shields/trunk_7x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 39.0">
- <rect x="0.5" y="0.5" width="59.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 51.0">
+ <rect x="0.5" y="0.5" width="57.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x4.svg b/symbols/shields/trunk_7x4.svg
index 679eef0..0eedf77 100644
--- a/symbols/shields/trunk_7x4.svg
+++ b/symbols/shields/trunk_7x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 51.0 42.0">
- <rect x="0.5" y="0.5" width="50.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 53.0 54.0">
+ <rect x="0.5" y="0.5" width="52.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x4_z16.svg b/symbols/shields/trunk_7x4_z16.svg
index 25c7954..bfc8695 100644
--- a/symbols/shields/trunk_7x4_z16.svg
+++ b/symbols/shields/trunk_7x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 55.0 46.0">
- <rect x="0.5" y="0.5" width="54.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 52.0 62.0">
+ <rect x="0.5" y="0.5" width="51.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_7x4_z18.svg b/symbols/shields/trunk_7x4_z18.svg
index d27c17e..079a1e9 100644
--- a/symbols/shields/trunk_7x4_z18.svg
+++ b/symbols/shields/trunk_7x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 60.0 50.0">
- <rect x="0.5" y="0.5" width="59.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 66.0">
+ <rect x="0.5" y="0.5" width="57.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x1.svg b/symbols/shields/trunk_8x1.svg
index 3416efb..3279704 100644
--- a/symbols/shields/trunk_8x1.svg
+++ b/symbols/shields/trunk_8x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 15.0">
- <rect x="0.5" y="0.5" width="56.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 18.0">
+ <rect x="0.5" y="0.5" width="58.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x1_z16.svg b/symbols/shields/trunk_8x1_z16.svg
index 59a2c3a..375e777 100644
--- a/symbols/shields/trunk_8x1_z16.svg
+++ b/symbols/shields/trunk_8x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 16.0">
- <rect x="0.5" y="0.5" width="60.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 20.0">
+ <rect x="0.5" y="0.5" width="57.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x1_z18.svg b/symbols/shields/trunk_8x1_z18.svg
index 8d75513..d955ccc 100644
--- a/symbols/shields/trunk_8x1_z18.svg
+++ b/symbols/shields/trunk_8x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 17.0">
- <rect x="0.5" y="0.5" width="66.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 21.0">
+ <rect x="0.5" y="0.5" width="64.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x2.svg b/symbols/shields/trunk_8x2.svg
index f600a40..60dd8d4 100644
--- a/symbols/shields/trunk_8x2.svg
+++ b/symbols/shields/trunk_8x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 24.0">
- <rect x="0.5" y="0.5" width="56.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 30.0">
+ <rect x="0.5" y="0.5" width="58.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x2_z16.svg b/symbols/shields/trunk_8x2_z16.svg
index 5d4105c..0efaf4e 100644
--- a/symbols/shields/trunk_8x2_z16.svg
+++ b/symbols/shields/trunk_8x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 26.0">
- <rect x="0.5" y="0.5" width="60.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 34.0">
+ <rect x="0.5" y="0.5" width="57.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x2_z18.svg b/symbols/shields/trunk_8x2_z18.svg
index a3abb3d..20df6ce 100644
--- a/symbols/shields/trunk_8x2_z18.svg
+++ b/symbols/shields/trunk_8x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 28.0">
- <rect x="0.5" y="0.5" width="66.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 36.0">
+ <rect x="0.5" y="0.5" width="64.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x3.svg b/symbols/shields/trunk_8x3.svg
index f97b7e2..6c9eb38 100644
--- a/symbols/shields/trunk_8x3.svg
+++ b/symbols/shields/trunk_8x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 33.0">
- <rect x="0.5" y="0.5" width="56.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 42.0">
+ <rect x="0.5" y="0.5" width="58.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x3_z16.svg b/symbols/shields/trunk_8x3_z16.svg
index 0b0fba5..baeca44 100644
--- a/symbols/shields/trunk_8x3_z16.svg
+++ b/symbols/shields/trunk_8x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 36.0">
- <rect x="0.5" y="0.5" width="60.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 48.0">
+ <rect x="0.5" y="0.5" width="57.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x3_z18.svg b/symbols/shields/trunk_8x3_z18.svg
index acd14ce..9ee06f7 100644
--- a/symbols/shields/trunk_8x3_z18.svg
+++ b/symbols/shields/trunk_8x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 39.0">
- <rect x="0.5" y="0.5" width="66.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 51.0">
+ <rect x="0.5" y="0.5" width="64.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x4.svg b/symbols/shields/trunk_8x4.svg
index 3a578e5..990c995 100644
--- a/symbols/shields/trunk_8x4.svg
+++ b/symbols/shields/trunk_8x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 57.0 42.0">
- <rect x="0.5" y="0.5" width="56.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 59.0 54.0">
+ <rect x="0.5" y="0.5" width="58.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x4_z16.svg b/symbols/shields/trunk_8x4_z16.svg
index 8b7b0ff..ccfac57 100644
--- a/symbols/shields/trunk_8x4_z16.svg
+++ b/symbols/shields/trunk_8x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 61.0 46.0">
- <rect x="0.5" y="0.5" width="60.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 58.0 62.0">
+ <rect x="0.5" y="0.5" width="57.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_8x4_z18.svg b/symbols/shields/trunk_8x4_z18.svg
index dc7dba9..711510d 100644
--- a/symbols/shields/trunk_8x4_z18.svg
+++ b/symbols/shields/trunk_8x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 67.0 50.0">
- <rect x="0.5" y="0.5" width="66.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 66.0">
+ <rect x="0.5" y="0.5" width="64.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x1.svg b/symbols/shields/trunk_9x1.svg
index 4a1cf8e..62eaeee 100644
--- a/symbols/shields/trunk_9x1.svg
+++ b/symbols/shields/trunk_9x1.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 15.0">
- <rect x="0.5" y="0.5" width="62.0" height="14.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 18.0">
+ <rect x="0.5" y="0.5" width="64.0" height="17.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x1_z16.svg b/symbols/shields/trunk_9x1_z16.svg
index 6b8babd..e2c8440 100644
--- a/symbols/shields/trunk_9x1_z16.svg
+++ b/symbols/shields/trunk_9x1_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 16.0">
- <rect x="0.5" y="0.5" width="67.0" height="15.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 20.0">
+ <rect x="0.5" y="0.5" width="63.0" height="19.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x1_z18.svg b/symbols/shields/trunk_9x1_z18.svg
index d04c9b1..fb3cb84 100644
--- a/symbols/shields/trunk_9x1_z18.svg
+++ b/symbols/shields/trunk_9x1_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 17.0">
- <rect x="0.5" y="0.5" width="73.0" height="16.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 21.0">
+ <rect x="0.5" y="0.5" width="71.0" height="20.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x2.svg b/symbols/shields/trunk_9x2.svg
index 812a47c..71d3d49 100644
--- a/symbols/shields/trunk_9x2.svg
+++ b/symbols/shields/trunk_9x2.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 24.0">
- <rect x="0.5" y="0.5" width="62.0" height="23.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 30.0">
+ <rect x="0.5" y="0.5" width="64.0" height="29.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x2_z16.svg b/symbols/shields/trunk_9x2_z16.svg
index 0ddd103..17e02f9 100644
--- a/symbols/shields/trunk_9x2_z16.svg
+++ b/symbols/shields/trunk_9x2_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 26.0">
- <rect x="0.5" y="0.5" width="67.0" height="25.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 34.0">
+ <rect x="0.5" y="0.5" width="63.0" height="33.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x2_z18.svg b/symbols/shields/trunk_9x2_z18.svg
index 79de9b3..17b719d 100644
--- a/symbols/shields/trunk_9x2_z18.svg
+++ b/symbols/shields/trunk_9x2_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 28.0">
- <rect x="0.5" y="0.5" width="73.0" height="27.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 36.0">
+ <rect x="0.5" y="0.5" width="71.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x3.svg b/symbols/shields/trunk_9x3.svg
index fbf3826..631012e 100644
--- a/symbols/shields/trunk_9x3.svg
+++ b/symbols/shields/trunk_9x3.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 33.0">
- <rect x="0.5" y="0.5" width="62.0" height="32.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 42.0">
+ <rect x="0.5" y="0.5" width="64.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x3_z16.svg b/symbols/shields/trunk_9x3_z16.svg
index 884a08e..6ddf27c 100644
--- a/symbols/shields/trunk_9x3_z16.svg
+++ b/symbols/shields/trunk_9x3_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 36.0">
- <rect x="0.5" y="0.5" width="67.0" height="35.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 48.0">
+ <rect x="0.5" y="0.5" width="63.0" height="47.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x3_z18.svg b/symbols/shields/trunk_9x3_z18.svg
index f4d1888..58e8351 100644
--- a/symbols/shields/trunk_9x3_z18.svg
+++ b/symbols/shields/trunk_9x3_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 39.0">
- <rect x="0.5" y="0.5" width="73.0" height="38.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 51.0">
+ <rect x="0.5" y="0.5" width="71.0" height="50.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x4.svg b/symbols/shields/trunk_9x4.svg
index 0525517..ed79436 100644
--- a/symbols/shields/trunk_9x4.svg
+++ b/symbols/shields/trunk_9x4.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 63.0 42.0">
- <rect x="0.5" y="0.5" width="62.0" height="41.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 65.0 54.0">
+ <rect x="0.5" y="0.5" width="64.0" height="53.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x4_z16.svg b/symbols/shields/trunk_9x4_z16.svg
index c162119..c280e85 100644
--- a/symbols/shields/trunk_9x4_z16.svg
+++ b/symbols/shields/trunk_9x4_z16.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 68.0 46.0">
- <rect x="0.5" y="0.5" width="67.0" height="45.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 64.0 62.0">
+ <rect x="0.5" y="0.5" width="63.0" height="61.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/symbols/shields/trunk_9x4_z18.svg b/symbols/shields/trunk_9x4_z18.svg
index 4736d1f..8288378 100644
--- a/symbols/shields/trunk_9x4_z18.svg
+++ b/symbols/shields/trunk_9x4_z18.svg
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 74.0 50.0">
- <rect x="0.5" y="0.5" width="73.0" height="49.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 72.0 66.0">
+ <rect x="0.5" y="0.5" width="71.0" height="65.0" rx="2" ry="2" id="shield" style="fill:#f2d7ce;stroke:#d7a899;stroke-width:1;"/>
</svg>
diff --git a/water.mss b/water.mss
index c3b26fe..456b698 100644
--- a/water.mss
+++ b/water.mss
@@ -96,6 +96,18 @@
[waterway = 'canal'][zoom >= 12],
[waterway = 'river'][zoom >= 12],
[waterway = 'wadi'][zoom >= 13] {
+ // the additional line of land color is used to provide a background for dashed casings
+ [int_tunnel = 'yes'] {
+ background/line-color: @land-color;
+ background/line-width: 2;
+ background/line-cap: round;
+ background/line-join: round;
+ }
+ water/line-color: @water-color;
+ water/line-width: 2;
+ water/line-cap: round;
+ water/line-join: round;
+
[bridge = 'yes'] {
[zoom >= 14] {
bridgecasing/line-color: black;
@@ -106,6 +118,7 @@
[zoom >= 18] { bridgecasing/line-width: 13; }
}
}
+
[intermittent = 'yes'],
[waterway = 'wadi'] {
[bridge = 'yes'][zoom >= 14] {
@@ -116,30 +129,36 @@
[zoom >= 17] { bridgefill/line-width: 9; }
[zoom >= 18] { bridgefill/line-width: 11; }
}
- line-dasharray: 4,3;
- line-cap: butt;
- line-join: round;
- line-clip: false;
+ water/line-dasharray: 4,3;
+ water/line-cap: butt;
+ water/line-join: round;
+ water/line-clip: false;
}
- line-color: @water-color;
- line-width: 2;
- [zoom >= 13] { line-width: 3; }
- [zoom >= 14] { line-width: 5; }
- [zoom >= 15] { line-width: 6; }
- [zoom >= 17] { line-width: 10; }
- [zoom >= 18] { line-width: 12; }
- line-cap: round;
- line-join: round;
+
+ [zoom >= 13] { water/line-width: 3; }
+ [zoom >= 14] { water/line-width: 5; }
+ [zoom >= 15] { water/line-width: 6; }
+ [zoom >= 17] { water/line-width: 10; }
+ [zoom >= 18] { water/line-width: 12; }
+
[int_tunnel = 'yes'] {
- line-dasharray: 4,2;
- line-cap: butt;
- line-join: miter;
- a/line-color: #f3f7f7;
- a/line-width: 1;
- [zoom >= 14] { a/line-width: 2; }
- [zoom >= 15] { a/line-width: 3; }
- [zoom >= 17] { a/line-width: 7; }
- [zoom >= 18] { a/line-width: 8; }
+ [zoom >= 13] { background/line-width: 3; }
+ [zoom >= 14] { background/line-width: 5; }
+ [zoom >= 15] { background/line-width: 6; }
+ [zoom >= 17] { background/line-width: 10; }
+ [zoom >= 18] { background/line-width: 12; }
+
+ water/line-dasharray: 4,2;
+ background/line-cap: butt;
+ background/line-join: miter;
+ water/line-cap: butt;
+ water/line-join: miter;
+ tunnelfill/line-color: #f3f7f7;
+ tunnelfill/line-width: 1;
+ [zoom >= 14] { tunnelfill/line-width: 2; }
+ [zoom >= 15] { tunnelfill/line-width: 3; }
+ [zoom >= 17] { tunnelfill/line-width: 7; }
+ [zoom >= 18] { tunnelfill/line-width: 8; }
}
}
@@ -147,6 +166,14 @@
[waterway = 'ditch'],
[waterway = 'drain'] {
[zoom >= 13] {
+ // the additional line of land color is used to provide a background for dashed casings
+ [int_tunnel = 'yes'] {
+ background/line-width: 2;
+ background/line-color: @land-color;
+ }
+ water/line-width: 2;
+ water/line-color: @water-color;
+
[bridge = 'yes'] {
[zoom >= 14] {
bridgecasing/line-color: black;
@@ -159,24 +186,35 @@
[waterway = 'stream'][zoom >= 15] { bridgeglow/line-width: 3; }
}
}
+
[intermittent = 'yes'] {
- line-dasharray: 4,3;
- line-cap: butt;
- line-join: round;
- line-clip: false;
+ water/line-dasharray: 4,3;
+ water/line-cap: butt;
+ water/line-join: round;
+ water/line-clip: false;
+ background/line-cap: butt;
+ background/line-join: round;
+ background/line-clip: false;
}
- line-width: 2;
- line-color: @water-color;
+
[waterway = 'stream'][zoom >= 15] {
- line-width: 3;
+ water/line-width: 3;
+
+ [int_tunnel = 'yes'] {
+ background/line-width: 3;
+ }
}
[int_tunnel = 'yes'][zoom >= 15] {
- line-width: 3.5;
- [waterway = 'stream'] { line-width: 4.5; }
- line-dasharray: 4,2;
- a/line-width: 1;
- [waterway = 'stream'] { a/line-width: 2; }
- a/line-color: #f3f7f7;
+ background/line-width: 3.5;
+ water/line-width: 3.5;
+ [waterway = 'stream'] {
+ background/line-width: 4.5;
+ water/line-width: 4.5;
+ }
+ water/line-dasharray: 4,2;
+ tunnelfill/line-width: 1;
+ [waterway = 'stream'] { tunnelfill/line-width: 2; }
+ tunnelfill/line-color: #f3f7f7;
}
}
}
--
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