diff --git a/public/styleguide/css/styleguide.css b/public/styleguide/css/styleguide.css
index 5cb127e..d48cd21 100644
--- a/public/styleguide/css/styleguide.css
+++ b/public/styleguide/css/styleguide.css
@@ -637,11 +637,11 @@ div.clear {
 /* Pattern Lab icon fonts */
 @font-face {
 	font-family: 'icomoon';
-	src:url('fonts/icomoon.eot?srsv7g');
-	src:url('fonts/icomoon.eot?#iefixsrsv7g') format('embedded-opentype'),
-		url('fonts/icomoon.woff?srsv7g') format('woff'),
-		url('fonts/icomoon.ttf?srsv7g') format('truetype'),
-		url('fonts/icomoon.svg?srsv7g#icomoon') format('svg');
+	src:url('../fonts/icomoon.eot?srsv7g');
+	src:url('../fonts/icomoon.eot?#iefixsrsv7g') format('embedded-opentype'),
+		url('../fonts/icomoon.woff?srsv7g') format('woff'),
+		url('../fonts/icomoon.ttf?srsv7g') format('truetype'),
+		url('../fonts/icomoon.svg?srsv7g#icomoon') format('svg');
 	font-weight: normal;
 	font-style: normal;
 }
diff --git a/public/styleguide/css/styleguide.scss b/public/styleguide/css/styleguide.scss
index ed8ff61..5850f5e 100644
--- a/public/styleguide/css/styleguide.scss
+++ b/public/styleguide/css/styleguide.scss
@@ -871,52 +871,68 @@ div.clear {
 	opacity: .7;
 }
 
+/* Pattern Lab icon fonts */
 /* Pattern Lab icon fonts */
 @font-face {
-	font-family: 'icons';
-	src:url('../assets/icons.eot');
-	src:url('../assets/icons.eot?#iefix') format('embedded-opentype'),
-		url('../assets/icons.woff') format('woff'),
-		url('../assets/icons.ttf') format('truetype'),
-		url('../assets/icons.svg#icons') format('svg');
+	font-family: 'icomoon';
+	src:url('../fonts/icomoon.eot?srsv7g');
+	src:url('../fonts/icomoon.eot?#iefixsrsv7g') format('embedded-opentype'),
+		url('../fonts/icomoon.woff?srsv7g') format('woff'),
+		url('../fonts/icomoon.ttf?srsv7g') format('truetype'),
+		url('../fonts/icomoon.svg?srsv7g#icomoon') format('svg');
 	font-weight: normal;
 	font-style: normal;
 }
 
-
-.icon-reload, .icon-cog, .icon-minus, .icon-plus, .icon-menu, .icon-checkbox-unchecked, .icon-checkbox-checked, .icon-eye {
-	font-family: 'icons';
+.icon-search, .icon-cog, .icon-minus, .icon-plus, .icon-menu, .icon-radio-checked, .icon-radio-unchecked, .icon-file, .icon-link, .icon-keyboard, .icon-qrcode, .icon-eye, .sg-checkbox {
+	font-family: 'icomoon';
 	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-reload:before {
-	content: "\e002";
+
+.icon-search:before {
+	content: "\e600";
 }
 .icon-cog:before {
-	content: "\e000";
+	content: "\e601";
 }
 .icon-minus:before {
-	content: "\e003";
+	content: "\e602";
 }
 .icon-plus:before {
-	content: "\e004";
+	content: "\e603";
 }
 .icon-menu:before {
-	content: "\e005";
+	content: "\e604";
 }
-.icon-checkbox-unchecked:before {
-	content: "\e006";
+.icon-radio-checked:before, .sg-checkbox.active:before {
+	content: "\e605";
 }
-.icon-checkbox-checked:before {
-	content: "\e007";
+.icon-radio-unchecked:before, .sg-checkbox:before {
+	content: "\e606";
+}
+.icon-file:before {
+	content: "\e607";
+}
+.icon-link:before {
+	content: "\e608";
+}
+.icon-keyboard:before {
+	content: "\e609";
+}
+.icon-qrcode:before {
+	content: "\e60a";
 }
 .icon-eye:before {
-	content: "\e001";
+	content: "\e60b";
 }
 
 /******************************************************************/