diff --git a/app/assets/stylesheets/bootstrap/font/FontAwesome.otf b/app/assets/fonts/FontAwesome.otf
similarity index 100%
rename from app/assets/stylesheets/bootstrap/font/FontAwesome.otf
rename to app/assets/fonts/FontAwesome.otf
diff --git a/app/assets/stylesheets/bootstrap/font/fontawesome-webfont.eot b/app/assets/fonts/fontawesome-webfont.eot
similarity index 100%
rename from app/assets/stylesheets/bootstrap/font/fontawesome-webfont.eot
rename to app/assets/fonts/fontawesome-webfont.eot
diff --git a/app/assets/stylesheets/bootstrap/font/fontawesome-webfont.svg b/app/assets/fonts/fontawesome-webfont.svg
similarity index 100%
rename from app/assets/stylesheets/bootstrap/font/fontawesome-webfont.svg
rename to app/assets/fonts/fontawesome-webfont.svg
diff --git a/app/assets/stylesheets/bootstrap/font/fontawesome-webfont.ttf b/app/assets/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from app/assets/stylesheets/bootstrap/font/fontawesome-webfont.ttf
rename to app/assets/fonts/fontawesome-webfont.ttf
diff --git a/app/assets/stylesheets/bootstrap/font/fontawesome-webfont.woff b/app/assets/fonts/fontawesome-webfont.woff
similarity index 100%
rename from app/assets/stylesheets/bootstrap/font/fontawesome-webfont.woff
rename to app/assets/fonts/fontawesome-webfont.woff
diff --git a/app/assets/stylesheets/bootstrap/bootstrap.css.scss b/app/assets/stylesheets/bootstrap/bootstrap.css.scss
index 9515992..20d6a33 100644
--- a/app/assets/stylesheets/bootstrap/bootstrap.css.scss
+++ b/app/assets/stylesheets/bootstrap/bootstrap.css.scss
@@ -1942,8 +1942,10 @@ table th[class*="span"],
     */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('font/fontawesome-webfont.eot');
-  src: url('font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('font/fontawesome-webfont.woff') format('woff'), url('font/fontawesome-webfont.ttf') format('truetype');
+  src: url('fontawesome-webfont.eot');
+  src: url('fontawesome-webfont.eot?#iefix') format('embedded-opentype'), 
+  font-url('fontawesome-webfont.woff') format('woff'), 
+  font-url('fontawesome-webfont.ttf') format('truetype');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/app/assets/stylesheets/bootstrap/theme-style.css.scss b/app/assets/stylesheets/bootstrap/theme-style.css.scss
index 3a70b77..3063def 100644
--- a/app/assets/stylesheets/bootstrap/theme-style.css.scss
+++ b/app/assets/stylesheets/bootstrap/theme-style.css.scss
@@ -209,7 +209,7 @@ a:focus {
   border-radius: 3px;
   border: 0;
   border-bottom: 3px solid #55a79a;
-  background-image: url(../img/bg_noise-2.png);
+  background-image: url(image_path('bg_noise-2.png'));
   background-position: left top;
   background-repeat: repeat;
   -webkit-box-shadow: 1px 1px 10px rgba(36, 36, 36, 0.6);
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index a55861f..4d1304f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,23 +10,8 @@
 <meta name="description" content="">
 <meta name="author" content="Themelize.me">
 
-<!-- Bootstrap CSS -->
-<link href="assets/bootstrap/bootstrap.css" rel="stylesheet">
-<link href="assets/bootstrap/responsive.css" rel="stylesheet">
-
-<!-- Flexslider -->
-<link href="assets/bootstrap/flexslider.css" rel="stylesheet">
-
-<!-- Theme style -->
-<link href="assets/bootstrap/theme-style.css" rel="stylesheet">
-
-<!--Your custom colour override-->
-<link href="assets/bootstrap/colour-red.css" id="colour-scheme" rel="stylesheet">
-
-<!-- Your custom override -->
-<link href="assets/bootstrap/custom-style.css" rel="stylesheet">
-
-<%= stylesheet_link_tag "application" %>
+<%= stylesheet_link_tag    "application", :media => "all" %>
+<%= javascript_include_tag "application" %>
 
 <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
 <!--[if lt IE 9]>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 76a73ab..9bb90e7 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -19,6 +19,9 @@
 
   # Generate digests for assets URLs
   config.assets.digest = true
+  
+  # Add the fonts path
+  config.assets.paths << Rails.root.join('app', 'assets', 'fonts')
 
   # Defaults to nil and saved in location specified by config.assets.prefix
   # config.assets.manifest = YOUR_PATH
@@ -46,7 +49,7 @@
   # config.action_controller.asset_host = "http://assets.example.com"
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
+  config.assets.precompile += %w( search.js .svg .eot .woff .ttf )
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false