diff --git a/css/converse.css b/css/converse.css
index e863fb1ce..f3baf6f6b 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -8619,8 +8619,8 @@ body.reset {
 
 @font-face {
   font-family: 'Converse-js';
-  src: url("../fonticons/fonts/icomoon.eot?wvi0ht");
-  src: url("../fonticons/fonts/icomoon.eot?wvi0ht#iefix") format("embedded-opentype"), url("../fonticons/fonts/icomoon.ttf?wvi0ht") format("truetype"), url("../fonticons/fonts/icomoon.woff?wvi0ht") format("woff"), url("../fonticons/fonts/icomoon.svg?wvi0ht#icomoon") format("svg");
+  src: url("webfonts/icomoon/fonts/icomoon.eot?wvi0ht");
+  src: url("webfonts/icomoon/fonts/icomoon.eot?wvi0ht#iefix") format("embedded-opentype"), url("webfonts/icomoon/fonts/icomoon.ttf?wvi0ht") format("truetype"), url("webfonts/icomoon/fonts/icomoon.woff?wvi0ht") format("woff"), url("webfonts/icomoon/fonts/icomoon.svg?wvi0ht#icomoon") format("svg");
   font-weight: normal;
   font-style: normal; }
 .icon-conversejs {
diff --git a/fonticons/fonts/icomoon.eot b/css/webfonts/icomoon/fonticons/fonts/icomoon.eot
similarity index 100%
rename from fonticons/fonts/icomoon.eot
rename to css/webfonts/icomoon/fonticons/fonts/icomoon.eot
diff --git a/fonticons/fonts/icomoon.svg b/css/webfonts/icomoon/fonticons/fonts/icomoon.svg
similarity index 100%
rename from fonticons/fonts/icomoon.svg
rename to css/webfonts/icomoon/fonticons/fonts/icomoon.svg
diff --git a/fonticons/fonts/icomoon.ttf b/css/webfonts/icomoon/fonticons/fonts/icomoon.ttf
similarity index 100%
rename from fonticons/fonts/icomoon.ttf
rename to css/webfonts/icomoon/fonticons/fonts/icomoon.ttf
diff --git a/fonticons/fonts/icomoon.woff b/css/webfonts/icomoon/fonticons/fonts/icomoon.woff
similarity index 100%
rename from fonticons/fonts/icomoon.woff
rename to css/webfonts/icomoon/fonticons/fonts/icomoon.woff
diff --git a/fonticons/selection.json b/css/webfonts/icomoon/fonticons/selection.json
similarity index 100%
rename from fonticons/selection.json
rename to css/webfonts/icomoon/fonticons/selection.json
diff --git a/fonticons/style.css b/css/webfonts/icomoon/fonticons/style.css
similarity index 100%
rename from fonticons/style.css
rename to css/webfonts/icomoon/fonticons/style.css
diff --git a/css/webfonts/icomoon/fonts/icomoon.eot b/css/webfonts/icomoon/fonts/icomoon.eot
new file mode 100755
index 000000000..0bb986f5b
Binary files /dev/null and b/css/webfonts/icomoon/fonts/icomoon.eot differ
diff --git a/css/webfonts/icomoon/fonts/icomoon.svg b/css/webfonts/icomoon/fonts/icomoon.svg
new file mode 100755
index 000000000..5c9dc2563
--- /dev/null
+++ b/css/webfonts/icomoon/fonts/icomoon.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="512">
+<font-face units-per-em="512" ascent="438.8571428571429" descent="-73.14285714285714" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode="&#x20;" horiz-adv-x="128" d="" />
+<glyph unicode="&#xe600;" glyph-name="conversejs" horiz-adv-x="410" d="M33.015 447.986c-18.29 0-33.005-14.716-33.005-33.006v-384.702c0-18.289 14.716-33.024 33.005-33.024h343.955c18.289 0 33.024 14.734 33.024 33.024v384.702c0 18.29-14.734 33.006-33.024 33.006h-343.955zM40.939 440.833h328.786c17.749 0 32.049-14.301 32.049-32.049v-126.414l-49.425-56.1h-286.825l-5.535-4.597-50.344-58.178-0.809 88.756 0.257 2.685c-0.116 1.109-0.184 2.224-0.184 3.365v150.482c0 17.749 14.283 32.049 32.031 32.049zM283.212 386.719c-29.102 0-52.698-23.577-52.698-52.679s23.595-52.699 52.698-52.699c29.103 0 52.699 23.596 52.699 52.698s-23.596 52.68-52.699 52.68zM124.749 165.96c0.451 0.011 0.906 0 1.361 0 29.102 0 52.679-23.577 52.679-52.68s-23.577-52.698-52.679-52.698c-29.102 0-52.698 23.596-52.698 52.698 0 28.648 22.864 51.958 51.338 52.68z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/css/webfonts/icomoon/fonts/icomoon.ttf b/css/webfonts/icomoon/fonts/icomoon.ttf
new file mode 100755
index 000000000..c618735a6
Binary files /dev/null and b/css/webfonts/icomoon/fonts/icomoon.ttf differ
diff --git a/css/webfonts/icomoon/fonts/icomoon.woff b/css/webfonts/icomoon/fonts/icomoon.woff
new file mode 100755
index 000000000..be9a8ee11
Binary files /dev/null and b/css/webfonts/icomoon/fonts/icomoon.woff differ
diff --git a/css/webfonts/icomoon/selection.json b/css/webfonts/icomoon/selection.json
new file mode 100755
index 000000000..a92f27d69
--- /dev/null
+++ b/css/webfonts/icomoon/selection.json
@@ -0,0 +1,98 @@
+{
+  "IcoMoonType": "selection",
+  "icons": [
+    {
+      "icon": {
+        "width": 820,
+        "paths": [
+          "M66.030 0.028c-36.579 0-66.011 29.432-66.011 66.011v769.403c0 36.579 29.432 66.048 66.011 66.048h687.91c36.579 0 66.048-29.468 66.048-66.048v-769.403c0-36.579-29.468-66.011-66.048-66.011h-687.91zM81.878 14.334h657.571c35.498 0 64.098 28.602 64.098 64.098v252.827l-98.85 112.2h-573.65l-11.069 9.194-100.689 116.356-1.618-177.512 0.514-5.37c-0.232-2.218-0.368-4.448-0.368-6.731v-300.964c0-35.498 28.565-64.098 64.061-64.098zM566.423 122.563c-58.205 0-105.397 47.155-105.397 105.359s47.191 105.397 105.397 105.397c58.205 0 105.397-47.191 105.397-105.397s-47.191-105.359-105.397-105.359zM249.498 564.081c0.903-0.022 1.812 0 2.721 0 58.205 0 105.359 47.155 105.359 105.359s-47.155 105.397-105.359 105.397c-58.205 0-105.397-47.191-105.397-105.397 0-57.296 45.728-103.916 102.676-105.359z"
+        ],
+        "attrs": [
+          {
+            "opacity": 1,
+            "visibility": false
+          }
+        ],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "tags": [
+          "conversejs"
+        ],
+        "grid": 16
+      },
+      "attrs": [
+        {
+          "opacity": 1,
+          "visibility": false
+        }
+      ],
+      "properties": {
+        "order": 94,
+        "id": 9,
+        "prevSize": 32,
+        "code": 58880,
+        "name": "conversejs",
+        "ligatures": ""
+      },
+      "setIdx": 0,
+      "setId": 9,
+      "iconIdx": 9
+    }
+  ],
+  "height": 1024,
+  "metadata": {
+    "name": "icomoon"
+  },
+  "preferences": {
+    "fontPref": {
+      "prefix": "icon-",
+      "metadata": {
+        "fontFamily": "icomoon",
+        "majorVersion": 1,
+        "minorVersion": 0
+      },
+      "showGlyphs": true,
+      "metrics": {
+        "emSize": 512,
+        "baseline": 14.285714285714285,
+        "whitespace": 25
+      },
+      "resetPoint": 58880,
+      "showQuickUse": true,
+      "quickUsageToken": false,
+      "showMetrics": true,
+      "showMetadata": true,
+      "ie7": false,
+      "includeMetadata": false,
+      "embed": false,
+      "cssVars": false,
+      "showSelector": true,
+      "showVersion": true,
+      "postfix": "",
+      "selector": "",
+      "classSelector": ".conversejs",
+      "autoHost": false
+    },
+    "imagePref": {
+      "color": 0,
+      "height": 32,
+      "columns": 16,
+      "margin": 16,
+      "png": false,
+      "sprites": true
+    },
+    "historySize": 100,
+    "showCodes": true,
+    "gridSize": 16,
+    "showLiga": true,
+    "showGrid": true,
+    "showGlyphs": true,
+    "showQuickUse": false,
+    "search": "",
+    "showQuickUse2": true,
+    "showSVGs": true,
+    "quickUsageToken": {
+      "UntitledProject": "NTM5OWJhMDg1M2ZlZjhjOGUxODNmOGExNDdiZDU3ZjUjMSMxNDg3NDQ2NzgyIyMj"
+    }
+  }
+}
\ No newline at end of file
diff --git a/css/webfonts/icomoon/style.css b/css/webfonts/icomoon/style.css
new file mode 100755
index 000000000..17d29bc56
--- /dev/null
+++ b/css/webfonts/icomoon/style.css
@@ -0,0 +1,29 @@
+@font-face {
+  font-family: 'icomoon';
+  src:  url('fonts/icomoon.eot?x0id2b');
+  src:  url('fonts/icomoon.eot?x0id2b#iefix') format('embedded-opentype'),
+    url('fonts/icomoon.ttf?x0id2b') format('truetype'),
+    url('fonts/icomoon.woff?x0id2b') format('woff'),
+    url('fonts/icomoon.svg?x0id2b#icomoon') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+[class^="icon-"], [class*=" icon-"] {
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: 'icomoon' !important;
+  speak: none;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-conversejs:before {
+  content: "\e600";
+}
diff --git a/sass/_variables.scss b/sass/_variables.scss
index 372c77c60..ea60436aa 100644
--- a/sass/_variables.scss
+++ b/sass/_variables.scss
@@ -110,7 +110,7 @@ $mobile-chat-width: 100% !default;
 $mobile-chat-height: 400px !default;
 $small-mobile-chat-height: 300px !default;
 
-$font-path: "../fonticons/fonts/" !default;
+$font-path: "webfonts/icomoon/fonts/" !default;
 
 $normal-font: "Helvetica", "Arial", sans-serif;
 $heading-font: 'Century Gothic', futura, 'URW Gothic L', Verdana, sans-serif !default;