diff --git a/data/tags.yml b/data/tags.yml
index 77129d1..01761ea 100644
--- a/data/tags.yml
+++ b/data/tags.yml
@@ -154,7 +154,7 @@ node_icons:
   # Big territory
 
   - tags: {leisure: fishing}
-    icon: [fishing]
+    icon: [fishing_angle]
   - tags: {building: service, power: substation}
     icon: [electricity]
 
@@ -175,9 +175,9 @@ node_icons:
   # Important big objects
 
   - tags: {amenity: pharmacy}
-    icon: [pharmacy]
+    icon: [medicine_bottle]
   - tags: {amenity: embassy}
-    icon: [embassy]
+    icon: [waving_flag]
   - tags: {tourism: hotel}
     icon: [bed]
   - tags: {building: hotel}
@@ -187,9 +187,9 @@ node_icons:
   - tags: {tourism: motel}  # Tourism?
     icon: [motel]
   - tags: {amenity: clinic}
-    icon: [clinic]
+    icon: [greek_cross]
   - tags: {amenity: post_office}
-    icon: [letter]
+    icon: [envelope]
   - tags: {amenity: post_office, __country: Japan}
     icon: [japan_post]
   - tags: {shop: car_repair}
@@ -247,11 +247,11 @@ node_icons:
   - tags: {amenity: bar}
     icon: [bar]
   - tags: {amenity: pub}
-    icon: [beer]
+    icon: [beer_mug]
   - tags: {amenity: fast_food}
-    icon: [fast_food]
+    icon: [burger]
   - tags: {amenity: shop, shop: fishing}
-    icon: [fishing]
+    icon: [fishing_angle]
   - tags: {shop: alcohol}
     icon: [bottle]
   - tags: {shop: bakery}
@@ -271,11 +271,11 @@ node_icons:
   - tags: {tourism: gallery}
     icon: [picture]
   - tags: {amenity: cafe}
-    icon: [cafe]
+    icon: [coffee_cup]
   - tags: {amenity: ice_cream}
     icon: [ice_cream]
   - tags: {amenity: biergarten}
-    icon: [beer]
+    icon: [beer_mug]
   - tags: {amenity: nightclub}
     icon: [night_club]
   - tags: {amenity: restaurant}
@@ -352,7 +352,7 @@ node_icons:
   - tags: {amenity: fuel}
     icon: [fuel_station]
   - tags: {amenity: parking}
-    icon: [parking]
+    icon: [p]
   - tags: {highway: turning_circle}
     icon: [circle_empty]
   - tags: {highway: crossing}
@@ -381,7 +381,7 @@ node_icons:
   - tags: {tourism: attraction, attraction: amusement_ride}
     icon: [amusement_ride]
   - tags: {amenity: toilets}
-    icon: [toilets]
+    icon: [woman_and_man]
 
   # Normal middle objects
 
@@ -469,7 +469,7 @@ node_icons:
   - tags: {amenity: atm}
     icon: [atm]
   - tags: {amenity: bicycle_parking}
-    icon: [bicycle_parking]
+    icon: [bicycle_p]
   - tags: {amenity: telephone}
     icon: [telephone]
   - tags: {information: "*"}
@@ -518,7 +518,7 @@ node_icons:
   # Normal small objects
 
   - tags: {amenity: post_box}
-    icon: [letter]
+    icon: [envelope]
   - tags: {amenity: recycling}
     icon: [recycling_container]
   - tags: {amenity: recycling, recycling_type: container}
@@ -597,25 +597,25 @@ node_icons:
     icon: [tree]
     color: tree_color
   - tags: {leaf_type: broadleaved}
-    icon: [broadleaved]
+    icon: [tree_with_leaf]
     color: tree_color
   - tags: {leaf_type: needleleaved}
-    icon: [needleleaved]
+    icon: [needleleaved_tree]
     color: tree_color
   - tags: {leaf_type: palm}
     icon: [palm]
     color: tree_color
   - tags: {natural: tree, leaf_type: broadleaved}
-    icon: [broadleaved]
+    icon: [tree_with_leaf]
     color: tree_color
   - tags: {natural: tree, leaf_type: needleleaved}
