diff --git a/dist/leaflet.awesome-markers.js b/dist/leaflet.awesome-markers.js
index da84e72b6..9e5b547d3 100644
--- a/dist/leaflet.awesome-markers.js
+++ b/dist/leaflet.awesome-markers.js
@@ -20,7 +20,7 @@ L.AwesomeMarkers.Icon = L.Icon.extend({
     iconAnchor:   [17, 42],
     popupAnchor: [1, -32],
     shadowAnchor: [10, 12],
-    icon: 'icon-font', // All the font-awesome icons are possible
+    icon: 'font', // All the font-awesome icons are possible
     shadowSize: [36, 16],
     className: 'awesome-marker',
     color: 'blue' // red, orange, green, blue, purple
@@ -48,7 +48,7 @@ L.AwesomeMarkers.Icon = L.Icon.extend({
   },
 
   _createInner: function() {
-    return "<i class='" + this.options.icon + "'></i>";
+    return "<i class='icon-" + this.options.icon + "'></i>";
   },
 
   _setIconStyles: function (img, name) {
diff --git a/examples/basic-example.html b/examples/basic-example.html
index 9975671b4..fe04ef9e7 100644
--- a/examples/basic-example.html
+++ b/examples/basic-example.html
@@ -27,19 +27,19 @@
       key: 'BC9A493B41014CAABB98F0471D759707'
     }).addTo(map);
 
-    L.marker([51.941196,4.512291], {icon: L.AwesomeMarkers.icon({icon: 'icon-coffee', color: 'red'}) }).addTo(map);
-    L.marker([51.927913,4.521303], {icon: L.AwesomeMarkers.icon({icon: 'icon-coffee', color: 'red'}) }).addTo(map);
-    L.marker([51.936063,4.502077], {icon: L.AwesomeMarkers.icon({icon: 'icon-food', color: 'purple'}) }).addTo(map);
-    L.marker([51.932835,4.506969], {icon: L.AwesomeMarkers.icon({icon: 'icon-glass', color: 'green'}) }).addTo(map);
-    L.marker([51.930295,4.515209], {icon: L.AwesomeMarkers.icon({icon: 'icon-shopping-cart', color: 'blue'}) }).addTo(map);
-    L.marker([51.930083,4.507742], {icon: L.AwesomeMarkers.icon({icon: 'icon-comments', color: 'orange'}) }).addTo(map);
+    L.marker([51.941196,4.512291], {icon: L.AwesomeMarkers.icon({icon: 'coffee', color: 'red'}) }).addTo(map);
+    L.marker([51.927913,4.521303], {icon: L.AwesomeMarkers.icon({icon: 'coffee', color: 'red'}) }).addTo(map);
+    L.marker([51.936063,4.502077], {icon: L.AwesomeMarkers.icon({icon: 'food', color: 'purple'}) }).addTo(map);
+    L.marker([51.932835,4.506969], {icon: L.AwesomeMarkers.icon({icon: 'glass', color: 'green'}) }).addTo(map);
+    L.marker([51.930295,4.515209], {icon: L.AwesomeMarkers.icon({icon: 'shopping-cart', color: 'blue'}) }).addTo(map);
+    L.marker([51.930083,4.507742], {icon: L.AwesomeMarkers.icon({icon: 'comments', color: 'orange'}) }).addTo(map);
 
-    L.marker([51.930454,4.527054], {icon: L.AwesomeMarkers.icon({icon: 'icon-group', color: 'darkred'}) }).addTo(map);
-    L.marker([51.929607,4.527054], {icon: L.AwesomeMarkers.icon({icon: 'icon-arrow-right', color: 'darkblue'}) }).addTo(map);
-    L.marker([51.928919,4.528856], {icon: L.AwesomeMarkers.icon({icon: 'icon-twitter', color: 'cadetblue'}) }).addTo(map);
-    L.marker([51.930295,4.530745], {icon: L.AwesomeMarkers.icon({icon: 'icon-phone', color: 'darkpurple'}) }).addTo(map);
-    L.marker([51.925055,4.512806], {icon: L.AwesomeMarkers.icon({icon: 'icon-ambulance', color: 'darkgreen'}) }).addTo(map);
-    L.marker([51.925902,4.505768], {icon: L.AwesomeMarkers.icon({icon: 'icon-medkit', color: 'darkblue'}) }).addTo(map);
+    L.marker([51.930454,4.527054], {icon: L.AwesomeMarkers.icon({icon: 'group', color: 'darkred'}) }).addTo(map);
+    L.marker([51.929607,4.527054], {icon: L.AwesomeMarkers.icon({icon: 'arrow-right', color: 'darkblue'}) }).addTo(map);
+    L.marker([51.928919,4.528856], {icon: L.AwesomeMarkers.icon({icon: 'twitter', color: 'cadetblue'}) }).addTo(map);
+    L.marker([51.930295,4.530745], {icon: L.AwesomeMarkers.icon({icon: 'phone', color: 'darkpurple'}) }).addTo(map);
+    L.marker([51.925055,4.512806], {icon: L.AwesomeMarkers.icon({icon: 'ambulance', color: 'darkgreen'}) }).addTo(map);
+    L.marker([51.925902,4.505768], {icon: L.AwesomeMarkers.icon({icon: 'medkit', color: 'darkblue'}) }).addTo(map);
   </script>
 </body>
 </html>
diff --git a/examples/random-markers.html b/examples/random-markers.html
index 3f5f043df..3027a4119 100644
--- a/examples/random-markers.html
+++ b/examples/random-markers.html
@@ -29,7 +29,7 @@
 
     var colors = ['red', 'blue', 'green', 'purple', 'orange', 'darkred', 'darkblue', 'darkgreen', 'cadetblue', 'darkpurple'];
 
-    var awesomeIcons = ['icon-font', 'icon-cloud-download', 'icon-medkit', 'icon-github-alt', 'icon-coffee', 'icon-food', 'icon-bell-alt', 'icon-question-sign', 'icon-star'];
+    var awesomeIcons = ['font', 'cloud-download', 'medkit', 'github-alt', 'coffee', 'food', 'bell-alt', 'question-sign', 'star'];
 
     var rndCoordinates = function(from, to, fixed) {
         return (Math.random() * (to - from) + from).toFixed(fixed) * 1;