diff --git a/Gemfile b/Gemfile
index 9f916c51..f840f1c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,12 +16,9 @@ gem 'uglifier', '>=1.3.0'
 
 gem 'jquery-rails'
 
-# Twitter Bootstrap
-gem 'less-rails'
-
-gem 'twitter-bootstrap-rails'
-# use following for dev version to get fontawsome 3.2.1
-#gem 'twitter-bootstrap-rails', github: 'seyhunak/twitter-bootstrap-rails', branch: "master"
+# Bootstrap and Font Awesome
+gem 'bootstrap-sass'
+gem 'font-awesome-sass'
 
 # you may comment out the database driver you will not be using.
 # This will prevent a native build of the driver. Building native drivers is not
diff --git a/Gemfile.lock b/Gemfile.lock
index 1836259f..0098c16c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,6 +56,8 @@ GEM
     arel (4.0.2)
     atomic (1.1.16)
     bcrypt-ruby (3.0.1)
+    bootstrap-sass (3.1.1.0)
+      sass (~> 3.2)
     builder (3.1.4)
     bullet (4.8.0)
       activesupport
@@ -80,7 +82,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    commonjs (0.2.7)
     cucumber (1.3.14)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -103,6 +104,8 @@ GEM
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
     ffi (1.9.3)
+    font-awesome-sass (4.0.3.1)
+      sass (~> 3.2)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     highline (1.6.21)
@@ -113,11 +116,6 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    less (2.5.0)
-      commonjs (~> 0.2.7)
-    less-rails (2.5.0)
-      actionpack (>= 3.1)
-      less (~> 2.5.0)
     libv8 (3.16.14.3)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -207,11 +205,6 @@ GEM
       polyglot (>= 0.3.1)
     turbolinks (2.2.1)
       coffee-rails
-    twitter-bootstrap-rails (2.2.8)
-      actionpack (>= 3.1)
-      execjs
-      rails (>= 3.1)
-      railties (>= 3.1)
     tzinfo (0.3.39)
     uglifier (2.5.0)
       execjs (>= 0.3.0)
@@ -235,6 +228,7 @@ DEPENDENCIES
   acts_as_list
   aruba!
   bcrypt-ruby (~> 3.0.0)
+  bootstrap-sass
   bullet
   cache_digests
   capybara
@@ -243,11 +237,11 @@ DEPENDENCIES
   cucumber-rails
   database_cleaner
   factory_girl_rails
+  font-awesome-sass
   highline
   htmlentities
   jquery-rails
   json
-  less-rails
   mocha
   mousetrap-rails
   mysql2
@@ -266,7 +260,6 @@ DEPENDENCIES
   timecop (~> 0.6.2)
   tolk!
   turbolinks
-  twitter-bootstrap-rails
   uglifier (>= 1.3.0)
   will_paginate-bootstrap
   yard
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 9194f253..3e785263 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,14 +13,7 @@
 //= require jquery
 //= require jquery_ujs
 //
-//= require twitter/bootstrap/bootstrap-tooltip
-//= require twitter/bootstrap/bootstrap-popover
-//= require twitter/bootstrap/bootstrap-modal
-//= require twitter/bootstrap/bootstrap-tab
-//= require twitter/bootstrap/bootstrap-button
-//= require twitter/bootstrap/bootstrap-dropdown
-//= require twitter/bootstrap/bootstrap-collapse
-//= require twitter/bootstrap/bootstrap-transition
+//= require bootstrap
 //
 //= require mousetrap
 //
@@ -39,4 +32,4 @@
 //
 // Stuff in app/assets
 //= require tracks.js
-//= require keybindings.js
\ No newline at end of file
+//= require keybindings.js
diff --git a/app/assets/javascripts/bootstrap.js.coffee b/app/assets/javascripts/bootstrap.js.coffee
deleted file mode 100644
index c9404a8e..00000000
--- a/app/assets/javascripts/bootstrap.js.coffee
+++ /dev/null
@@ -1,4 +0,0 @@
-jQuery ->
-  $("a[rel=popover]").popover()
-  $(".tooltip").tooltip()
-  $("a[rel=tooltip]").tooltip()
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index f1e794d4..580a3a92 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -10,7 +10,8 @@
  *
  *= require_self
  *= require bootstrap_and_overrides
+ *= require font-awesome
  *= require mousetrap
  *= require_tree ../../../vendor/assets/stylesheets
  *= require tracks
-*/
\ No newline at end of file
+*/
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
deleted file mode 100644
index 0729ddbf..00000000
--- a/app/assets/stylesheets/bootstrap_and_overrides.css.less
+++ /dev/null
@@ -1,30 +0,0 @@
-@import "twitter/bootstrap/bootstrap";
-@import "twitter/bootstrap/responsive";
-
-// Set the correct sprite paths
-@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
-@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
-
-// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot#iefix");
-@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
-@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
-
-// Font Awesome
-@import "fontawesome/font-awesome";
-
-// Glyphicons
-//@import "twitter/bootstrap/sprites.less";
-
-// Your custom LESS stylesheets goes here
-//
-// Since bootstrap was imported above you have access to its mixins which
-// you may use and inherit here
-//
-// If you'd like to override bootstrap's own variables, you can do so here as well
-// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
-//
-// Example:
-// @linkColor: #ff0000;
diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.scss b/app/assets/stylesheets/bootstrap_and_overrides.css.scss
new file mode 100644
index 00000000..cbd46a7a
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.scss
@@ -0,0 +1 @@
+@import "bootstrap";
diff --git a/config/locales/en.bootstrap.yml b/config/locales/en.bootstrap.yml
deleted file mode 100644
index 664de2b2..00000000
--- a/config/locales/en.bootstrap.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-en:
-  helpers:
-    actions: "Actions"
-    links:
-      back: "Back"
-      cancel: "Cancel"
-      confirm: "Are you sure?"
-      destroy: "Delete"
-      new: "New"
-      edit: "Edit"
-    titles:
-      edit: "Edit"
-      save: "Save"
-      new: "New"
-      delete: "Delete"