diff --git a/module/assets/img/icons.png b/module/assets/img/icons.png
new file mode 100644
index 0000000..9e3b30b
Binary files /dev/null and b/module/assets/img/icons.png differ
diff --git a/module/assets/img/vectors.png b/module/assets/img/vectors.png
new file mode 100644
index 0000000..27a4b91
Binary files /dev/null and b/module/assets/img/vectors.png differ
diff --git a/module/dca/tl_leaflet_icon.php b/module/dca/tl_leaflet_icon.php
index 2e19062..5fd1e28 100644
--- a/module/dca/tl_leaflet_icon.php
+++ b/module/dca/tl_leaflet_icon.php
@@ -37,6 +37,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
                 'icon'                => 'system/modules/leaflet/assets/img/leaflet.png',
                 'attributes'          => 'onclick="Backend.getScrollOffset();" accesskey="m"'
             ),
+            'layers' => array
+            (
+                'label'               => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['layersBtn'],
+                'href'                => 'table=tl_leaflet_layer',
+                'icon'                => 'system/modules/leaflet/assets/img/layers.png',
+                'attributes'          => 'onclick="Backend.getScrollOffset();" accesskey="e"'
+            ),
             'all' => array
             (
                 'label'               => &$GLOBALS['TL_LANG']['MSC']['all'],
diff --git a/module/dca/tl_leaflet_layer.php b/module/dca/tl_leaflet_layer.php
index 0fd83ae..f7f37f9 100644
--- a/module/dca/tl_leaflet_layer.php
+++ b/module/dca/tl_leaflet_layer.php
@@ -38,6 +38,13 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
                 'icon'                => 'system/modules/leaflet/assets/img/leaflet.png',
                 'attributes'          => 'onclick="Backend.getScrollOffset();" accesskey="m"'
             ),
+            'icons' => array
+            (
+                'label'               => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'],
+                'href'                => 'table=tl_leaflet_icon',
+                'icon'                => 'system/modules/leaflet/assets/img/icons.png',
+                'attributes'          => 'onclick="Backend.getScrollOffset();" accesskey="e"'
+            ),
             'all' => array
             (
                 'label'               => &$GLOBALS['TL_LANG']['MSC']['all'],
diff --git a/module/dca/tl_leaflet_map.php b/module/dca/tl_leaflet_map.php
index 75c82f9..6851c8e 100644
--- a/module/dca/tl_leaflet_map.php
+++ b/module/dca/tl_leaflet_map.php
@@ -41,7 +41,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
             (
                 'label'               => &$GLOBALS['TL_LANG']['tl_leaflet_map']['icons'],
                 'href'                => 'table=tl_leaflet_icon',
-                'icon'                => 'system/modules/leaflet/assets/img/layers.png',
+                'icon'                => 'system/modules/leaflet/assets/img/icons.png',
                 'attributes'          => 'onclick="Backend.getScrollOffset();" accesskey="e"'
             ),
             'all' => array
diff --git a/module/dca/tl_leaflet_marker.php b/module/dca/tl_leaflet_marker.php
index 5074968..a446fc2 100644
--- a/module/dca/tl_leaflet_marker.php
+++ b/module/dca/tl_leaflet_marker.php
@@ -209,6 +209,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
             'eval'      => array(
                  'mandatory'  => true,
                  'tl_class'   => 'w50',
+                 'chosen'     => true,
             ),
             'sql'       => "int(10) unsigned NOT NULL default '0'",
         ),
diff --git a/module/languages/en/leaflet_layer.php b/module/languages/en/leaflet_layer.php
index 75ea2cb..196938c 100644
--- a/module/languages/en/leaflet_layer.php
+++ b/module/languages/en/leaflet_layer.php
@@ -4,3 +4,5 @@ $GLOBALS['TL_LANG']['leaflet_layer']['provider'][0] = 'Leaflet provider';
 $GLOBALS['TL_LANG']['leaflet_layer']['provider'][1] = 'Leaflet tile provider';
 $GLOBALS['TL_LANG']['leaflet_layer']['group'][0]    = 'Layer group';
 $GLOBALS['TL_LANG']['leaflet_layer']['group'][1]    = 'Layers group';
+$GLOBALS['TL_LANG']['leaflet_layer']['markers'][0]  = 'Markers';
+$GLOBALS['TL_LANG']['leaflet_layer']['markers'][1]  = 'Marker collection';
diff --git a/module/languages/en/tl_leaflet_layer.php b/module/languages/en/tl_leaflet_layer.php
index f05acc8..f8074e0 100644
--- a/module/languages/en/tl_leaflet_layer.php
+++ b/module/languages/en/tl_leaflet_layer.php
@@ -5,6 +5,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_layer']['active_legend'] = 'Activation';
 
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['map'][0]    = 'Manage maps';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['map'][1]    = 'Manage leaflet maps';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'][0]  = 'Manage icons';
+$GLOBALS['TL_LANG']['tl_leaflet_layer']['icons'][1]  = 'Manage marker icons.';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['new'][0]    = 'Create layer';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['new'][1]    = 'Create new layer';
 $GLOBALS['TL_LANG']['tl_leaflet_layer']['edit'][0]   = 'Edit layer';
diff --git a/module/languages/en/tl_leaflet_map.php b/module/languages/en/tl_leaflet_map.php
index 03fa772..93906ff 100644
--- a/module/languages/en/tl_leaflet_map.php
+++ b/module/languages/en/tl_leaflet_map.php
@@ -17,6 +17,8 @@ $GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][0]               = 'Copy map';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][1]               = 'Copy map ID %s';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][0]           = 'Manage controls';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][1]           = 'Manage controls of map ID %s';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['icons'][0]              = 'Manage icons';
+$GLOBALS['TL_LANG']['tl_leaflet_map']['icons'][1]              = 'Manage marker icons.';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][0]             = 'Delete map';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][1]             = 'Delete map ID %s';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['show'][0]               = 'Show details';
diff --git a/module/templates/be_leaflet_geocode.html5 b/module/templates/be_leaflet_geocode.html5
index 89e0b9a..d02c816 100644
--- a/module/templates/be_leaflet_geocode.html5
+++ b/module/templates/be_leaflet_geocode.html5
@@ -1,8 +1,8 @@
-<?php $GLOBALS['TL_CSS'][] = 'http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css'; ?>
-<?php $GLOBALS['TL_CSS'][] = 'system/modules/leaflet/assets/leaflet/control-geocoder/Control.Geocoder.css'; ?>
+<?php $GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/leaflet/leaflet.css'; ?>
+<?php $GLOBALS['TL_CSS'][] = 'assets/leaflet/libs/control-geocoder/Control.Geocoder.css'; ?>
 
-<?php $GLOBALS['TL_JAVASCRIPT'][] = 'http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js'; ?>
-<?php $GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/leaflet/assets/leaflet/control-geocoder/Control.Geocoder.js'; ?>
+<?php $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/libs/leaflet/leaflet.js'; ?>
+<?php $GLOBALS['TL_JAVASCRIPT'][] = 'assets/leaflet/libs/control-geocoder/Control.Geocoder.js'; ?>
 
 <div id="map_<?php echo $this->field; ?>" style="margin-top: 5px; width: 670px; height: 300px"></div>
 <script>