diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ba6803b4b..d25b12998 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -13,4 +13,9 @@ module ApplicationHelper
     other_classes = "#{other_classes} rtl" if [:ar, :fa].include?(I18n.locale)
     other_classes
   end
+
+  def favicon_path
+    env_suffix = Rails.env.production? ? '' : '-dev'
+    asset_path "favicon#{env_suffix}.ico"
+  end
 end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 8e9439310..01c42db93 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -5,6 +5,7 @@
     %meta{:name => 'viewport', :content => 'width=device-width, initial-scale=1'}/
     %meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge'}/
 
+    %link{:rel => "icon", :href => favicon_path, :type => "image/x-icon"}/
     %link{:rel => "apple-touch-icon", :sizes => "180x180", :href => "/apple-touch-icon.png"}/
     %link{:rel => "mask-icon", :href => "/mask-icon.svg", :color => "#2B90D9"}/
     %link{:rel => "manifest", :href => "/manifest.json"}/
diff --git a/public/favicon-dev.ico b/public/favicon-dev.ico
new file mode 100644
index 000000000..5f725d587
Binary files /dev/null and b/public/favicon-dev.ico differ