diff --git a/icons/icons.svg b/icons/icons.svg
index 70e7287..2732a93 100644
--- a/icons/icons.svg
+++ b/icons/icons.svg
@@ -24,12 +24,12 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="288.01959"
-     inkscape:cy="463.27162"
+     inkscape:zoom="45.254834"
+     inkscape:cx="267.55386"
+     inkscape:cy="401.50385"
      inkscape:current-layer="layer1"
      inkscape:document-units="px"
-     showgrid="false"
+     showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:object-paths="true"
@@ -419,6 +419,24 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3767"
+       width="6"
+       height="8"
+       x="277"
+       y="177"
+       rx="3"
+       ry="3" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3763"
+       width="12"
+       height="2"
+       x="274"
+       y="183"
+       rx="0.5"
+       ry="0.5" />
     <path
        style="fill:#808080;stroke:none"
        d="m 246.5,49 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,0.5 0,1 -2,0 0,1 c 1.10457,0 2,0.895431 2,2 l 0,1 -2,0 0,1 c 1.10457,0 2,0.895431 2,2 l 0,1 -2,0 0,1 c 1.10457,0 2,0.895431 2,2 l 0,0.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,-0.5 c 0,-1.104569 0.89543,-2 2,-2 l 0,-1 -2,0 0,-1 c 0,-1.104569 0.89543,-2 2,-2 l 0,-1 -2,0 0,-1 c 0,-1.104569 0.89543,-2 2,-2 l 0,-1 -2,0 0,-1 0,-0.5 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -3,0 z"
@@ -3234,11 +3252,11 @@
        id="prison"
        inkscape:label="#rect3608" />
     <rect
-       style="color:#000000;fill:#808080;stroke:none;stroke-width:0.29999998000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#808080;stroke:none;stroke-width:0.29999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect3621"
-       width="9.7000055"
+       width="10"
        height="9"
-       x="211.14998"
+       x="211"
        y="179"
        ry="0.5"
        rx="0.5" />
@@ -3324,10 +3342,12 @@
        rx="0.49999997"
        ry="0.5" />
     <path
-       style="color:#000000;fill:#000000;stroke:none;stroke-width:0.29999998000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 211.65625 196 C 211.37925 196 211.15625 196.223 211.15625 196.5 L 211.15625 204.5 C 211.15625 204.777 211.37925 205 211.65625 205 L 212 205 L 212 204.5 C 212 204.223 212.223 204 212.5 204 C 212.777 204 213 204.223 213 204.5 L 213 205 L 219 205 L 219 204.5 C 219 204.223 219.223 204 219.5 204 C 219.777 204 220 204.223 220 204.5 L 220 205 L 220.34375 205 C 220.62075 205 220.84375 204.777 220.84375 204.5 L 220.84375 196.5 C 220.84375 196.223 220.62075 196 220.34375 196 L 220 196 L 220 196.5 C 220 196.777 219.777 197 219.5 197 C 219.223 197 219 196.777 219 196.5 L 219 196 L 213 196 L 213 196.5 C 213 196.777 212.777 197 212.5 197 C 212.223 197 212 196.777 212 196.5 L 212 196 L 211.65625 196 z M 214.5 197 L 217.34375 197 C 217.62075 197 217.84375 197.223 217.84375 197.5 L 217.84375 203.5 C 217.84375 203.777 217.62075 204 217.34375 204 L 214.5 204 C 214.223 204 214 203.777 214 203.5 L 214 197.5 C 214 197.223 214.223 197 214.5 197 z M 212.5 198 C 212.777 198 213 198.223 213 198.5 L 213 199.5 C 213 199.777 212.777 200 212.5 200 C 212.223 200 212 199.777 212 199.5 L 212 198.5 C 212 198.223 212.223 198 212.5 198 z M 219.5 198 C 219.777 198 220 198.223 220 198.5 L 220 199.5 C 220 199.777 219.777 200 219.5 200 C 219.223 200 219 199.777 219 199.5 L 219 198.5 C 219 198.223 219.223 198 219.5 198 z M 212.5 201 C 212.777 201 213 201.223 213 201.5 L 213 202.5 C 213 202.777 212.777 203 212.5 203 C 212.223 203 212 202.777 212 202.5 L 212 201.5 C 212 201.223 212.223 201 212.5 201 z M 219.5 201 C 219.777 201 220 201.223 220 201.5 L 220 202.5 C 220 202.777 219.777 203 219.5 203 C 219.223 203 219 202.777 219 202.5 L 219 201.5 C 219 201.223 219.223 201 219.5 201 z "
+       style="color:#000000;fill:#000000;stroke:none;stroke-width:0.29999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 211.5,196 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 0.5,0 0,-0.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.5 6,0 0,-0.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.5 0.5,0 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 -0.5,0 0,0.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.5 -6,0 0,0.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.5 z m 3,1 2.84375,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,6 c 0,0.277 -0.223,0.5 -0.5,0.5 L 214.5,204 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-6 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m -2,1 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 -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 z m 7,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 -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 z m -7,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 -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 z m 7,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 -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 z"
        id="film"
