diff --git a/Gemfile b/Gemfile
index 4f8b46de3..eb898ab26 100644
--- a/Gemfile
+++ b/Gemfile
@@ -104,6 +104,9 @@ gem 'will_paginate',           '3.0.4'
 
 group :assets do
 
+  # Icons
+  gem 'entypo-rails'
+
   # CSS
 
   gem 'bootstrap-sass', '2.2.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ce8f3b21..10e4fcec1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,6 +97,8 @@ GEM
       railties (>= 3.2.6, < 5)
       warden (~> 1.2.3)
     diff-lcs (1.2.4)
+    entypo-rails (2.0.2)
+      railties (>= 3.1, <= 5)
     erubis (2.7.0)
     ethon (0.5.12)
       ffi (>= 1.3.0)
@@ -441,6 +443,7 @@ DEPENDENCIES
   cucumber-rails (= 1.3.1)
   database_cleaner (= 1.1.0)
   devise (= 3.0.2)
+  entypo-rails
   factory_girl_rails (= 4.2.1)
   faraday (= 0.8.8)
   faraday_middleware (= 0.9.0)
diff --git a/app/assets/stylesheets/default.css b/app/assets/stylesheets/default.css
index a598329ab..d981555da 100644
--- a/app/assets/stylesheets/default.css
+++ b/app/assets/stylesheets/default.css
@@ -10,4 +10,6 @@
 *= require vendor/facebox
 *= require vendor/fileuploader
 *= require vendor/autoSuggest
+*= require entypo-fonts
+*= require entypo
 */
diff --git a/app/assets/stylesheets/entypo.css.scss b/app/assets/stylesheets/entypo.css.scss
new file mode 100644
index 000000000..0333b6fe3
--- /dev/null
+++ b/app/assets/stylesheets/entypo.css.scss
@@ -0,0 +1,34 @@
+.entypo {
+  font-family: 'entypo';
+  font-style: normal;
+  color: black;
+
+  &.heart:before {
+    content: '\2665';
+  }
+
+  &.heart-empty:before {
+    content: '\2661';
+  }
+
+  &.retweet:before {
+    content: '\e717';
+  }
+
+  &.red {
+    color: #A40802;
+  }
+  &.white {
+    color: white;
+  }
+  &.gray {
+    color: #aaa;
+  }
+  &.blue {
+    color: #3f8fba;
+  }
+
+  &.large {
+    font-size: 25px;
+  }
+}
diff --git a/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs
index 6dd66978b..0d73615ae 100644
--- a/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs
+++ b/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs
@@ -5,18 +5,18 @@
   <div class='pull-right'>
     <a href="#" rel="auth-required" class="like" title="{{#if userLike}} {{t "viewer.unlike"}} {{else}} {{t "viewer.like"}} {{/if}}">
         {{#if userLike}}
-            <i class="icon-heart icon-red"></i>
+            <i class="entypo heart red large"></i>
         {{else}}
-            <i class="icon-heart icon-grey"></i>
+            <i class="entypo heart gray large"></i>
         {{/if}}
     </a>
 
     {{#if userCanReshare}}
         <a href="#" rel="auth-required" class="reshare" title="{{#if userReshare}} {{t "viewer.reshared"}} {{else}} {{t "viewer.reshare"}} {{/if}}">
             {{#if userReshare}}
-                <i class="icon-retweet icon-blue"></i>
+                <i class="entypo retweet blue large"></i>
             {{else}}
-                <i class="icon-retweet icon-grey"></i>
+                <i class="entypo retweet gray large"></i>
             {{/if}}
         </a>
     {{/if}}