-    icon: [needleleaved]
+    icon: [needleleaved_tree]
     color: tree_color
   - tags: {natural: tree, leaf_type: palm}
     icon: [palm]
     color: tree_color
   - tags: {natural: tree, type: conifer}
-    icon: [needleleaved]
+    icon: [needleleaved_tree]
     color: tree_color
   - tags: {leaf_cycle: deciduous}
     color: decidious_color
@@ -684,10 +684,10 @@ node_icons:
     add_icon: [onion_roof_shape]
   - tags: {natural: tree, denotation: urban}
     over_icon: [urban_tree_pot]
-    under_icon: [tree, broadleaved, needleleaved, betula, palm]
+    under_icon: [tree, tree_with_leaf, needleleaved_tree, betula, palm]
   - tags: {natural: tree, denotation: avenue}
-    over_icon: [avenue_tree]
-    under_icon: [tree, broadleaved, needleleaved, betula, palm]
+    over_icon: [bottom_right_horizontal_line]
+    under_icon: [tree, tree_with_leaf, needleleaved_tree, betula, palm]
 
   - tags: {wheelchair: "yes"}
     add_icon: [wheelchair]
@@ -709,7 +709,7 @@ node_icons:
   - tags: {material: wood}
     add_icon: [wood]
   - tags: {access: private}
-    add_icon: [lock]
+    add_icon: [lock_with_keyhole]
   - tags: {direction: clockwise}
     add_icon: [clockwise]
   - tags: {direction: contrclockwise}
diff --git a/icons/icons.svg b/icons/icons.svg
index 2221928..acb3ed6 100644
--- a/icons/icons.svg
+++ b/icons/icons.svg
@@ -148,9 +148,9 @@
      showgrid="false"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:cy="411.9354"
-     inkscape:cx="102.5924"
-     inkscape:zoom="5.6568542"
+     inkscape:cy="515.18919"
+     inkscape:cx="242.77926"
+     inkscape:zoom="11.313708"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -990,8 +990,9 @@
        style="fill:none;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none" />
     <path
        inkscape:connector-curvature="0"
-       id="clinic"
-       d="M 54.5,19 C 54.223,19 54,19.223 54,19.5 l 0,2.5 -2.5,0 C 51.223,22 51,22.223 51,22.5 l 0,3 c 0,0.277 0.223,0.5 0.5,0.5 l 2.5,0 0,2.5 c 0,0.277 0.223,0.5 0.5,0.5 l 3,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2.5 2.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-3 C 61,22.223 60.777,22 60.5,22 L 58,22 58,19.5 C 58,19.223 57.777,19 57.5,19 l -3,0 z" />
+       id="greek_cross"
+       d="M 54.5,19 C 54.223,19 54,19.223 54,19.5 l 0,2.5 -2.5,0 C 51.223,22 51,22.223 51,22.5 l 0,3 c 0,0.277 0.223,0.5 0.5,0.5 l 2.5,0 0,2.5 c 0,0.277 0.223,0.5 0.5,0.5 l 3,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2.5 2.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-3 C 61,22.223 60.777,22 60.5,22 L 58,22 58,19.5 C 58,19.223 57.777,19 57.5,19 l -3,0 z"
+       inkscape:label="#clinic" />
     <path
        style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 4,8 2,6 4,0 2,-6 z"
@@ -1066,9 +1067,10 @@
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
-       id="toilets"
+       id="woman_and_man"
        d="m 117,19 c -0.55228,0 -1,0.447715 -1,1 0,0.552285 0.44772,1 1,1 0.55228,0 1,-0.447715 1,-1 0,-0.552285 -0.44772,-1 -1,-1 z m 5,0 c -0.55228,0 -1,0.447715 -1,1 0,0.552285 0.44772,1 1,1 0.55228,0 1,-0.447715 1,-1 0,-0.552285 -0.44772,-1 -1,-1 z m -6.5,3 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 c 0,0.277 0.223,0.5 0.5,0.5 l 0.84375,0 -1.34375,4 4,0 -1.34375,-4 0.84375,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -1.5,0 -1.5,0 z m 5.5,0 c -0.554,0 -1,0.446 -1,1 l 0,1 c 0,0.554 0.446,1 1,1 l 0,2.5 c 0,0.277 0.223,0.5 0.5,0.5 l 1,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2.5 c 0.554,0 1,-0.446 1,-1 l 0,-1 c 0,-0.554 -0.446,-1 -1,-1 l -2,0 z"
