diff --git a/Gemfile b/Gemfile
index 36af5f96..0295e6a9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,8 +88,6 @@ source 'https://rails-assets.org' do
   gem 'rails-assets-trianglify'
   # for scroll way points
   gem 'rails-assets-waypoints'
-  # for displaying maps
-  gem 'rails-assets-leaflet'
   # for markdown editors
   gem 'rails-assets-bootstrap-markdown'
   gem 'rails-assets-to-markdown'
@@ -101,6 +99,8 @@ gem 'bootstrap3-datetimepicker-rails', '~> 3.0.2'
 gem 'jquery-datatables-rails', '~> 2.2.1'
 # for charts
 gem 'chart-js-rails'
+# for displaying maps
+gem 'leaflet-rails'
 
 # for user avatars
 gem 'gravtastic'
diff --git a/Gemfile.lock b/Gemfile.lock
index 18f7c6c1..3dbe24fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -207,6 +207,7 @@ GEM
     jwt (1.0.0)
     launchy (2.4.2)
       addressable (~> 2.3)
+    leaflet-rails (0.7.4)
     letter_opener (1.2.0)
       launchy (~> 2.2)
     letter_opener_web (1.3.0)
@@ -339,7 +340,6 @@ GEM
     rails-assets-jquery (2.2.1)
     rails-assets-jquery-smooth-scroll (1.7.2)
       rails-assets-jquery (>= 1.4.2)
-    rails-assets-leaflet (0.7.7)
     rails-assets-markdown (0.5.0)
     rails-assets-momentjs (2.11.2)
     rails-assets-spectrum (1.8.0)
@@ -526,6 +526,7 @@ DEPENDENCIES
   hoptoad_notifier (~> 2.3)
   jquery-datatables-rails (~> 2.2.1)
   jquery-rails
+  leaflet-rails
   letter_opener
   letter_opener_web
   mina
@@ -548,7 +549,6 @@ DEPENDENCIES
   rails-assets-date.format!
   rails-assets-holderjs!
   rails-assets-jquery-smooth-scroll!
-  rails-assets-leaflet!
   rails-assets-markdown!
   rails-assets-momentjs!
   rails-assets-spectrum!
diff --git a/app/views/conference/_venue_map.html.haml b/app/views/conference/_venue_map.html.haml
index eb1bbaee..491ae4ae 100644
--- a/app/views/conference/_venue_map.html.haml
+++ b/app/views/conference/_venue_map.html.haml
@@ -2,7 +2,6 @@
 - popup = "<h3>#{@conference.venue.name}</h3><br>#{@conference.venue.street}<br>#{@conference.venue.city}<br>#{@conference.venue.country_name}"
 - content_for(:script_body) do
   :javascript
-    L.Icon.Default.imagePath = '/assets/leaflet/';
     // create a map in the "map" div, set the view to a given place and zoom
     var map = L.map('map', { scrollWheelZoom: false }).setView([#{@conference.venue.latitude}, #{@conference.venue.longitude}], 11);
     // add an OpenStreetMap tile layer