diff --git a/src/definitions/elements/icon.less b/src/definitions/elements/icon.less
index d920329c4..ce1ea7b9a 100755
--- a/src/definitions/elements/icon.less
+++ b/src/definitions/elements/icon.less
@@ -26,14 +26,8 @@
 
 @font-face {
   font-family: 'Icons';
-  src: url("@{fontPath}/@{fontName}.eot");
-  src:
-    url("@{fontPath}/@{fontName}.eot?#iefix") format('embedded-opentype'),
-    url("@{fontPath}/@{fontName}.woff2") format('woff'),
-    url("@{fontPath}/@{fontName}.woff") format('woff'),
-    url("@{fontPath}/@{fontName}.ttf") format('truetype'),
-    url("@{fontPath}/@{fontName}.svg#icons") format('svg')
-  ;
+  src: @fallbackSRC;
+  src: @src;
   font-style: normal;
   font-weight: normal;
   font-variant: normal;
diff --git a/src/themes/basic/elements/icon.overrides b/src/themes/basic/elements/icon.overrides
index c384b37db..c1a9b75ad 100644
--- a/src/themes/basic/elements/icon.overrides
+++ b/src/themes/basic/elements/icon.overrides
@@ -1,170 +1,170 @@
 /* basic.icons available */
-i.basic.icon.circle.attention:before { content: '\2757'; } /* '❗' */
-i.basic.icon.circle.help:before { content: '\e704'; } /* '' */
-i.basic.icon.circle.info:before { content: '\e705'; } /* '' */
-i.basic.icon.add:before { content: '\2795'; } /* '➕' */
-
-i.basic.icon.chart:before { content: '📈'; } /* '\1f4c8' */
-i.basic.icon.chart.bar:before { content: '📊'; } /* '\1f4ca' */
-i.basic.icon.chart.pie:before { content: '\e7a2'; } /* '' */
-
-i.basic.icon.resize.full:before { content: '\e744'; } /* '' */
-i.basic.icon.resize.horizontal:before { content: '\2b0d'; } /* '⬍' */
-i.basic.icon.resize.small:before { content: '\e746'; } /* '' */
-i.basic.icon.resize.vertical:before { content: '\2b0c'; } /* '⬌' */
-
-i.basic.icon.down:before { content: '\2193'; } /* '↓' */
-i.basic.icon.down.triangle:before { content: '\25be'; } /* '▾' */
-i.basic.icon.down.arrow:before { content: '\e75c'; } /* '' */
-
-i.basic.icon.left:before { content: '\2190'; } /* '←' */
-i.basic.icon.left.triangle:before { content: '\25c2'; } /* '◂' */
-i.basic.icon.left.arrow:before { content: '\e75d'; } /* '' */
-
-i.basic.icon.right:before { content: '\2192'; } /* '→' */
-i.basic.icon.right.triangle:before { content: '\25b8'; } /* '▸' */
-i.basic.icon.right.arrow:before { content: '\e75e'; } /* '' */
-
-i.basic.icon.up:before { content: '\2191'; } /* '↑' */
-i.basic.icon.up.triangle:before { content: '\25b4'; } /* '▴' */
-i.basic.icon.up.arrow:before { content: '\e75f'; } /* '' */
-
-i.basic.icon.folder:before { content: '\e810'; } /* '' */
-i.basic.icon.open.folder:before { content: '📂'; } /* '\1f4c2' */
-
-i.basic.icon.globe:before { content: '𝌍'; } /* '\1d30d' */
-i.basic.icon.desk.globe:before { content: '🌐'; } /* '\1f310' */
-
-i.basic.icon.star:before { content: '\e801'; } /* '' */
-i.basic.icon.star.empty:before { content: '\e800'; } /* '' */
-i.basic.icon.star.half:before { content: '\e701'; } /* '' */
-
-i.basic.icon.lock:before { content: '🔒'; } /* '\1f512' */
-i.basic.icon.unlock:before { content: '🔓'; } /* '\1f513' */
-
-i.basic.icon.layout.grid:before { content: '\e80c'; } /* '' */
-i.basic.icon.layout.block:before { content: '\e708'; } /* '' */
-i.basic.icon.layout.list:before { content: '\e80b'; } /* '' */
-
-i.basic.icon.heart.empty:before { content: '\2661'; } /* '♡' */
-i.basic.icon.heart:before { content: '\2665'; } /* '♥' */
-
-
-i.basic.icon.asterisk:before { content: '\2731'; } /* '✱' */
-i.basic.icon.attachment:before { content: '📎'; } /* '\1f4ce' */
-i.basic.icon.attention:before { content: '\26a0'; } /* '⚠' */
-i.basic.icon.trophy:before { content: '🏉'; } /* '\1f3c9' */
-i.basic.icon.barcode:before { content: '\e792'; } /* '' */
-i.basic.icon.cart:before { content: '\e813'; } /* '' */
-i.basic.icon.block:before { content: '🚫'; } /* '\1f6ab' */
-i.basic.icon.book:before { content: '📖'; }
-i.basic.icon.bookmark:before { content: '🔖'; } /* '\1f516' */
-i.basic.icon.calendar:before { content: '📅'; } /* '\1f4c5' */
-i.basic.icon.cancel:before { content: '\2716'; } /* '✖' */
-i.basic.icon.close:before { content: '\e80d'; } /* '' */
-i.basic.icon.color:before { content: '\e794'; } /* '' */
-i.basic.icon.chat:before { content: '\e720'; } /* '' */
-i.basic.icon.check:before { content: '\2611'; } /* '☑' */
-i.basic.icon.time:before { content: '🕔'; } /* '\1f554' */
-i.basic.icon.cloud:before { content: '\2601'; } /* '☁' */
-i.basic.icon.code:before { content: '\e714'; } /* '' */
-i.basic.icon.email:before { content: '\40'; } /* '@' */
-i.basic.icon.settings:before { content: '\26ef'; } /* '⛯' */
-i.basic.icon.setting:before { content: '\2699'; } /* '⚙' */
-i.basic.icon.comment:before { content: '\e802'; } /* '' */
-i.basic.icon.clockwise.counter:before { content: '\27f2'; } /* '⟲' */
-i.basic.icon.clockwise:before { content: '\27f3'; } /* '⟳' */
-i.basic.icon.cube:before { content: '\e807'; } /* '' */
-i.basic.icon.direction:before { content: '\27a2'; } /* '➢' */
-i.basic.icon.doc:before { content: '📄'; } /* '\1f4c4' */
-i.basic.icon.docs:before { content: '\e736'; } /* '' */
-i.basic.icon.dollar:before { content: '💵'; } /* '\1f4b5' */
-i.basic.icon.paint:before { content: '\e7b5'; } /* '' */
-i.basic.icon.edit:before { content: '\270d'; } /* '✍' */
-i.basic.icon.eject:before { content: '\2ecf'; } /* '⻏' */
-i.basic.icon.export:before { content: '\e715'; } /* '' */
-i.basic.icon.hide:before  { content: '\e70b'; } /* '' */
-i.basic.icon.unhide:before { content: '\e80f'; } /* '' */
-i.basic.icon.facebook:before { content: '\f301'; } /* '' */
-i.basic.icon.fast-forward:before { content: '\e804'; } /* '' */
-i.basic.icon.fire:before { content: '🔥'; } /* '\1f525' */
-i.basic.icon.flag:before { content: '\2691'; } /* '⚑' */
-i.basic.icon.lightning:before { content: '\26a1'; } /* '⚡' */
-i.basic.icon.lab:before { content: '\68'; } /* 'h' */
-i.basic.icon.flight:before { content: '\2708'; } /* '✈' */
-i.basic.icon.forward:before { content: '\27a6'; } /* '➦' */
-i.basic.icon.gift:before { content: '🎁'; } /* '\1f381' */
-i.basic.icon.github:before { content: '\f308'; } /* '' */
-i.basic.icon.globe:before { content: '\e817'; } /* '' */
-i.basic.icon.headphones:before { content: '🎧'; } /* '\1f3a7' */
-i.basic.icon.question:before { content: '\2753'; } /* '❓' */
-i.basic.icon.home:before { content: '\2302'; } /* '⌂' */
-i.basic.icon.i:before { content: '\2139'; } /* 'ℹ' */
-i.basic.icon.idea:before { content: '💡'; } /* '\1f4a1' */
-i.basic.icon.open:before { content: '🔗'; } /* '\1f517' */
-i.basic.icon.content:before { content: '\e782'; } /* '' */
-i.basic.icon.location:before { content: '\e724'; } /* '' */
-i.basic.icon.mail:before { content: '\2709'; } /* '✉' */
-i.basic.icon.mic:before { content: '🎤'; } /* '\1f3a4' */
-i.basic.icon.minus:before { content: '\2d'; } /* '-' */
-i.basic.icon.money:before { content: '💰'; } /* '\1f4b0' */
-i.basic.icon.off:before { content: '\e78e'; } /* '' */
-i.basic.icon.pause:before { content: '\e808'; } /* '' */
-i.basic.icon.photos:before { content: '\e812'; } /* '' */
-i.basic.icon.photo:before { content: '🌄'; } /* '\1f304' */
-i.basic.icon.pin:before { content: '📌'; } /* '\1f4cc' */
-i.basic.icon.play:before { content: '\e809'; } /* '' */
-i.basic.icon.plus:before { content: '\2b'; } /* '+' */
-i.basic.icon.print:before { content: '\e716'; } /* '' */
-i.basic.icon.rss:before { content: '\e73a'; } /* '' */
-i.basic.icon.search:before { content: '🔍'; } /* '\1f50d' */
-i.basic.icon.shuffle:before { content: '\e803'; } /* '' */
-i.basic.icon.tag:before { content: '\e80a'; } /* '' */
-i.basic.icon.tags:before { content: '\e70d'; } /* '' */
-i.basic.icon.terminal:before { content: '\e7ac'; } /* '' */
-i.basic.icon.thumbs.down:before { content: '👎'; } /* '\1f44e' */
-i.basic.icon.thumbs.up:before { content: '👍'; } /* '\1f44d' */
-i.basic.icon.to-end:before { content: '\e806'; } /* '' */
-i.basic.icon.to-start:before { content: '\e805'; } /* '' */
-i.basic.icon.top.list:before { content: '🏆'; } /* '\1f3c6' */
-i.basic.icon.trash:before { content: '\e729'; } /* '' */
-i.basic.icon.twitter:before { content: '\f303'; } /* '' */
-i.basic.icon.upload:before { content: '\e711'; } /* '' */
-i.basic.icon.user.add:before { content: '\e700'; } /* '' */
-i.basic.icon.user:before { content: '👤'; } /* '\1f464' */
-i.basic.icon.community:before { content: '\e814'; } /* '' */
-i.basic.icon.users:before { content: '👥'; } /* '\1f465' */
-i.basic.icon.id:before { content: '\e722'; } /* '' */
-i.basic.icon.url:before { content: '🔗'; } /* '\1f517' */
-i.basic.icon.zoom.in:before { content: '\e750'; } /* '' */
-i.basic.icon.zoom.out:before { content: '\e751'; } /* '' */
+i.icon.circle.attention:before { content: '\2757'; } /* '❗' */
+i.icon.circle.help:before { content: '\e704'; } /* '' */
+i.icon.circle.info:before { content: '\e705'; } /* '' */
+i.icon.add:before { content: '\2795'; } /* '➕' */
+
+i.icon.chart:before { content: '📈'; } /* '\1f4c8' */
+i.icon.chart.bar:before { content: '📊'; } /* '\1f4ca' */
+i.icon.chart.pie:before { content: '\e7a2'; } /* '' */
+
+i.icon.resize.full:before { content: '\e744'; } /* '' */
+i.icon.resize.horizontal:before { content: '\2b0d'; } /* '⬍' */
+i.icon.resize.small:before { content: '\e746'; } /* '' */
+i.icon.resize.vertical:before { content: '\2b0c'; } /* '⬌' */
+
+i.icon.down:before { content: '\2193'; } /* '↓' */
+i.icon.down.triangle:before { content: '\25be'; } /* '▾' */
+i.icon.down.arrow:before { content: '\e75c'; } /* '' */
+
+i.icon.left:before { content: '\2190'; } /* '←' */
+i.icon.left.triangle:before { content: '\25c2'; } /* '◂' */
+i.icon.left.arrow:before { content: '\e75d'; } /* '' */
+
+i.icon.right:before { content: '\2192'; } /* '→' */
+i.icon.right.triangle:before { content: '\25b8'; } /* '▸' */
+i.icon.right.arrow:before { content: '\e75e'; } /* '' */
+
+i.icon.up:before { content: '\2191'; } /* '↑' */
+i.icon.up.triangle:before { content: '\25b4'; } /* '▴' */
+i.icon.up.arrow:before { content: '\e75f'; } /* '' */
+
+i.icon.folder:before { content: '\e810'; } /* '' */
+i.icon.open.folder:before { content: '📂'; } /* '\1f4c2' */
+
+i.icon.globe:before { content: '𝌍'; } /* '\1d30d' */
+i.icon.desk.globe:before { content: '🌐'; } /* '\1f310' */
+
+i.icon.star:before { content: '\e801'; } /* '' */
+i.icon.star.empty:before { content: '\e800'; } /* '' */
+i.icon.star.half:before { content: '\e701'; } /* '' */
+
+i.icon.lock:before { content: '🔒'; } /* '\1f512' */
+i.icon.unlock:before { content: '🔓'; } /* '\1f513' */
+
+i.icon.layout.grid:before { content: '\e80c'; } /* '' */
+i.icon.layout.block:before { content: '\e708'; } /* '' */
+i.icon.layout.list:before { content: '\e80b'; } /* '' */
+
+i.icon.heart.empty:before { content: '\2661'; } /* '♡' */
+i.icon.heart:before { content: '\2665'; } /* '♥' */
+
+
+i.icon.asterisk:before { content: '\2731'; } /* '✱' */
+i.icon.attachment:before { content: '📎'; } /* '\1f4ce' */
+i.icon.attention:before { content: '\26a0'; } /* '⚠' */
+i.icon.trophy:before { content: '🏉'; } /* '\1f3c9' */
+i.icon.barcode:before { content: '\e792'; } /* '' */
+i.icon.cart:before { content: '\e813'; } /* '' */
+i.icon.block:before { content: '🚫'; } /* '\1f6ab' */
+i.icon.book:before { content: '📖'; }
+i.icon.bookmark:before { content: '🔖'; } /* '\1f516' */
+i.icon.calendar:before { content: '📅'; } /* '\1f4c5' */
+i.icon.cancel:before { content: '\2716'; } /* '✖' */
+i.icon.close:before { content: '\e80d'; } /* '' */
+i.icon.color:before { content: '\e794'; } /* '' */
+i.icon.chat:before { content: '\e720'; } /* '' */
+i.icon.check:before { content: '\2611'; } /* '☑' */
+i.icon.time:before { content: '🕔'; } /* '\1f554' */
+i.icon.cloud:before { content: '\2601'; } /* '☁' */
+i.icon.code:before { content: '\e714'; } /* '' */
+i.icon.email:before { content: '\40'; } /* '@' */
+i.icon.settings:before { content: '\26ef'; } /* '⛯' */
+i.icon.setting:before { content: '\2699'; } /* '⚙' */
+i.icon.comment:before { content: '\e802'; } /* '' */
+i.icon.clockwise.counter:before { content: '\27f2'; } /* '⟲' */
+i.icon.clockwise:before { content: '\27f3'; } /* '⟳' */
+i.icon.cube:before { content: '\e807'; } /* '' */
+i.icon.direction:before { content: '\27a2'; } /* '➢' */
+i.icon.doc:before { content: '📄'; } /* '\1f4c4' */
+i.icon.docs:before { content: '\e736'; } /* '' */
+i.icon.dollar:before { content: '💵'; } /* '\1f4b5' */
+i.icon.paint:before { content: '\e7b5'; } /* '' */
+i.icon.edit:before { content: '\270d'; } /* '✍' */
+i.icon.eject:before { content: '\2ecf'; } /* '⻏' */
+i.icon.export:before { content: '\e715'; } /* '' */
+i.icon.hide:before  { content: '\e70b'; } /* '' */
+i.icon.unhide:before { content: '\e80f'; } /* '' */
+i.icon.facebook:before { content: '\f301'; } /* '' */
+i.icon.fast-forward:before { content: '\e804'; } /* '' */
+i.icon.fire:before { content: '🔥'; } /* '\1f525' */
+i.icon.flag:before { content: '\2691'; } /* '⚑' */
+i.icon.lightning:before { content: '\26a1'; } /* '⚡' */
+i.icon.lab:before { content: '\68'; } /* 'h' */
+i.icon.flight:before { content: '\2708'; } /* '✈' */
+i.icon.forward:before { content: '\27a6'; } /* '➦' */
+i.icon.gift:before { content: '🎁'; } /* '\1f381' */
+i.icon.github:before { content: '\f308'; } /* '' */
+i.icon.globe:before { content: '\e817'; } /* '' */
+i.icon.headphones:before { content: '🎧'; } /* '\1f3a7' */
+i.icon.question:before { content: '\2753'; } /* '❓' */
+i.icon.home:before { content: '\2302'; } /* '⌂' */
+i.icon.i:before { content: '\2139'; } /* 'ℹ' */
+i.icon.idea:before { content: '💡'; } /* '\1f4a1' */
+i.icon.open:before { content: '🔗'; } /* '\1f517' */
+i.icon.content:before { content: '\e782'; } /* '' */
+i.icon.location:before { content: '\e724'; } /* '' */
+i.icon.mail:before { content: '\2709'; } /* '✉' */
+i.icon.mic:before { content: '🎤'; } /* '\1f3a4' */
+i.icon.minus:before { content: '\2d'; } /* '-' */
+i.icon.money:before { content: '💰'; } /* '\1f4b0' */
+i.icon.off:before { content: '\e78e'; } /* '' */
+i.icon.pause:before { content: '\e808'; } /* '' */
+i.icon.photos:before { content: '\e812'; } /* '' */
+i.icon.photo:before { content: '🌄'; } /* '\1f304' */
+i.icon.pin:before { content: '📌'; } /* '\1f4cc' */
+i.icon.play:before { content: '\e809'; } /* '' */
+i.icon.plus:before { content: '\2b'; } /* '+' */
+i.icon.print:before { content: '\e716'; } /* '' */
+i.icon.rss:before { content: '\e73a'; } /* '' */
+i.icon.search:before { content: '🔍'; } /* '\1f50d' */
+i.icon.shuffle:before { content: '\e803'; } /* '' */
+i.icon.tag:before { content: '\e80a'; } /* '' */
+i.icon.tags:before { content: '\e70d'; } /* '' */
+i.icon.terminal:before { content: '\e7ac'; } /* '' */
+i.icon.thumbs.down:before { content: '👎'; } /* '\1f44e' */
+i.icon.thumbs.up:before { content: '👍'; } /* '\1f44d' */
+i.icon.to-end:before { content: '\e806'; } /* '' */
+i.icon.to-start:before { content: '\e805'; } /* '' */
+i.icon.top.list:before { content: '🏆'; } /* '\1f3c6' */
+i.icon.trash:before { content: '\e729'; } /* '' */
+i.icon.twitter:before { content: '\f303'; } /* '' */
+i.icon.upload:before { content: '\e711'; } /* '' */
+i.icon.user.add:before { content: '\e700'; } /* '' */
+i.icon.user:before { content: '👤'; } /* '\1f464' */
+i.icon.community:before { content: '\e814'; } /* '' */
+i.icon.users:before { content: '👥'; } /* '\1f465' */
+i.icon.id:before { content: '\e722'; } /* '' */
+i.icon.url:before { content: '🔗'; } /* '\1f517' */
+i.icon.zoom.in:before { content: '\e750'; } /* '' */
+i.icon.zoom.out:before { content: '\e751'; } /* '' */
 
 /*--------------
    Spacing Fix
 ---------------*/
 
 /* dropdown arrows are to the right */
-i.dropdown.basic.icon {
+i.dropdown.icon {
   margin: 0em 0em 0em 0.5em;
 }
 
 /* stars are usually consecutive */
-i.basic.icon.star {
+i.icon.star {
   width: auto;
   margin: 0em;
 }
 
 /* left side basic.icons */
-i.basic.icon.left {
+i.icon.left {
   width: auto;
   margin: 0em 0.5em 0em 0em;
 }
 
 /* right side basic.icons */
-i.basic.icon.search,
-i.basic.icon.up,
-i.basic.icon.down,
-i.basic.icon.right {
+i.icon.search,
+i.icon.up,
+i.icon.down,
+i.icon.right {
   width: auto;
   margin: 0em 0em 0em 0.5em;
 }
@@ -174,16 +174,16 @@ i.basic.icon.right {
 ---------------*/
 
 /* aliases for convenience */
-i.basic.icon.delete:before { content: '\e80d'; } /* '' */
-i.basic.icon.dropdown:before { content: '\25be'; } /* '▾' */
+i.icon.delete:before { content: '\e80d'; } /* '' */
+i.icon.dropdown:before { content: '\25be'; } /* '▾' */
 
-i.basic.icon.help:before { content: '\e704'; } /* '' */
-i.basic.icon.info:before { content: '\e705'; } /* '' */
-i.basic.icon.error:before { content: '\e80d'; } /* '' */
+i.icon.help:before { content: '\e704'; } /* '' */
+i.icon.info:before { content: '\e705'; } /* '' */
+i.icon.error:before { content: '\e80d'; } /* '' */
 
-i.basic.icon.dislike:before { content: '\2661'; } /* '♡' */
-i.basic.icon.like:before { content: '\2665'; } /* '♥' */
+i.icon.dislike:before { content: '\2661'; } /* '♡' */
+i.icon.like:before { content: '\2665'; } /* '♥' */
 
-i.basic.icon.eye:before { content: '\e80f'; } /* '' */
-i.basic.icon.eye.hidden:before { content: '\e70b'; } /* '' */
-i.basic.icon.date:before { content: '📅'; } /* '\1f4c5' */
+i.icon.eye:before { content: '\e80f'; } /* '' */
+i.icon.eye.hidden:before { content: '\e70b'; } /* '' */
+i.icon.date:before { content: '📅'; } /* '\1f4c5' */
diff --git a/src/themes/basic/elements/icon.variables b/src/themes/basic/elements/icon.variables
index 388707a76..9fcd5f7e4 100644
--- a/src/themes/basic/elements/icon.variables
+++ b/src/themes/basic/elements/icon.variables
@@ -3,3 +3,10 @@
 --------------------*/
 
 @fontPath  : "../../themes/basic/assets/fonts";
+
+@src:
+  url("@{fontPath}/@{fontName}.eot?#iefix") format('embedded-opentype'),
+  url("@{fontPath}/@{fontName}.woff") format('woff'),
+  url("@{fontPath}/@{fontName}.ttf") format('truetype'),
+  url("@{fontPath}/@{fontName}.svg#icons") format('svg')
+;
\ No newline at end of file
diff --git a/src/themes/default/assets/fonts/icons.otf b/src/themes/default/assets/fonts/icons.otf
deleted file mode 100644
index f7936cc1e..000000000
Binary files a/src/themes/default/assets/fonts/icons.otf and /dev/null differ
diff --git a/src/themes/default/elements/icon.variables b/src/themes/default/elements/icon.variables
index 58aac0fd9..597966d0b 100644
--- a/src/themes/default/elements/icon.variables
+++ b/src/themes/default/elements/icon.variables
@@ -31,4 +31,13 @@
 @large: 1.5em;
 @big: 2em;
 @huge: 4em;
-@massive: 8em;
\ No newline at end of file
+@massive: 8em;
+
+@fallbackSRC: url("@{fontPath}/@{fontName}.eot");
+@src:
+  url("@{fontPath}/@{fontName}.eot?#iefix") format('embedded-opentype'),
+  url("@{fontPath}/@{fontName}.woff2") format('woff'),
+  url("@{fontPath}/@{fontName}.woff") format('woff'),
+  url("@{fontPath}/@{fontName}.ttf") format('truetype'),
+  url("@{fontPath}/@{fontName}.svg#icons") format('svg')
+;
\ No newline at end of file