-       inkscape:label="#rect3645">
+       inkscape:label="#rect3645"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssscsssccssscsssscsssccssscssssssssssssssssssssssssssssssssssssss">
       <title
          id="title3667">film</title>
     </path>
@@ -5203,5 +5223,256 @@
        d="M 276.5 130 C 276.223 130 276 130.223 276 130.5 L 276 141.5 C 276 141.777 276.223 142 276.5 142 L 283.5 142 C 283.777 142 284 141.777 284 141.5 L 284 130.5 C 284 130.223 283.777 130 283.5 130 L 276.5 130 z M 277.5 133 L 280.5 133 C 280.777 133 281 133.223 281 133.5 L 281 138.5 C 281 138.777 280.777 139 280.5 139 L 277.5 139 C 277.223 139 277 138.777 277 138.5 L 277 133.5 C 277 133.223 277.223 133 277.5 133 z M 282.5 133 C 282.777 133 283 133.223 283 133.5 L 283 134.5 C 283 134.777 282.777 135 282.5 135 C 282.223 135 282 134.777 282 134.5 L 282 133.5 C 282 133.223 282.223 133 282.5 133 z M 278 136 L 278 137 C 278 137.55228 278.44772 138 279 138 C 279.55228 138 280 137.55228 280 137 L 280 136 L 278 136 z "
        id="vending_machine"
        inkscape:label="#rect3728" />
