diff --git a/Gemfile b/Gemfile
index a5c28751..201672ce 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem 'rack-cors', :require => 'rack/cors'
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
-  gem 'twitter-bootstrap-rails'
+  #gem 'twitter-bootstrap-rails'
   gem 'bootstrap-sass'
   gem 'compass-rails'
 
@@ -28,7 +28,7 @@ end
 gem 'jquery-rails'
 gem 'haml-rails'
 gem 'slim-rails'
-gem 'less-rails'
+#gem 'less-rails'
 
 gem 'couch_potato' , :git => 'git://github.com/bterkuile/couch_potato.git'
 gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git'
diff --git a/Gemfile.lock b/Gemfile.lock
index d73803e2..5e3e5d51 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,7 +70,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
-    commonjs (0.2.6)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -131,11 +130,6 @@ GEM
     kaminari-bootstrap (0.1.3)
       kaminari (>= 0.13.0)
       rails
-    less (2.2.2)
-      commonjs (~> 0.2.6)
-    less-rails (2.2.6)
-      actionpack (>= 3.1)
-      less (~> 2.2.0)
     libwebsocket (0.1.7.1)
       addressable
       websocket
@@ -248,10 +242,6 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    twitter-bootstrap-rails (2.1.7)
-      actionpack (>= 3.1)
-      execjs
-      railties (>= 3.1)
     tzinfo (0.3.35)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
@@ -278,7 +268,6 @@ DEPENDENCIES
   haml-rails
   jquery-rails
   kaminari-bootstrap
-  less-rails
   mini_magick
   mustache
   pry
@@ -293,5 +282,4 @@ DEPENDENCIES
   slim-rails
   steak
   thin
-  twitter-bootstrap-rails
   uglifier (>= 1.0.3)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1e9c8553..dc34e5fd 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,6 +13,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui
-//= require twitter/bootstrap
+//= require bootstrap
 //= require_directory .
 //= require_self
diff --git a/app/assets/javascripts/bootstrap.js.coffee b/app/assets/javascripts/bootstrap_initialize.js.coffee
similarity index 100%
rename from app/assets/javascripts/bootstrap.js.coffee
rename to app/assets/javascripts/bootstrap_initialize.js.coffee
diff --git a/app/assets/javascripts/supplier/application.js b/app/assets/javascripts/supplier/application.js
index a721ca72..9883702c 100644
--- a/app/assets/javascripts/supplier/application.js
+++ b/app/assets/javascripts/supplier/application.js
@@ -12,7 +12,20 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui
-//= require twitter/bootstrap
+// require bootstrap-transition
+// require bootstrap-affix
+// require bootstrap-alert
+// require bootstrap-button
+// require bootstrap-carousel
+// require bootstrap-collapse
+// require bootstrap-dropdown
+// require bootstrap-modal
+// require bootstrap-scrollspy
+// require bootstrap-tab
+// require bootstrap-tooltip
+// require bootstrap-popover
+// require bootstrap-typeahead
+//= require bootstrap
 //= require mustache
 //= require faye
 //= require supplier/base
diff --git a/app/assets/javascripts/user/application.js.erb b/app/assets/javascripts/user/application.js.erb
index 2f14b7eb..385b934e 100644
--- a/app/assets/javascripts/user/application.js.erb
+++ b/app/assets/javascripts/user/application.js.erb
@@ -12,20 +12,20 @@
 //
 //= require jquery
 //= require jquery_ujs
-// require twitter/bootstrap
-//= require twitter/bootstrap/bootstrap-transition
-//= require twitter/bootstrap/bootstrap-alert
-//= require twitter/bootstrap/bootstrap-modal
-//= require twitter/bootstrap/bootstrap-dropdown
-//= require twitter/bootstrap/bootstrap-scrollspy
-//= require twitter/bootstrap/bootstrap-tab
-//= require twitter/bootstrap/bootstrap-tooltip
-//= require twitter/bootstrap/bootstrap-popover
-//= require twitter/bootstrap/bootstrap-button
-//= require twitter/bootstrap/bootstrap-collapse
-// require twitter/bootstrap/bootstrap-carousel
-//= require twitter/bootstrap/bootstrap-typeahead
-//= require twitter/bootstrap/bootstrap-affix
+// require bootstrap-transition
+// require bootstrap-affix
+// require bootstrap-alert
+// require bootstrap-button
+// require bootstrap-carousel
+// require bootstrap-collapse
+// require bootstrap-dropdown
+// require bootstrap-modal
+// require bootstrap-scrollspy
+// require bootstrap-tab
+// require bootstrap-tooltip
+// require bootstrap-popover
+// require bootstrap-typeahead
+//= require bootstrap
 //= require qwaiter
 //= require supplier/order
 //= require mustache
diff --git a/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.less b/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass
similarity index 77%
rename from app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.less
rename to app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass
index d9676476..47eb087d 100644
--- a/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.less
+++ b/app/assets/stylesheets/twitter-bootstrap/bootstrap_and_overrides.css.sass
@@ -1,13 +1,11 @@
-@import "twitter/bootstrap/bootstrap";
-body { 
-	padding-top: 60px;
-}
-
-@import "twitter/bootstrap/responsive";
+@import "bootstrap"
+body 
+	padding-top: 60px !important
+@import "bootstrap-responsive"
 
 // Set the correct sprite paths
-@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
-@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
+//@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png');
+//@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
 
 // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
 // Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not 
diff --git a/app/templates/supplier/_active_list.mustache b/app/templates/supplier/_active_list.mustache
index e778839e..e528a454 100644
--- a/app/templates/supplier/_active_list.mustache
+++ b/app/templates/supplier/_active_list.mustache
@@ -9,6 +9,6 @@
   <td class="actions">
     <button id="list-is-helped-button-{{id}}" class="btn btn-info {{^needs_help}}hide{{/needs_help}}" onclick="Qsupplier.mark_list_as_helped('{{id}}')">Question answered!</button>
     <button class="btn btn-warning" onclick="Qsupplier.close_list('{{id}}')">Close!</button>
-    <a href="/supplier/lists/{{id}}" class="btn icon-list"></a>
+    <a href="/supplier/lists/{{id}}" class="btn"><span class="icon-list">&nbsp;</span></a>
   </td>
 <tr>