diff --git a/css/gpxedit.css b/css/gpxedit.css
index 2b54175..2424ef4 100644
--- a/css/gpxedit.css
+++ b/css/gpxedit.css
@@ -605,6 +605,28 @@ input[type=checkbox]
     background: url('images/symbols/medical.png') no-repeat right 8px center rgba(240, 240, 240, 0.90);
     background-size: 24px 20px;
 }
+.residence{
+    background-image: url('images/symbols/residence.png') !important;
+    background-size: 24px 24px !important;
+    background-repeat: no-repeat !important;
+    width: 24px !important;
+    height: 24px !important;
+}
+.residence-select{
+    background: url('images/symbols/residence.png') no-repeat right 8px center rgba(240, 240, 240, 0.90);
+    background-size: 20px 20px;
+}
+.drinking-water{
+    background-image: url('images/symbols/drinking-water.png') !important;
+    background-size: 24px 24px !important;
+    background-repeat: no-repeat !important;
+    width: 24px !important;
+    height: 24px !important;
+}
+.drinking-water-select{
+    background: url('images/symbols/drinking-water.png') no-repeat right 8px center rgba(240, 240, 240, 0.90);
+    background-size: 20px 20px;
+}
 .campground{
     background-image: url('images/symbols/campground.png') !important;
     background-size: 24px 24px !important;
diff --git a/css/gpxvcomp.css b/css/gpxvcomp.css
deleted file mode 100644
index 9d3e982..0000000
--- a/css/gpxvcomp.css
+++ /dev/null
@@ -1,125 +0,0 @@
-html {
-    min-height: 100%;
-    position: relative;
-}
-
-body {
-    margin: 0;
-    width: 100%;
-    height: 100%;
-}
-
-div#map {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    width: 100%;
-}
-
-div#parameters {
-    font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-    color: black;
-    font-size: 75%;
-    background-color: white;
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    width: 300px;
-    height: 100%;
-    padding: 10px;
-    z-index: 5;
-}
-
-#gpxselect {
-    width:100%;
-}
-
-div#logo, div#logo img {
-    height:100px;
-}
-div#logo {
-    background-image: url('images/gpxvcomp.png');
-    width: 125px;
-    background-size: 125px 100px;
-    background-repeat: no-repeat;
-    margin: auto;
-}
-h1.sectiontitle{
-    font-size: 18px;
-    font-weight: bold;
-}
-h3.sectiontitle{
-    font-size: 16px;
-    font-weight: bold;
-}
-
-ul,hr {
-    margin-top : 3px;
-    margin-bottom : 3px;
-}
-h3 {
-    margin-top : 5px;
-    margin-bottom : 5px;
-}
-
-.uibutton {
-    font-size: 13px;
-    height : 28px;
-}
-#help ul, .trackpairlist{
-    list-style-type:disc;
-}
-.activeArea{
-    position: absolute;
-    top: 10px;
-    left: 450px;
-    right: 10px;
-    bottom: 10px;
-}
-
-#stattable{
-    word-wrap: break-word;
-    white-space: normal;
-    border-radius: 7px;
-}
-#stattable tr:first-child th:first-child
-{
-    border-top-left-radius: 7px;
-}
-#stattable tr:first-child th:last-child
-{
-    border-top-right-radius: 7px;
-}
-#stattable tr:last-child td:first-child
-{
-    border-bottom-left-radius: 7px;
-}
-#stattable tr:last-child td:last-child
-{
-    border-bottom-right-radius: 7px;
-}
-
-#stattable th, #stattable td {
-    border: 1px solid grey;
-    max-width: 100px;
-}
-
-div#statdiv{
-    overflow:scroll;
-}
-#stattable td.normal{
-    background-color: white;
-}
-td.selectedColumn{
-    background-color: #FFE464;
-}
-#stattable td.statnamecol {
-    background-color: #E6EEEE;
-}
-
-/* adapt right leaflet controls when sidebar pushes them */
-@media screen and (max-width: 767px) {
-    .leaflet-right { right:40px; }
-}
diff --git a/css/images/symbols/dot.png b/css/images/symbols/dot.png
new file mode 100644
index 0000000..f453b5a
Binary files /dev/null and b/css/images/symbols/dot.png differ
diff --git a/css/images/symbols/drinking-water.png b/css/images/symbols/drinking-water.png
new file mode 100644
index 0000000..c05a7ee
Binary files /dev/null and b/css/images/symbols/drinking-water.png differ
diff --git a/css/images/symbols/residence.png b/css/images/symbols/residence.png
new file mode 100644
index 0000000..2910c8a
Binary files /dev/null and b/css/images/symbols/residence.png differ
diff --git a/js/gpxedit.js b/js/gpxedit.js
index a67231a..f96763d 100644
--- a/js/gpxedit.js
+++ b/js/gpxedit.js
@@ -25,6 +25,8 @@ var symbolSelectClasses = {
     'Blue Diamond': 'diamond-blue-select',
     'Green Diamond': 'diamond-green-select',
     'Red Diamond': 'diamond-red-select',
+    'Residence': 'residence-select',
+    'Drinking Water': 'drinking-water-select',
     'Trail Head': 'hike-select',
     'Bike Trail': 'bike-trail-select',
     'Campground': 'campground-select',
@@ -91,6 +93,14 @@ var symbolIcons = {
         className: 'diamond-red',
         iconAnchor: [9, 9]
     }),
+    'Residence': L.divIcon({
+        className: 'residence',
+        iconAnchor: [12, 12]
+    }),
+    'Drinking Water': L.divIcon({
+        className: 'drinking-water',
+        iconAnchor: [12, 12]
+    }),
     'Trail Head': L.divIcon({
         className: 'hike',
         iconAnchor: [12, 12]