-       style="fill:#000000;fill-opacity:1;stroke:none" />
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       inkscape:label="#toilets" />
     <rect
        ry="0"
        y="4"
@@ -1093,7 +1095,7 @@
        sodipodi:nodetypes="csccccccscccsccsccccccc"
        inkscape:connector-curvature="0"
        inkscape:label="#path3101"
-       id="cafe"
+       id="coffee_cup"
        d="m 174,24 c 0,-1.104569 -0.89543,-2 -2,-2 l -1,0 0,-1 -7,0 0,7 7,0 0,-1 1,0 c 1.10457,0 2,-0.895431 2,-2 z m -1,1 c 0,0.552285 -0.44772,1 -1,1 l -1,0 0,-3 1,0 c 0.55228,0 1,0.447715 1,1 z m -11,4 1,1 9,0 1,-1 z"
        style="fill:#000000;fill-opacity:1;stroke:none" />
     <rect
@@ -1127,9 +1129,10 @@
     <path
        sodipodi:nodetypes="sccssssscccsssscssccc"
        inkscape:connector-curvature="0"
-       id="fast_food"
+       id="burger"
        d="m 38,20 c -1.662,0 -3,1.338 -3,3 l 10,0 c 0,-1.662 -1.338,-3 -3,-3 z m -3.5,4 c -0.276142,0 -0.5,0.223858 -0.5,0.5 0,0.276142 0.223858,0.5 0.5,0.5 l 1.5,0 4,2 4,-2 1.5,0 C 45.776142,25 46,24.776142 46,24.5 46,24.223858 45.776142,24 45.5,24 Z M 35,25.625 C 35,27.287 36.338,29 38,29 l 4,0 c 1.662,0 3,-1.713 3,-3.375 l -5,2.5 z"
-       style="fill:#000000;stroke:none" />
+       style="fill:#000000;stroke:none"
+       inkscape:label="#fast_food" />
     <path
        sodipodi:nodetypes="ccccc"
        inkscape:connector-curvature="0"
@@ -1205,7 +1208,7 @@
        inkscape:label="#path4134"
        style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate"
        d="m 170,94 0,1 5,0 0,-1 z"
-       id="avenue_tree"
+       id="bottom_right_horizontal_line"
        inkscape:connector-curvature="0" />
     <rect
        rx="1"
@@ -2002,7 +2005,7 @@
     <path
        inkscape:label="#path3178"
        inkscape:connector-curvature="0"
-       id="needleleaved"
+       id="needleleaved_tree"
        d="m 216,83 c -0.5,1.25 -1.75,2.25 -3,3 l 2,0 c -0.5,1.25 -1.75,2.25 -3,3 l 2,0 c -0.5,1.25 -1.75,2.25 -3,3 l 4,0 0,3 2,0 0,-3 4,0 c -1.25,-0.75 -2.5,-1.75 -3,-3 l 2,0 c -1.25,-0.75 -2.5,-1.75 -3,-3 l 2,0 c -1.25,-0.75 -2.5,-1.75 -3,-3 z"
        style="fill:#000000;stroke:none"
        sodipodi:nodetypes="cccccccccccccccc" />
@@ -2617,7 +2620,7 @@
        sodipodi:nodetypes="ccccccccssscccscsssssssscscsssscssssccccc"
        inkscape:connector-curvature="0"
        inkscape:label="#rect4413"
