diff --git a/_src/_assets/styl/icons.styl b/_src/_assets/styl/icons.styl
index df36898a..3e8a93e9 100644
--- a/_src/_assets/styl/icons.styl
+++ b/_src/_assets/styl/icons.styl
@@ -4,106 +4,21 @@
 // Icons
 //
 
-
-@font-face
-    font-family: 'entypo'
-    src: url('../fonts/entypo.eot')
-    src: url('../fonts/entypo.eot?#iefix') format('embedded-opentype'),  url('../fonts/entypo.woff') format('woff'), url('../fonts/entypo.ttf') format('truetype'), url('../fonts/entypo.svg#entypo') format('svg')
-    font-weight: normal
-    font-style: normal
-
-.icon:before
-    color: $text-color-light
-    font-size: 20px
-    font-family: 'entypo'
-    speak: none
-    font-style: normal
-    font-weight: normal
-    font-variant: normal
-    text-transform: none
-    line-height: 1
-    -webkit-font-smoothing: antialiased
-    -moz-osx-font-smoothing: grayscale
-
-    .btn&
-        font-size: 18px
-        margin-right: .3em
-        margin-left: -.3em
-        top: .15em
-        position: relative
+svg
+    &.icon
+        height: 24px
+        width: 24px
+        display: inline-block
+        fill: currentColor
         vertical-align: baseline
-        color: inherit
 
-.icon-twitter:before
-    content: "\e600"
+        .btn &
+            height: 18px
+            width: 18px
+            margin: 4px -4px 0 4px
+            filter: drop-shadow( 0 1px #eee )
+            float: right
 
-.icon-rss:before
-    content: "\e603"
-
-.icon-user:before,
-.icon-personal:before
-    content: "\e604"
-
-.icon-leaf:before
-    content: "\e605"
-
-.icon-link:before
-    content: "\e606"
-
-.icon-pictures:before,
-.icon-photos:before
-    content: "\e607"
-
-.icon-camera:before,
-.icon-photography:before
-    content: "\e608"
-
-.icon-arrow-down-circle:before,
-.icon-download:before
-    content: "\e609"
-
-.icon-forward:before
-    content: "\e60a"
-
-.icon-heart:before
-    content: "\e60b"
-
-.icon-info:before
-    content: "\e60c"
-
-.icon-github:before
-.icon-github-alt:before
-    content: "\e60e"
-
-.icon-star:before,
-.entry-content ul li:before
-    content: "\e60d"
-
-.icon-search:before
-    content: "\e60f"
-
-.icon-googleplus:before
-    content: "\e601"
-
-.icon-facebook:before
-    content: "\e602"
-
-.icon-list:before
-    content: "\e610"
-
-.icon-tools:before,
-.icon-design:before
-    content: "\e611"
-
-.icon-arrow-down:before
-    content: "\e612"
-
-.icon-arrow-right:before
-    content: "\e614"
-
-.icon-arrow-left:before
-    content: "\e615"
-
-.icon-gift:before,
-.icon-goodies:before
-    content: "\e613"
\ No newline at end of file
+    // Fix jQuery bug: http://bugs.jquery.com/ticket/11352
+    use
+        pointer-events: none
diff --git a/gulpfile.js b/gulpfile.js
index dfc603a3..979880b8 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -39,7 +39,9 @@ var icons = {
         src: src + '/_assets/img/entypo/',
         dist: dist + '/assets/img/',
         prefix: 'entypo-',
-        icons: ['twitter', 'facebook', 'google+', 'magnifying-glass', 'menu']
+        icons: [
+            'twitter', 'facebook', 'google+', 'magnifying-glass', 'menu', 'rss', 'user', 'leaf', 'link', 'image', 'camera', 'arrow-with-circle-down', 'forward.svg', 'heart', 'info', 'github', 'star', 'tools', 'chevron-right', 'chevron-left', 'gift'
+        ]
     }
 }