diff --git a/Gemfile b/Gemfile
index 2f613b3..7d85632 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ gem 'mini_racer'
 gem 'jquery-rails'
 gem 'google-api-client', '~> 0.11'
 gem 'rails_autolink'
-gem 'puma'
+gem 'puma', '~> 4.3'
 
 gem 'coffee-script'
 gem 'activeadmin', '~> 2'
diff --git a/Gemfile.lock b/Gemfile.lock
index c8aa716..b7f20d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -257,7 +257,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.5)
-    puma (4.3.5)
+    puma (4.3.12)
       nio4r (~> 2.0)
     rack (2.2.3)
     rack-cors (1.1.1)
@@ -451,7 +451,7 @@ DEPENDENCIES
   pry
   pry-byebug
   pry-rails
-  puma
+  puma (~> 4.3)
   rack-cors
   rails (~> 6)
   rails_12factor
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index 2ab937c..b10cb99 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -8,6 +8,7 @@ html
     ==yield :social_share_headers
     =csrf_meta_tags
     =auto_discovery_link_tag(:atom, feed_url(format: "atom"), title: "Engineers.SG - ATOM Feed")
+    link[rel="icon" type="image/png" href="/favicon.png"]
   body
     - cache('page_headers') do
       ==render 'shared/fb'
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index e69de29..0000000
diff --git a/public/favicon.png b/public/favicon.png
new file mode 100644
index 0000000..acdada5
Binary files /dev/null and b/public/favicon.png differ