-       id="beer"
+       id="beer_mug"
        d="m 308,51 0,11 7,0 0,-2 0.90625,0 0.0937,0 0,-0.0312 c 0.54727,0.0521 1.06536,-0.1396 1.40625,-0.5 C 317.76971,59.08444 318,58.55159 318,58 l 0,-3 c 0,-1.09865 -0.84338,-2 -2,-2 l -1,0 0,-2 z m 1.5,1 1,0 3,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -1.5,0 c -0.55228,0 -1,0.44772 -1,1 l 0,2.5 c 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-0.9375 c 0.003,-0.0216 0,-0.0401 0,-0.0625 0,-0.24069 -0.17967,-0.42115 -0.40625,-0.46875 C 309.56115,55.01055 309.5346,55 309.5,55 309.223,55 309,54.777 309,54.5 l 0,-2 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 5.5,2 1,0 c 0.55821,0 1,0.44179 1,1 l 0,3 c 0,0.27684 -0.13025,0.58857 -0.3125,0.78125 -0.18225,0.19268 -0.36556,0.25678 -0.59375,0.21875 l -0.0625,0 -0.0312,0 -1,0 z"
        style="fill:#000000;stroke:none" />
     <path
@@ -4071,7 +4074,7 @@
     <path
        inkscape:connector-curvature="0"
        inkscape:label="#rect4660"
-       id="parking"
+       id="p"
        d="m 132.5,20 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.277 0.223,0.5 0.5,0.5 l 1,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2.5 2.84375,0 L 137,26 c 1.64501,0 3,-1.35499 3,-3 0,-1.64501 -1.35499,-3 -3,-3 l -0.1875,0 -3.3125,0 -1,0 z m 1.5,2 2.84375,0 L 137,22 c 0.56413,0 1,0.435871 1,1 0,0.564129 -0.43587,1 -1,1 l -0.0937,0 -2.90625,0 0,-2 z"
        style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;stroke:none;stroke-width:0.30000001;marker:none;enable-background:accumulate" />
     <rect
@@ -4941,7 +4944,7 @@
        sodipodi:nodetypes="scscssccccccccsscscssccccccc"
        inkscape:connector-curvature="0"
        inkscape:label="#rect8730"
-       id="broadleaved"
+       id="tree_with_leaf"
        d="m 229,82 c -0.554,0 -1,0.446 -1,1 -0.554,0 -1,0.446 -1,1 l 0,1 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 0,0.554 0.446,1 1,1 l 1,2 0,3 2,0 0,-3 1,-2 c 0.554,0 1,-0.446 1,-1 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l 0,-1 c 0,-0.554 -0.446,-1 -1,-1 0,-0.554 -0.446,-1 -1,-1 z m 8,1 c -2,2 -2,4 0,6 2,-2 2,-4 0,-6 z m -8,7 2,0 -1,1.5 z"
        style="fill:#000000;stroke:none" />
     <path
@@ -6133,7 +6136,7 @@
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
     <path
        inkscape:label="#rect5099"
-       id="bicycle_parking"
+       id="bicycle_p"
        d="m 289.5,17 c -0.277,0 -0.5,0.202562 -0.5,0.455078 l 0,0.04492 0,0.04492 0,1.910156 0,0.08984 0,1.955078 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1.5 1.5,0 A 1.5,1.5 0 0 0 293,18.5 1.5,1.5 0 0 0 291.5,17 l -2,0 z m 0.5,1 1.5,0 a 0.5,0.5 0 0 1 0.5,0.5 0.5,0.5 0 0 1 -0.5,0.5 l -1.5,0 0,-1 z m 4,3 a 0.50005,0.50005 0 0 0 -0.46484,0.314453 l -1,2.5 a 0.50005,0.50005 0 0 0 0.36718,0.675781 l 1.14844,0.230469 a 0.50005,0.50005 0 0 0 0.0332,0.05664 l 2,3 a 0.50005,0.50005 0 0 0 0.83985,-0.01172 L 299.27734,24 300,24 a 0.50005,0.50005 0 1 0 0,-1 l -0.91211,0 A 0.50005,0.50005 0 0 0 298.97461,22.9941 0.50005,0.50005 0 0 0 298.92578,23 L 298,23 a 0.50005,0.50005 0 1 0 0,1 l 0.0977,0 -0.28321,0.453125 L 293.6875,23.626953 294.33789,22 295.5,22 a 0.50005,0.50005 0 1 0 0,-1 l -1.5,0 z m 1.43164,3.996094 1.81641,0.363281 -0.76172,1.21875 -1.05469,-1.582031 z M 292.5,25 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 8,0 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m -8,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z m 8,0 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
        style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        inkscape:connector-curvature="0" />
@@ -6784,7 +6787,7 @@
        style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <path
        inkscape:label="#rect5632"
