diff --git a/css/gpxedit.css b/css/gpxedit.css
index 6b8bd93..fea915f 100644
--- a/css/gpxedit.css
+++ b/css/gpxedit.css
@@ -459,6 +459,7 @@ input[type=checkbox]
 .leaflet-div-icon2
 {
     background-image: url('images/pinblue.png') !important;
+    background-repeat: no-repeat !important;
     width: 21px !important;
     height: 30px !important;
 }
@@ -466,32 +467,96 @@ input[type=checkbox]
 .leaflet-marker-blue
 {
     background-image: url('images/marker-icon.png') !important;
+    background-repeat: no-repeat !important;
     width: 25px !important;
     height: 41px !important;
 }
 
 .leaflet-marker-red
 {
-    background-image: url('images/marker-icon-red.png');
+    background-image: url('images/marker-icon-red.png') !important;
+    background-repeat: no-repeat !important;
     width: 25px !important;
     height: 41px !important;
 }
-.flag-blue
-{
+.flag-blue, .flag-red, .flag-green{
+    background-repeat: no-repeat !important;
+    width: 18px !important;
+    height: 25px !important;
+}
+.flag-blue{
     background-image: url('images/symbols/flag-blue.png') !important;
-    width: 18px !important;
-    height: 25px !important;
 }
-.flag-red
-{
+.flag-red{
     background-image: url('images/symbols/flag-red.png') !important;
-    width: 18px !important;
-    height: 25px !important;
 }
-.flag-green
-{
+.flag-green{
     background-image: url('images/symbols/flag-green.png') !important;
+}
+.diamond-blue, .diamond-red, .diamond-green{
+    background-size: 18px 18px !important;
+    background-repeat: no-repeat !important;
     width: 18px !important;
+    height: 18px !important;
+}
+.diamond-blue{
+    background-image: url('images/symbols/diamond-blue.png') !important;
+}
+.diamond-green{
+    background-image: url('images/symbols/diamond-green.png') !important;
+}
+.diamond-red{
+    background-image: url('images/symbols/diamond-red.png') !important;
+}
+.block-blue, .block-red, .block-green{
+    background-size: 16px 16px !important;
+    background-repeat: no-repeat !important;
+    width: 16px !important;
+    height: 16px !important;
+}
+.block-blue{
+    background-image: url('images/symbols/block-blue.png') !important;
+}
+.block-green{
+    background-image: url('images/symbols/block-green.png') !important;
+}
+.block-red{
+    background-image: url('images/symbols/block-red.png') !important;
+}
+.pin-blue, .pin-red, .pin-green{
+    background-size: 21px 30px !important;
+    background-repeat: no-repeat !important;
+    width: 21px !important;
+    height: 30px !important;
+}
+.pin-blue{
+    background-image: url('images/symbols/pin-blue.png') !important;
+}
+.pin-green{
+    background-image: url('images/symbols/pin-green.png') !important;
+}
+.pin-red{
+    background-image: url('images/symbols/pin-red.png') !important;
+}
+.bike-trail{
+    background-image: url('images/symbols/bike-trail.png') !important;
+    background-size: 24px 24px !important;
+    background-repeat: no-repeat !important;
+    width: 24px !important;
+    height: 24px !important;
+}
+.bar{
+    background-image: url('images/symbols/bar.png') !important;
+    background-size: 20px 24px !important;
+    background-repeat: no-repeat !important;
+    width: 20px !important;
+    height: 24px !important;
+}
+.skullcross{
+    background-image: url('images/symbols/skullcross.png') !important;
+    background-size: 25px 25px !important;
+    background-repeat: no-repeat !important;
+    width: 25px !important;
     height: 25px !important;
 }
 /*
diff --git a/css/images/symbols/bar.png b/css/images/symbols/bar.png
new file mode 100644
index 0000000..720ad31
Binary files /dev/null and b/css/images/symbols/bar.png differ
diff --git a/css/images/symbols/bike-trail.png b/css/images/symbols/bike-trail.png
new file mode 100644
index 0000000..52b2517
Binary files /dev/null and b/css/images/symbols/bike-trail.png differ
diff --git a/css/images/symbols/block-blue.png b/css/images/symbols/block-blue.png
new file mode 100644
index 0000000..c7d9f52
Binary files /dev/null and b/css/images/symbols/block-blue.png differ
diff --git a/css/images/symbols/block-green.png b/css/images/symbols/block-green.png
new file mode 100644
index 0000000..f4a7ed0
Binary files /dev/null and b/css/images/symbols/block-green.png differ
diff --git a/css/images/symbols/block-red.png b/css/images/symbols/block-red.png
new file mode 100644
index 0000000..0d3627e
Binary files /dev/null and b/css/images/symbols/block-red.png differ
diff --git a/css/images/symbols/diamond-blue.png b/css/images/symbols/diamond-blue.png
new file mode 100644
index 0000000..8f4448c
Binary files /dev/null and b/css/images/symbols/diamond-blue.png differ
diff --git a/css/images/symbols/diamond-green.png b/css/images/symbols/diamond-green.png
new file mode 100644
index 0000000..8603258
Binary files /dev/null and b/css/images/symbols/diamond-green.png differ
diff --git a/css/images/symbols/diamond-red.png b/css/images/symbols/diamond-red.png
new file mode 100644
index 0000000..2ae30c9
Binary files /dev/null and b/css/images/symbols/diamond-red.png differ
diff --git a/css/images/symbols/pin-blue.png b/css/images/symbols/pin-blue.png
new file mode 100644
index 0000000..56194f4
Binary files /dev/null and b/css/images/symbols/pin-blue.png differ
diff --git a/css/images/symbols/pin-green.png b/css/images/symbols/pin-green.png
new file mode 100644
index 0000000..9a5d3e9
Binary files /dev/null and b/css/images/symbols/pin-green.png differ
diff --git a/css/images/symbols/pin-red.png b/css/images/symbols/pin-red.png
new file mode 100644
index 0000000..51e95dd
Binary files /dev/null and b/css/images/symbols/pin-red.png differ
diff --git a/css/images/symbols/skullcross.png b/css/images/symbols/skullcross.png
new file mode 100644
index 0000000..3fe7556
Binary files /dev/null and b/css/images/symbols/skullcross.png differ
diff --git a/js/gpxedit.js b/js/gpxedit.js
index 476166a..f37efd9 100644
--- a/js/gpxedit.js
+++ b/js/gpxedit.js
@@ -11,6 +11,21 @@ var gpxedit = {
 };
 
 var symbolIcons = {
+    'Dot, White': L.divIcon({
+            iconSize:L.point(7,7),
+    }),
+    'Pin, Blue': L.divIcon({
+        className: 'pin-blue',
+        iconAnchor: [5, 30]
+    }),
+    'Pin, Green': L.divIcon({
+        className: 'pin-green',
+        iconAnchor: [5, 30]
+    }),
+    'Pin, Red': L.divIcon({
+        className: 'pin-red',
+        iconAnchor: [5, 30]
+    }),
     'Flag, Green': L.divIcon({
         className: 'flag-green',
         iconAnchor: [1, 25]
@@ -23,6 +38,42 @@ var symbolIcons = {
         className: 'flag-blue',
         iconAnchor: [1, 25]
     }),
+    'Block, Blue': L.divIcon({
+        className: 'block-blue',
+        iconAnchor: [8, 8]
+    }),
+    'Block, Green': L.divIcon({
+        className: 'block-green',
+        iconAnchor: [8, 8]
+    }),
+    'Block, Red': L.divIcon({
+        className: 'block-red',
+        iconAnchor: [8, 8]
+    }),
+    'Blue Diamond': L.divIcon({
+        className: 'diamond-blue',
+        iconAnchor: [9, 9]
+    }),
+    'Green Diamond': L.divIcon({
+        className: 'diamond-green',
+        iconAnchor: [9, 9]
+    }),
+    'Red Diamond': L.divIcon({
+        className: 'diamond-red',
+        iconAnchor: [9, 9]
+    }),
+    'Bike Trail': L.divIcon({
+        className: 'bike-trail',
+        iconAnchor: [12, 12]
+    }),
+    'Bar': L.divIcon({
+        className: 'bar',
+        iconAnchor: [10, 12]
+    }),
+    'Skull and Crossbones': L.divIcon({
+        className: 'skullcross',
+        iconAnchor: [12, 12]
+    }),
 }
 
 function load_map() {