+    <rect
+       rx="0.5"
+       ry="0.5"
+       y="178"
+       x="228"
+       height="12"
+       width="8"
+       id="rect3742"
+       style="color:#000000;fill:#808080;stroke:none;stroke-width:0.29999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none"
+       id="path3744"
+       sodipodi:cx="232"
+       sodipodi:cy="179"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 234,179 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+       transform="translate(0,-1)" />
+    <path
+       transform="translate(0,11)"
+       d="m 234,179 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+       sodipodi:ry="2"
+       sodipodi:rx="2"
+       sodipodi:cy="179"
+       sodipodi:cx="232"
+       id="path3746"
+       style="fill:#cccccc;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       rx="0.5"
+       ry="0.49999997"
+       y="-230"
+       x="181"
+       height="2.9999902"
+       width="1"
+       id="rect3748"
+       style="color:#000000;fill:#cccccc;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       rx="0.5"
+       ry="0.49999997"
+       y="-233"
+       x="181"
+       height="1.9999934"
+       width="1"
+       id="rect3752"
+       style="color:#000000;fill:#cccccc;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="color:#000000;fill:#cccccc;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3754"
+       width="1"
+       height="2.9999933"
+       x="181"
+       y="-237"
+       ry="0.49999997"
+       rx="0.5" />
+    <path
+       style="color:#000000;fill:#000000;stroke:none;stroke-width:0.29999998000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 228.5 194 C 228.223 194 228 194.223 228 194.5 L 228 197 L 229.5 197 C 229.777 197 230 197.223 230 197.5 C 230 197.777 229.777 198 229.5 198 L 228 198 L 228 205.5 C 228 205.777 228.223 206 228.5 206 L 230 206 C 230 204.89543 230.89543 204 232 204 C 233.10457 204 234 204.89543 234 206 L 235.5 206 C 235.777 206 236 205.777 236 205.5 L 236 198 L 234.5 198 C 234.223 198 234 197.777 234 197.5 C 234 197.223 234.223 197 234.5 197 L 236 197 L 236 194.5 C 236 194.223 235.777 194 235.5 194 L 234 194 C 234 195.10457 233.10457 196 232 196 C 230.89543 196 230 195.10457 230 194 L 228.5 194 z M 231.5 197 L 232.5 197 C 232.777 197 233 197.223 233 197.5 C 233 197.777 232.777 198 232.5 198 L 231.5 198 C 231.223 198 231 197.777 231 197.5 C 231 197.223 231.223 197 231.5 197 z "
+       id="ticket"
+       inkscape:label="#rect3756" />
+    <rect
+       style="color:#000000;fill:#808080;stroke:none;stroke-width:0.29999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3770"
+       width="8"
+       height="12"
+       x="244"
+       y="178"
+       ry="0.5"
+       rx="0.5" />
+    <path
+       transform="translate(16,-1)"
+       d="m 234,179 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+       sodipodi:ry="2"
+       sodipodi:rx="2"
+       sodipodi:cy="179"
+       sodipodi:cx="232"
+       id="path3772"
+       style="fill:#cccccc;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#cccccc;fill-opacity:1;stroke:none"
+       id="path3774"
+       sodipodi:cx="232"
+       sodipodi:cy="179"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 234,179 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+       transform="translate(16,11)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="color:#000000;fill:#cccccc;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3776"
+       width="1"
+       height="2.9999902"
+       x="181"
+       y="-246"
+       ry="0.49999997"
+       rx="0.5" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="color:#000000;fill:#cccccc;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3778"
+       width="1"
+       height="1.9999934"
+       x="181"
+       y="-249"
+       ry="0.49999997"
+       rx="0.5" />
+    <rect
+       rx="0.5"
+       ry="0.49999997"
+       y="-253"
+       x="181"
+       height="2.9999933"
+       width="1"
+       id="rect3780"
+       style="color:#000000;fill:#cccccc;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3739"
+       width="4"
+       height="8"
+       x="262"
+       y="182"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3741"
+       width="4"
+       height="6"
+       x="262"
+       y="180"
+       rx="2"
+       ry="2" />
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       d="m 261,181 0,7 -2,0 1,-7 z"
+       id="path3747"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3749"
+       width="10"
+       height="1"
+       x="275"
+       y="190"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3751"
+       width="6"
+       height="11"
+       x="277"
+       y="180"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3755"
+       width="10"
+       height="4"
+       x="275"
+       y="182"
+       rx="0.5"
+       ry="0.5" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#cccccc;fill-opacity:1;stroke:none"
+       id="path3757"
+       sodipodi:cx="280"
+       sodipodi:cy="184"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 282,184 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3759"
+       width="7"
+       height="2"
+       x="291"
+       y="183"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3761"
+       width="2"
+       height="2"
+       x="299"
+       y="183"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3765"
+       width="8"
+       height="1"
+       x="276"
+       y="180"
+       rx="0.5"
+       ry="0.5" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="M 280 193 C 278.338 193 277 194.338 277 196 L 276.5 196 C 276.223 196 276 196.223 276 196.5 C 276 196.777 276.223 197 276.5 197 L 277 197 L 277 198 L 275.5 198 C 275.223 198 275 198.223 275 198.5 L 275 199 L 274.5 199 C 274.223 199 274 199.223 274 199.5 L 274 200.5 C 274 200.777 274.223 201 274.5 201 L 275 201 L 275 201.5 C 275 201.777 275.223 202 275.5 202 L 277 202 L 277 206 L 275.5 206 C 275.223 206 275 206.223 275 206.5 C 275 206.777 275.223 207 275.5 207 L 284.5 207 C 284.777 207 285 206.777 285 206.5 C 285 206.223 284.777 206 284.5 206 L 283 206 L 283 202 L 284.5 202 C 284.777 202 285 201.777 285 201.5 L 285 201 L 285.5 201 C 285.777 201 286 200.777 286 200.5 L 286 199.5 C 286 199.223 285.777 199 285.5 199 L 285 199 L 285 198.5 C 285 198.223 284.777 198 284.5 198 L 283 198 L 283 197 L 283.5 197 C 283.777 197 284 196.777 284 196.5 C 284 196.223 283.777 196 283.5 196 L 283 196 C 283 194.338 281.662 193 280 193 z M 280 198 C 281.10457 198 282 198.89543 282 200 C 282 201.10457 281.10457 202 280 202 C 278.89543 202 278 201.10457 278 200 C 278 198.89543 278.89543 198 280 198 z "
+       id="fire_hydrant"
+       inkscape:label="#rect3806" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="path3830"
+       sodipodi:cx="263"
+       sodipodi:cy="181"
+       sodipodi:rx="3"
+       sodipodi:ry="3"
+       d="m 260,181 a 3,3 0 0 1 3,-3 l 0,3 z"
+       sodipodi:start="3.1415927"
+       sodipodi:end="4.712389" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#cccccc;fill-opacity:1;stroke:none"
+       id="path3832"
+       sodipodi:cx="265"
+       sodipodi:cy="181"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 263,181 a 2,2 0 0 1 2,-2 l 0,2 z"
+       sodipodi:start="3.1415927"
+       sodipodi:end="4.712389"
+       transform="translate(-2,0)" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect3834"
+       width="2.5"
+       height="1"
+       x="262.5"
+       y="178"
+       rx="0.5"
+       ry="0.5" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="M 263 194 C 262.93075 194 262.87236 194.00602 262.8125 194.03125 C 261.24696 194.13217 260 195.40897 260 197 L 259 204 L 261 204 L 261 197 C 261 195.89543 261.89543 195 263 195 L 264.5 195 C 264.777 195 265 194.777 265 194.5 C 265 194.223 264.777 194 264.5 194 L 263 194 z M 264 196 C 262.892 196 262 196.892 262 198 L 262 198.5 L 262 200 L 262 205.5 C 262 205.777 262.223 206 262.5 206 L 265.5 206 C 265.777 206 266 205.777 266 205.5 L 266 200 L 266 198.5 L 266 198 C 266 196.892 265.108 196 264 196 z "
+       id="fire_extinguisher"
+       inkscape:label="#rect3836" />
   </g>
 </svg>