diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico
new file mode 100644
index 000000000..c7aa5f710
Binary files /dev/null and b/app/assets/images/favicon.ico differ
diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml
index ba06b2590..48eed2494 100644
--- a/app/views/layouts/application.haml
+++ b/app/views/layouts/application.haml
@@ -8,7 +8,7 @@
     = csrf_meta_tags
     = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
-    %link{href: "../../favicon.ico", rel: "icon"}/
+    = favicon_link_tag 'favicon.ico'
     %title Eesti Interneti SA
   %body{:style => env_style}
     / Static navbar
diff --git a/app/views/layouts/depp/application.haml b/app/views/layouts/depp/application.haml
index 474dea6a5..7a87a12f7 100644
--- a/app/views/layouts/depp/application.haml
+++ b/app/views/layouts/depp/application.haml
@@ -8,7 +8,7 @@
     = csrf_meta_tags
     = stylesheet_link_tag 'registrar-manifest', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
-    %link{href: "../../favicon.ico", rel: "icon"}/
+    = favicon_link_tag 'favicon.ico'
     %title EIS Registrar Portal
   %body
     / Static navbar
diff --git a/app/views/layouts/login.haml b/app/views/layouts/login.haml
index 6f98b8b35..e0b38d5de 100644
--- a/app/views/layouts/login.haml
+++ b/app/views/layouts/login.haml
@@ -9,7 +9,7 @@
     = csrf_meta_tags
     = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
     = stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
-    %link{:href => "../../favicon.ico", :rel => "icon"}/
+    = favicon_link_tag 'favicon.ico'
     %title Eesti Interneti SA - Log In
   %body{:style => env_style}
     .container
diff --git a/app/views/layouts/login_registrar.haml b/app/views/layouts/login_registrar.haml
index f00e48f36..2b75dcc5f 100644
--- a/app/views/layouts/login_registrar.haml
+++ b/app/views/layouts/login_registrar.haml
@@ -9,7 +9,7 @@
     = csrf_meta_tags
     = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
     = stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
-    %link{:href => "../../favicon.ico", :rel => "icon"}/
+    = favicon_link_tag 'favicon.ico'
     %title EIS Registrar - Log In
   %body{:style => env_style}
     .container
diff --git a/config/application.rb b/config/application.rb
index 4d908932e..87fdf723d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -33,6 +33,12 @@ module Registry
     # Load all model subdirs
     config.autoload_paths += Dir[Rails.root.join('app', 'models', '**/')]
 
+    # Add the fonts path
+    config.assets.paths << Rails.root.join('vendor', 'assets', 'fonts')
+
+    # Precompile additional assets
+    config.assets.precompile += %w(*.svg *.eot *.woff *.ttf)
+
     # Active Record used to suppresses errors raised within
     # `after_rollback`/`after_commit` callbacks and only printed them to the logs.
     # In the next version, these errors will no longer be suppressed.