diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json
index 38b1cdd9b2..bae08331a6 100644
--- a/assets/layers/indoors/indoors.json
+++ b/assets/layers/indoors/indoors.json
@@ -30,27 +30,39 @@
     "mappings": [
       {
         "if": "indoor=room",
-        "then": "Indoor Room {name}"
+        "then": {
+          "en": "Indoor Room {name}"
+        }
       },
       {
         "if": "indoor=area",
-        "then": "Indoor Area {name}"
+        "then": {
+          "en": "Indoor Area {name}"
+        }
       },
       {
         "if": "indoor=wall",
-        "then": "Indoor Wall {name}"
+        "then": {
+          "en": "Indoor Wall {name}"
+        }
       },
       {
         "if": "indoor=corridor",
-        "then": "Indoor Corridor {name}"
+        "then": {
+          "en": "Indoor Corridor {name}"
+        }
       },
       {
         "if": "indoor=door",
-        "then": "Indoor Door {name}"
+        "then": {
+          "en": "Indoor Door {name}"
+        }
       },
       {
         "if": "indoor=level",
-        "then": "Indoor Level {name}"
+        "then": {
+          "en": "Indoor Level {name}"
+        }
       }
     ]
   },
@@ -96,7 +108,34 @@
       "location": [
         "point",
         "centroid"
-      ]
+      ],
+      "icon": {
+        "render": null,
+        "condition": "indoor=room",
+        "mappings": [
+          {
+            "if": "room=auditorium",
+            "then": "./assets/layers/indoors/room_auditorium.svg"
+          },
+          {
+            "if": "room=conference",
+            "then": "./assets/layers/indoors/room_conference.svg"
+          },
+          {
+            "if": "room=storage",
+            "then": "./assets/layers/indoors/room_storage.svg"
+          },
+          {
+            "if": "room=toilet",
+            "then": "./assets/layers/indoors/room_toilet.svg"
+          },
+          {
+            "if": "room=toilets",
+            "then": "./assets/layers/indoors/room_toilets.svg"
+          }
+        ]
+      },
+      "iconSize": "15,15, center"
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/layers/indoors/license_info.json b/assets/layers/indoors/license_info.json
new file mode 100644
index 0000000000..ba436bce03
--- /dev/null
+++ b/assets/layers/indoors/license_info.json
@@ -0,0 +1,52 @@
+[
+  {
+    "path": "room_auditorium.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_auditorium.svg"
+    ]
+  },
+  {
+    "path": "room_conference.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_conference.svg"
+    ]
+  },
+  {
+    "path": "room_storage.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_storage.svg"
+    ]
+  },
+  {
+    "path": "room_toilet.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_toilet.svg"
+    ]
+  },
+  {
+    "path": "room_toilets.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_toilets.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/indoors/room_auditorium.svg b/assets/layers/indoors/room_auditorium.svg
new file mode 100644
index 0000000000..7c08539433
--- /dev/null
+++ b/assets/layers/indoors/room_auditorium.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg4173"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32"
+   sodipodi:docname="room_auditorium.svg">
+  <defs
+     id="defs4175" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="14.086898"
+     inkscape:cy="17.815466"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4178">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4754">
+      <g
+         transform="matrix(0.99613747,0,0,0.99720502,4.5444389,-15.955572)"
+         id="g4748">
+        <path
+           style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.09307814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 9.5,21 c 2.628314,0.02116 1.84479,0.03572 4,0 2.320666,-0.03846 8.6,-2.2 8.6,-2.2 l 0.9,2.7 -8,2.5 0,8 -7,0 0,-8 -8,-2.5 c -0.00241285,-0.511499 0.9024134,-2.188502 0.9,-2.7 0,0 5.9716863,2.17884 8.6,2.2 z"
+           id="rect4831"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="zsccccccccz" />
+        <circle
+           style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.17889357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4834"
+           cx="11.5"
+           cy="18.5"
+           r="2.5" />
+      </g>
+      <rect
+         y="11.401361"
+         x="10.401361"
+         height="13.197278"
+         width="11.197278"
+         id="rect4752"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.8027218;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760"
+       cx="3"
+       cy="29"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-5"
+       cx="9.5"
+       cy="29"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-9"
+       cx="16"
+       cy="29"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-5-6"
+       cx="22.5"
+       cy="29"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-5-6-4"
+       cx="29"
+       cy="29"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-3"
+       cx="6.2500005"
+       cy="24.9"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-5-2"
+       cx="12.749995"
+       cy="24.9"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-9-5"
+       cx="19.249994"
+       cy="24.9"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-5-6-40"
+       cx="25.749994"
+       cy="24.9"
+       r="2.6152306" />
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_conference.svg b/assets/layers/indoors/room_conference.svg
new file mode 100644
index 0000000000..5ee49fb50e
--- /dev/null
+++ b/assets/layers/indoors/room_conference.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:ns="&amp;#38;ns_ai;"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 32.000002 31.999999"
+   id="svg4200"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_conference.svg">
+  <defs
+     id="defs4202" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="14.135566"
+     inkscape:cy="17.138285"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="878"
+     inkscape:window-x="1672"
+     inkscape:window-y="142"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4205">
+    <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
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(146.08571,-604.92657)">
+    <switch
+       transform="matrix(0.08342024,0,0,0.08342024,-146.7781,604.21864)"
+       id="switch3">
+      <foreignObject
+         requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+         x="0"
+         y="0"
+         width="1"
+         height="1">
+        <ns:pgfRef
+           xlink:href="#adobe_illustrator_pgf" />
+      </foreignObject>
+      <g
+         ns:extraneous="self"
+         id="g5">
+        <g
+           id="g7">
+          <path
+             inkscape:connector-curvature="0"
+             d="m 8.3,193.8 c 0,-47 8.2,-70.5 24.7,-70.5 0.8,0 3.7,1.4 8.7,4.2 5,2.8 11.5,5.6 19.5,8.5 8,2.9 15.9,4.3 23.8,4.3 8.9,0 17.8,-1.5 26.6,-4.6 -0.7,4.9 -1,9.3 -1,13.2 0,18.5 5.4,35.5 16.2,51.1 -21.5,0.7 -39.2,9.2 -52.9,25.6 l -26.8,0 C 36.2,225.6 27,222.9 19.6,217.5 12.1,212.1 8.3,204.2 8.3,193.8 Z m 40.6,-85.4 c -10,-10 -15,-22 -15,-36.1 0,-14.1 5,-26.2 15,-36.1 10,-10 22,-15 36.1,-15 14.1,0 26.1,5 36.1,15 10,10 15,22 15,36.1 0,14.1 -5,26.1 -15,36.1 -10,10 -22,15 -36.1,15 -14.1,-0.1 -26.2,-5 -36.1,-15 z m 10.5,218.8 c 0,-7 0.2,-13.9 0.7,-20.7 0.5,-6.7 1.4,-14 2.8,-21.8 1.4,-7.8 3.2,-15 5.3,-21.7 2.1,-6.7 5,-13.1 8.6,-19.5 3.6,-6.3 7.7,-11.7 12.4,-16.2 4.7,-4.5 10.3,-8 17.1,-10.7 6.7,-2.7 14.1,-4 22.3,-4 1.3,0 4.2,1.4 8.6,4.3 4.4,2.9 9.3,6.1 14.6,9.6 5.3,3.5 12.4,6.7 21.4,9.6 8.9,2.9 17.9,4.3 26.9,4.3 9.1,0 18,-1.4 27,-4.3 8.9,-2.9 16,-6.1 21.4,-9.6 5.3,-3.5 10.2,-6.7 14.6,-9.6 4.4,-2.9 7.3,-4.3 8.6,-4.3 8.1,0 15.5,1.3 22.2,4 6.7,2.7 12.4,6.2 17.1,10.7 4.7,4.5 8.8,9.9 12.4,16.2 3.6,6.3 6.4,12.8 8.6,19.5 2.1,6.7 3.9,13.9 5.3,21.7 1.4,7.8 2.3,15 2.8,21.8 0.5,6.7 0.7,13.6 0.7,20.7 0,16 -4.9,28.6 -14.6,37.8 -9.7,9.2 -22.6,13.9 -38.7,13.9 l -174.8,0 C 96.6,378.9 83.7,374.3 74,365 64.3,355.8 59.4,343.1 59.4,327.2 Z m 86.4,-124.1 c -15,-15 -22.5,-33 -22.5,-54.2 0,-21.2 7.5,-39.2 22.5,-54.2 15,-15 33,-22.5 54.2,-22.5 21.2,0 39.2,7.5 54.2,22.5 15,15 22.5,33 22.5,54.2 0,21.2 -7.5,39.2 -22.5,54.2 -15,15 -33,22.5 -54.2,22.5 -21.2,0 -39.2,-7.5 -54.2,-22.5 z m 133.1,-94.7 c -10,-10 -15,-22 -15,-36.1 0,-14.1 5,-26.2 15,-36.1 10,-10 22,-15 36.1,-15 14.1,0 26.1,5 36.1,15 10,10 15,22 15,36.1 0,14.1 -5,26.1 -15,36.1 -10,10 -22,15 -36.1,15 -14.1,-0.1 -26.2,-5 -36.1,-15 z m -5.6,91.6 c 10.8,-15.6 16.2,-32.6 16.2,-51.1 0,-3.9 -0.3,-8.2 -1,-13.2 8.8,3.1 17.6,4.6 26.6,4.6 7.8,0 15.8,-1.4 23.8,-4.3 8,-2.9 14.5,-5.7 19.5,-8.5 5,-2.8 7.9,-4.2 8.7,-4.2 16.5,0 24.8,23.5 24.8,70.5 0,10.4 -3.7,18.3 -11.2,23.7 -7.5,5.4 -16.7,8.1 -27.6,8.1 l -26.7,0 C 312.5,209.2 294.8,200.7 273.3,200 Z"
+             id="path9" />
+        </g>
+        <g
+           id="g11" />
+        <g
+           id="g13" />
+        <g
+           id="g15" />
+        <g
+           id="g17" />
+        <g
+           id="g19" />
+        <g
+           id="g21" />
+        <g
+           id="g23" />
+        <g
+           id="g25" />
+        <g
+           id="g27" />
+        <g
+           id="g29" />
+        <g
+           id="g31" />
+        <g
+           id="g33" />
+        <g
+           id="g35" />
+        <g
+           id="g37" />
+        <g
+           id="g39" />
+      </g>
+    </switch>
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_storage.svg b/assets/layers/indoors/room_storage.svg
new file mode 100644
index 0000000000..2c6c28308b
--- /dev/null
+++ b/assets/layers/indoors/room_storage.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32.000001"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_storage.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="2.02819 : 21.408131 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="29.366072 : 20.553572 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective4136" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="11.042289"
+     inkscape:cy="16.288516"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:window-maximized="1" />
+  <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
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <g
+       id="g4258"
+       transform="matrix(0.94281928,0,0,0.94554288,0.86460524,57.025384)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect4202"
+         d="m 0.469,1025.7313 15.061954,7.0999 0,19.0619 L 0.469,1044.7932 Z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.93809158;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect4202-9"
+         d="m 31.530977,1025.7603 -15.061954,7.0999 0,19.0619 15.061954,-7.0999 z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.93809158;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect4202-97"
+         d="m 16,1019.3222 14.931,5.8 -14.931,7.0003 -14.831,-7.0003 z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.93809158;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4254"
+         d="m 11.234,1021.1362 -4.08,1.577 15.660453,7.0348 -0.08984,6.9312 3.425782,-1.696 -0.02734,-7.3191 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.29999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_toilet.svg b/assets/layers/indoors/room_toilet.svg
new file mode 100644
index 0000000000..e41fc9954c
--- /dev/null
+++ b/assets/layers/indoors/room_toilet.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_toilets.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="876"
+     inkscape:window-width="1440"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.65172414"
+     inkscape:cx="6.525895"
+     inkscape:cy="381.49096"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective2441" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_z="60 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       viewBox="244.5 110 489 219.9"
+       id="symbol-university">
+      <path
+         id="path4460"
+         d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" />
+      <path
+         id="path4462"
+         d="M94,176l-21,39"
+         stroke-width="20"
+         stroke="#000000"
+         fill="none" />
+      <path
+         id="path4464"
+         d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" />
+      <path
+         id="path4466"
+         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
+         stroke-width="20"
+         stroke="#000000"
+         ill="none" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_z="12 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect4134"
+       width="10"
+       height="10"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect4136"
+       width="8"
+       height="8"
+       x="2"
+       y="2" />
+  </g>
+  <path
+     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3"
+     d="M 282.64529,512.4583 L 318.45711,512.4583 L 318.45711,61.17178 L 282.64529,61.17178 L 282.64529,512.4583 z M 174.96393,143.59872 L 102.68057,143.59872 C 91.409786,143.59908 81.273089,147.65375 72.270419,155.76278 C 65.507937,162.05819 61.006552,169.04048 58.766246,176.7097 L 27.675745,280.06296 C 26.782291,282.3173 26.335581,284.34465 26.335632,286.14498 C 26.335581,296.50868 31.510451,301.69043 41.860261,301.69023 C 49.076158,301.69043 53.811209,297.63574 56.065415,289.52617 L 84.434463,194.93518 L 99.959105,194.93518 L 53.343962,363.14964 L 98.618995,363.14964 L 98.618995,494.21221 C 98.61888,505.92269 104.24733,511.77792 115.50436,511.77794 C 126.76111,511.77792 132.38957,505.92269 132.38972,494.21221 L 132.38972,362.4899 L 149.29569,362.4899 L 149.29569,494.89257 C 149.29553,506.14948 154.92397,511.77792 166.18106,511.77794 C 177.43776,511.77792 183.06622,506.14948 183.06641,494.89257 L 183.06641,363.14964 L 228.32083,363.14964 L 181.04594,194.93518 L 197.25095,194.93518 L 225.62,289.52617 C 227.87388,297.63574 232.60206,301.69043 239.80454,301.69023 C 250.16776,301.69043 255.34951,296.50868 255.34978,286.14498 C 255.34951,283.89107 254.9028,281.86372 254.00968,280.06296 L 222.91917,176.7097 C 220.66479,169.49405 215.48992,162.51175 207.39454,155.76278 C 197.4844,147.65375 186.6742,143.59908 174.96393,143.59872 L 174.96393,143.59872 z M 140.51284,136.15597 C 150.86243,136.15632 159.64183,132.55522 166.85111,125.35263 C 174.06002,118.1508 177.66455,109.59472 177.66475,99.68441 C 177.66455,89.32131 174.06002,80.53845 166.85111,73.33581 C 159.64183,66.13403 150.86243,62.53293 140.51284,62.5325 C 130.60277,62.53293 122.04326,66.13403 114.8343,73.33581 C 107.62508,80.53845 104.02054,89.32131 104.02065,99.68441 C 104.02054,109.59472 107.62508,118.1508 114.8343,125.35263 C 122.04326,132.55522 130.60277,136.15632 140.51284,136.15597 L 140.51284,136.15597 z M 456.528,135.49621 C 466.43739,135.49658 474.9969,131.89203 482.20653,124.68258 C 489.41507,117.47387 493.01961,108.91436 493.02017,99.00405 C 493.01961,88.65469 489.41507,79.98867 482.20653,73.00595 C 474.9969,66.02408 466.43739,62.53293 456.528,62.5325 C 446.61756,62.53293 438.06149,66.02408 430.85977,73.00595 C 423.65706,79.98867 420.05596,88.65469 420.05644,99.00405 C 420.05596,108.91436 423.65706,117.47387 430.85977,124.68258 C 438.06149,131.89203 446.61756,135.49658 456.528,135.49621 L 456.528,135.49621 z M 504.50386,142.91837 L 407.89239,142.91837 C 394.83447,142.9187 383.68753,147.53693 374.45153,156.77301 C 365.21467,166.00978 360.59646,177.3835 360.59688,190.89423 L 360.59688,303.03034 C 360.59646,313.8476 365.55141,319.25613 375.46177,319.25595 C 384.91767,319.25613 389.64585,313.8476 389.64631,303.03034 L 389.64631,193.59506 L 407.21203,193.59506 L 407.21203,490.85163 C 407.21155,504.36266 413.96707,511.11818 427.47858,511.1182 C 440.98911,511.11818 447.74462,504.36266 447.74513,490.85163 L 447.74513,318.57559 L 465.31086,318.57559 L 465.31086,490.85163 C 465.31033,504.36266 472.06584,511.11818 485.57741,511.1182 C 499.54147,511.11818 506.52377,504.36266 506.52433,490.85163 L 506.52433,193.59506 L 523.4097,193.59506 L 523.4097,303.03034 C 523.40911,314.28743 528.13728,319.91587 537.59423,319.91571 C 547.06371,319.91587 551.79875,314.28743 551.79936,303.03034 L 551.79936,191.55397 C 551.79875,178.49682 547.40733,167.12653 538.62508,157.44307 C 529.84162,147.76028 518.4679,142.9187 504.50386,142.91837 L 504.50386,142.91837 z"
+     id="flowRoot3192"
+     sodipodi:nodetypes="ccccccccccssccccccsccccsccccccssccccccssssssscccsccssscccccsccsccccsccccsccccsccccc" />
+</svg>
diff --git a/assets/layers/indoors/room_toilets.svg b/assets/layers/indoors/room_toilets.svg
new file mode 100644
index 0000000000..e41fc9954c
--- /dev/null
+++ b/assets/layers/indoors/room_toilets.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_toilets.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="876"
+     inkscape:window-width="1440"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.65172414"
+     inkscape:cx="6.525895"
+     inkscape:cy="381.49096"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective2441" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_z="60 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       viewBox="244.5 110 489 219.9"
+       id="symbol-university">
+      <path
+         id="path4460"
+         d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" />
+      <path
+         id="path4462"
+         d="M94,176l-21,39"
+         stroke-width="20"
+         stroke="#000000"
+         fill="none" />
+      <path
+         id="path4464"
+         d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" />
+      <path
+         id="path4466"
+         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
+         stroke-width="20"
+         stroke="#000000"
+         ill="none" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_z="12 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect4134"
+       width="10"
+       height="10"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect4136"
+       width="8"
+       height="8"
+       x="2"
+       y="2" />
+  </g>
+  <path
+     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3"
+     d="M 282.64529,512.4583 L 318.45711,512.4583 L 318.45711,61.17178 L 282.64529,61.17178 L 282.64529,512.4583 z M 174.96393,143.59872 L 102.68057,143.59872 C 91.409786,143.59908 81.273089,147.65375 72.270419,155.76278 C 65.507937,162.05819 61.006552,169.04048 58.766246,176.7097 L 27.675745,280.06296 C 26.782291,282.3173 26.335581,284.34465 26.335632,286.14498 C 26.335581,296.50868 31.510451,301.69043 41.860261,301.69023 C 49.076158,301.69043 53.811209,297.63574 56.065415,289.52617 L 84.434463,194.93518 L 99.959105,194.93518 L 53.343962,363.14964 L 98.618995,363.14964 L 98.618995,494.21221 C 98.61888,505.92269 104.24733,511.77792 115.50436,511.77794 C 126.76111,511.77792 132.38957,505.92269 132.38972,494.21221 L 132.38972,362.4899 L 149.29569,362.4899 L 149.29569,494.89257 C 149.29553,506.14948 154.92397,511.77792 166.18106,511.77794 C 177.43776,511.77792 183.06622,506.14948 183.06641,494.89257 L 183.06641,363.14964 L 228.32083,363.14964 L 181.04594,194.93518 L 197.25095,194.93518 L 225.62,289.52617 C 227.87388,297.63574 232.60206,301.69043 239.80454,301.69023 C 250.16776,301.69043 255.34951,296.50868 255.34978,286.14498 C 255.34951,283.89107 254.9028,281.86372 254.00968,280.06296 L 222.91917,176.7097 C 220.66479,169.49405 215.48992,162.51175 207.39454,155.76278 C 197.4844,147.65375 186.6742,143.59908 174.96393,143.59872 L 174.96393,143.59872 z M 140.51284,136.15597 C 150.86243,136.15632 159.64183,132.55522 166.85111,125.35263 C 174.06002,118.1508 177.66455,109.59472 177.66475,99.68441 C 177.66455,89.32131 174.06002,80.53845 166.85111,73.33581 C 159.64183,66.13403 150.86243,62.53293 140.51284,62.5325 C 130.60277,62.53293 122.04326,66.13403 114.8343,73.33581 C 107.62508,80.53845 104.02054,89.32131 104.02065,99.68441 C 104.02054,109.59472 107.62508,118.1508 114.8343,125.35263 C 122.04326,132.55522 130.60277,136.15632 140.51284,136.15597 L 140.51284,136.15597 z M 456.528,135.49621 C 466.43739,135.49658 474.9969,131.89203 482.20653,124.68258 C 489.41507,117.47387 493.01961,108.91436 493.02017,99.00405 C 493.01961,88.65469 489.41507,79.98867 482.20653,73.00595 C 474.9969,66.02408 466.43739,62.53293 456.528,62.5325 C 446.61756,62.53293 438.06149,66.02408 430.85977,73.00595 C 423.65706,79.98867 420.05596,88.65469 420.05644,99.00405 C 420.05596,108.91436 423.65706,117.47387 430.85977,124.68258 C 438.06149,131.89203 446.61756,135.49658 456.528,135.49621 L 456.528,135.49621 z M 504.50386,142.91837 L 407.89239,142.91837 C 394.83447,142.9187 383.68753,147.53693 374.45153,156.77301 C 365.21467,166.00978 360.59646,177.3835 360.59688,190.89423 L 360.59688,303.03034 C 360.59646,313.8476 365.55141,319.25613 375.46177,319.25595 C 384.91767,319.25613 389.64585,313.8476 389.64631,303.03034 L 389.64631,193.59506 L 407.21203,193.59506 L 407.21203,490.85163 C 407.21155,504.36266 413.96707,511.11818 427.47858,511.1182 C 440.98911,511.11818 447.74462,504.36266 447.74513,490.85163 L 447.74513,318.57559 L 465.31086,318.57559 L 465.31086,490.85163 C 465.31033,504.36266 472.06584,511.11818 485.57741,511.1182 C 499.54147,511.11818 506.52377,504.36266 506.52433,490.85163 L 506.52433,193.59506 L 523.4097,193.59506 L 523.4097,303.03034 C 523.40911,314.28743 528.13728,319.91587 537.59423,319.91571 C 547.06371,319.91587 551.79875,314.28743 551.79936,303.03034 L 551.79936,191.55397 C 551.79875,178.49682 547.40733,167.12653 538.62508,157.44307 C 529.84162,147.76028 518.4679,142.9187 504.50386,142.91837 L 504.50386,142.91837 z"
+     id="flowRoot3192"
+     sodipodi:nodetypes="ccccccccccssccccccsccccsccccccssccccccssssssscccsccssscccccsccsccccsccccsccccsccccc" />
+</svg>