diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less
index 758489961..a529d591f 100644
--- a/themes/V3/5ePHB/style.less
+++ b/themes/V3/5ePHB/style.less
@@ -1,5 +1,6 @@
 @import (less) './themes/assets/assets.less';
 @import (less) './themes/fonts/icon fonts/font-icons.less';
+@import (less) './themes/fonts/icon fonts/dicefont.less';
 
 :root {
 	//Colors
diff --git a/themes/fonts/icon fonts/dicefont.less b/themes/fonts/icon fonts/dicefont.less
index 887a7c27c..78a88f03a 100644
--- a/themes/fonts/icon fonts/dicefont.less	
+++ b/themes/fonts/icon fonts/dicefont.less	
@@ -1,118 +1,114 @@
-/*
-  Icon Font: dicefont
-*/
+/* Icon Font: dicefont */
 @font-face {
-  font-family: 'DiceFont';
-  src: url('../../../fonts/5e/dicefont.woff2') format('woff2'),
-       url('../../../fonts/5e/dicefont.woff') format('woff');
-  font-weight: normal;
-  font-style: normal;
-}
+	font-family : 'DiceFont';
+	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/icon fonts/dicefont.woff2');
+} 
 
 .df {
-  display: inline-block;
-  font-family: 'DiceFont';
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  line-height: 1;
-  text-decoration: inherit;
-  text-rendering: optimizeLegibility;
-  text-transform: none;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  font-smooth: antialiased;
-  &.F:before { content: '\f190'; }
-  &.F-minus:before { content: '\f191'; }
-  &.F-plus:before { content: '\f192'; }
-  &.F-zero:before { content: '\f193'; }
-  &.d10:before { content: '\f194'; }
-  &.d10-0:before { content: '\f100'; }
-  &.d10-1:before { content: '\f101'; }
-  &.d10-10:before { content: '\f102'; }
-  &.d10-2:before { content: '\f103'; }
-  &.d10-3:before { content: '\f104'; }
-  &.d10-4:before { content: '\f105'; }
-  &.d10-5:before { content: '\f106'; }
-  &.d10-6:before { content: '\f107'; }
-  &.d10-7:before { content: '\f108'; }
-  &.d10-8:before { content: '\f109'; }
-  &.d10-9:before { content: '\f10a'; }
-  &.d12:before { content: '\f195'; }
-  &.d12-1:before { content: '\f10b'; }
-  &.d12-10:before { content: '\f10c'; }
-  &.d12-11:before { content: '\f10d'; }
-  &.d12-12:before { content: '\f10e'; }
-  &.d12-2:before { content: '\f10f'; }
-  &.d12-3:before { content: '\f110'; }
-  &.d12-4:before { content: '\f111'; }
-  &.d12-5:before { content: '\f112'; }
-  &.d12-6:before { content: '\f113'; }
-  &.d12-7:before { content: '\f114'; }
-  &.d12-8:before { content: '\f115'; }
-  &.d12-9:before { content: '\f116'; }
-  &.d2:before { content: '\f196'; }
-  &.d2-1:before { content: '\f117'; }
-  &.d2-2:before { content: '\f118'; }
-  &.d20:before { content: '\f197'; }
-  &.d20-1:before { content: '\f119'; }
-  &.d20-10:before { content: '\f11a'; }
-  &.d20-11:before { content: '\f11b'; }
-  &.d20-12:before { content: '\f11c'; }
-  &.d20-13:before { content: '\f11d'; }
-  &.d20-14:before { content: '\f11e'; }
-  &.d20-15:before { content: '\f11f'; }
-  &.d20-16:before { content: '\f120'; }
-  &.d20-17:before { content: '\f121'; }
-  &.d20-18:before { content: '\f122'; }
-  &.d20-19:before { content: '\f123'; }
-  &.d20-2:before { content: '\f124'; }
-  &.d20-20:before { content: '\f125'; }
-  &.d20-3:before { content: '\f126'; }
-  &.d20-4:before { content: '\f127'; }
-  &.d20-5:before { content: '\f128'; }
-  &.d20-6:before { content: '\f129'; }
-  &.d20-7:before { content: '\f12a'; }
-  &.d20-8:before { content: '\f12b'; }
-  &.d20-9:before { content: '\f12c'; }
-  &.d4:before { content: '\f198'; }
-  &.d4-1:before { content: '\f12d'; }
-  &.d4-2:before { content: '\f12e'; }
-  &.d4-3:before { content: '\f12f'; }
-  &.d4-4:before { content: '\f130'; }
-  &.d6:before { content: '\f199'; }
-  &.d6-1:before { content: '\f131'; }
-  &.d6-2:before { content: '\f132'; }
-  &.d6-3:before { content: '\f133'; }
-  &.d6-4:before { content: '\f134'; }
-  &.d6-5:before { content: '\f135'; }
-  &.d6-6:before { content: '\f136'; }
-  &.d8:before { content: '\f19a'; }
-  &.d8-1:before { content: '\f137'; }
-  &.d8-2:before { content: '\f138'; }
-  &.d8-3:before { content: '\f139'; }
-  &.d8-4:before { content: '\f13a'; }
-  &.d8-5:before { content: '\f13b'; }
-  &.d8-6:before { content: '\f13c'; }
-  &.d8-7:before { content: '\f13d'; }
-  &.d8-8:before { content: '\f13e'; }
-  &.dot-d6:before { content: '\f19b'; }
-  &.dot-d6-1:before { content: '\f13f'; }
-  &.dot-d6-2:before { content: '\f140'; }
-  &.dot-d6-3:before { content: '\f141'; }
-  &.dot-d6-4:before { content: '\f142'; }
-  &.dot-d6-5:before { content: '\f143'; }
-  &.dot-d6-6:before { content: '\f18f'; }
-  &.small-dot-d6-1:before { content: '\f183'; }
-  &.small-dot-d6-2:before { content: '\f184'; }
-  &.small-dot-d6-3:before { content: '\f185'; }
-  &.small-dot-d6-4:before { content: '\f186'; }
-  &.small-dot-d6-5:before { content: '\f187'; }
-  &.small-dot-d6-6:before { content: '\f188'; }
-  &.solid-small-dot-d6-1:before { content: '\f189'; }
-  &.solid-small-dot-d6-2:before { content: '\f18a'; }
-  &.solid-small-dot-d6-3:before { content: '\f18b'; }
-  &.solid-small-dot-d6-4:before { content: '\f18c'; }
-  &.solid-small-dot-d6-5:before { content: '\f18d'; }
-  &.solid-small-dot-d6-6:before { content: '\f18e'; }
+	display                 : inline-block;
+	font-family             : 'DiceFont';
+	font-style              : normal;
+	font-weight             : normal;
+	font-variant            : normal;
+	line-height             : 1;
+	text-decoration         : inherit;
+	text-transform          : none;
+	text-rendering          : optimizeLegibility;
+	-moz-osx-font-smoothing : grayscale;
+	-webkit-font-smoothing  : antialiased;
+	&.F::before { content : '\f190'; }
+	&.F-minus::before { content : '\f191'; }
+	&.F-plus::before { content : '\f192'; }
+	&.F-zero::before { content : '\f193'; }
+	&.d10::before { content : '\f194'; }
+	&.d10-0::before { content : '\f100'; }
+	&.d10-1::before { content : '\f101'; }
+	&.d10-10::before { content : '\f102'; }
+	&.d10-2::before { content : '\f103'; }
+	&.d10-3::before { content : '\f104'; }
+	&.d10-4::before { content : '\f105'; }
+	&.d10-5::before { content : '\f106'; }
+	&.d10-6::before { content : '\f107'; }
+	&.d10-7::before { content : '\f108'; }
+	&.d10-8::before { content : '\f109'; }
+	&.d10-9::before { content : '\f10a'; }
+	&.d12::before { content : '\f195'; }
+	&.d12-1::before { content : '\f10b'; }
+	&.d12-10::before { content : '\f10c'; }
+	&.d12-11::before { content : '\f10d'; }
+	&.d12-12::before { content : '\f10e'; }
+	&.d12-2::before { content : '\f10f'; }
+	&.d12-3::before { content : '\f110'; }
+	&.d12-4::before { content : '\f111'; }
+	&.d12-5::before { content : '\f112'; }
+	&.d12-6::before { content : '\f113'; }
+	&.d12-7::before { content : '\f114'; }
+	&.d12-8::before { content : '\f115'; }
+	&.d12-9::before { content : '\f116'; }
+	&.d2::before { content : '\f196'; }
+	&.d2-1::before { content : '\f117'; }
+	&.d2-2::before { content : '\f118'; }
+	&.d20::before { content : '\f197'; }
+	&.d20-1::before { content : '\f119'; }
+	&.d20-10::before { content : '\f11a'; }
+	&.d20-11::before { content : '\f11b'; }
+	&.d20-12::before { content : '\f11c'; }
+	&.d20-13::before { content : '\f11d'; }
+	&.d20-14::before { content : '\f11e'; }
+	&.d20-15::before { content : '\f11f'; }
+	&.d20-16::before { content : '\f120'; }
+	&.d20-17::before { content : '\f121'; }
+	&.d20-18::before { content : '\f122'; }
+	&.d20-19::before { content : '\f123'; }
+	&.d20-2::before { content : '\f124'; }
+	&.d20-20::before { content : '\f125'; }
+	&.d20-3::before { content : '\f126'; }
+	&.d20-4::before { content : '\f127'; }
+	&.d20-5::before { content : '\f128'; }
+	&.d20-6::before { content : '\f129'; }
+	&.d20-7::before { content : '\f12a'; }
+	&.d20-8::before { content : '\f12b'; }
+	&.d20-9::before { content : '\f12c'; }
+	&.d4::before { content : '\f198'; }
+	&.d4-1::before { content : '\f12d'; }
+	&.d4-2::before { content : '\f12e'; }
+	&.d4-3::before { content : '\f12f'; }
+	&.d4-4::before { content : '\f130'; }
+	&.d6::before { content : '\f199'; }
+	&.d6-1::before { content : '\f131'; }
+	&.d6-2::before { content : '\f132'; }
+	&.d6-3::before { content : '\f133'; }
+	&.d6-4::before { content : '\f134'; }
+	&.d6-5::before { content : '\f135'; }
+	&.d6-6::before { content : '\f136'; }
+	&.d8::before { content : '\f19a'; }
+	&.d8-1::before { content : '\f137'; }
+	&.d8-2::before { content : '\f138'; }
+	&.d8-3::before { content : '\f139'; }
+	&.d8-4::before { content : '\f13a'; }
+	&.d8-5::before { content : '\f13b'; }
+	&.d8-6::before { content : '\f13c'; }
+	&.d8-7::before { content : '\f13d'; }
+	&.d8-8::before { content : '\f13e'; }
+	&.dot-d6::before { content : '\f19b'; }
+	&.dot-d6-1::before { content : '\f13f'; }
+	&.dot-d6-2::before { content : '\f140'; }
+	&.dot-d6-3::before { content : '\f141'; }
+	&.dot-d6-4::before { content : '\f142'; }
+	&.dot-d6-5::before { content : '\f143'; }
+	&.dot-d6-6::before { content : '\f18f'; }
+	&.small-dot-d6-1::before { content : '\f183'; }
+	&.small-dot-d6-2::before { content : '\f184'; }
+	&.small-dot-d6-3::before { content : '\f185'; }
+	&.small-dot-d6-4::before { content : '\f186'; }
+	&.small-dot-d6-5::before { content : '\f187'; }
+	&.small-dot-d6-6::before { content : '\f188'; }
+	&.solid-small-dot-d6-1::before { content : '\f189'; }
+	&.solid-small-dot-d6-2::before { content : '\f18a'; }
+	&.solid-small-dot-d6-3::before { content : '\f18b'; }
+	&.solid-small-dot-d6-4::before { content : '\f18c'; }
+	&.solid-small-dot-d6-5::before { content : '\f18d'; }
+	&.solid-small-dot-d6-6::before { content : '\f18e'; }
 }