-       id="letter"
+       id="envelope"
        d="m 179.5,21 c -0.09,0 -0.16936,0.03094 -0.24219,0.07227 a 0.50005,0.50005 0 0 1 0.0547,0.03711 l 4.6875,3.75 4.6875,-3.75 a 0.50024408,0.50024408 0 0 1 0.0547,-0.03906 C 188.66958,21.029324 188.58965,21 188.5,21 l -9,0 z M 179,22.140625 179,28.5 c 0,0.277 0.223,0.5 0.5,0.5 l 9,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-6.359375 -4.6875,3.75 a 0.50005,0.50005 0 0 1 -0.625,0 l -4.6875,-3.75 z"
        style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        inkscape:connector-curvature="0" />
@@ -6799,7 +6802,7 @@
        style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <path
        inkscape:label="#rect5647"
-       id="pharmacy"
+       id="medicine_bottle"
        d="m 308.5,18 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1.5 8,0 0,-1.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -7,0 z m -0.5,3 0,8.5 c 0,0.277 0.223,0.5 0.5,0.5 l 7,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-8.5 -8,0 z m 3,1 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 0,-2 z"
        style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        inkscape:connector-curvature="0" />
@@ -6844,7 +6847,7 @@
        sodipodi:nodetypes="scccssccccsscccssssss"
        inkscape:label="#circle5666"
        inkscape:connector-curvature="0"
-       id="fishing"
+       id="fishing_angle"
        d="m 246.5,83 c -0.82843,0 -1.5,0.671573 -1.5,1.5 8.9e-4,0.634902 0.40141,1.200475 1,1.412109 L 246,90.5 c -3.4e-4,0.893504 0.4762,1.719264 1.25,2.166016 0.7735,0.446582 1.7265,0.446582 2.5,0 0.7738,-0.446752 1.25034,-1.272512 1.25,-2.166016 l 0,-3 c -0.5,1.5 -1,2.5 -2.5,3 l 1.5,0 c -8e-5,0.535823 -0.28596,1.030916 -0.75,1.298828 -0.4641,0.267949 -1.0359,0.267949 -1.5,0 C 247.28596,91.530916 247.00008,91.035823 247,90.5 l 0,-4.587891 c 0.59859,-0.211634 0.99911,-0.777207 1,-1.412109 0,-0.828427 -0.67157,-1.5 -1.5,-1.5 z m 0,1 c 0.27614,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.22386,-0.5 0.5,-0.5 z"
        style="fill:#000000;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <rect
@@ -7428,7 +7431,7 @@
        sodipodi:nodetypes="cssccssc" />
     <path
        inkscape:label="#rect11235"
-       id="embassy"
+       id="waving_flag"
        d="m 3,50 0,12 1,0 0,-6 c 1.5,0 1.5,1 3,1 1.5,0 1.5,-1 3,-1 1.5,0 1.5,1 3,1 l 0,-6 C 11.5,51 11.5,50 10,50 8.5,50 8.5,51 7,51 5.5,51 5.5,50 4,50 l -1,0 z"
        style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        inkscape:connector-curvature="0" />
@@ -10727,7 +10730,7 @@
     <path
        style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 56 51 A 3 3 0 0 0 53 54 L 53 56 C 52.446 56 52 56.446 52 57 L 52 61 C 52 61.554 52.446 62 53 62 L 59 62 C 59.554 62 60 61.554 60 61 L 60 57 C 60 56.446 59.554 56 59 56 L 59 54 A 3 3 0 0 0 56 51 z M 56 52 A 2 2 0 0 1 58 54 L 58 56 L 54 56 L 54 54 A 2 2 0 0 1 56 52 z M 56 57.5 A 1 1 0 0 1 57 58.5 A 1 1 0 0 1 56.5 59.365234 L 56.5 60.5 C 56.5 60.777 56.277 61 56 61 C 55.723 61 55.5 60.777 55.5 60.5 L 55.5 59.363281 A 1 1 0 0 1 55 58.5 A 1 1 0 0 1 56 57.5 z "
-       id="lock"
+       id="lock_with_keyhole"
        inkscape:label="#rect6075" />
     <path
        style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"