\ No newline at end of file
diff --git a/themes/fonts/icon fonts/dicefont.woff b/themes/fonts/icon fonts/dicefont.woff
deleted file mode 100644
index d6f54f38e..000000000
Binary files a/themes/fonts/icon fonts/dicefont.woff and /dev/null differ
diff --git a/themes/fonts/icon fonts/font-icons.less b/themes/fonts/icon fonts/font-icons.less
index f8eb19f11..be8efa734 100644
--- a/themes/fonts/icon fonts/font-icons.less	
+++ b/themes/fonts/icon fonts/font-icons.less	
@@ -1,6 +1,6 @@
-/* Main Font, serif */
+/* Icon Font: Elderberry Inn */
 @font-face {
-	font-family : 'Eldeberry-Inn';
+	font-family : 'Elderberry-Inn';
 	font-style : normal;
 	font-weight : normal;
 	src : url('../../../fonts/icon fonts/Elderberry-Inn-Icons.woff2');
@@ -10,7 +10,7 @@
 	span.ei {
 		display                 : inline-block;
 		margin-right            : 3px;
-		font-family             : 'Eldeberry-Inn';
+		font-family             : 'Elderberry-Inn';
 		line-height             : 1;
 		vertical-align          : baseline;
 		-moz-osx-font-smoothing : grayscale;