diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less
index 165bce056..6050ca843 100644
--- a/client/homebrew/editor/snippetbar/snippetbar.less
+++ b/client/homebrew/editor/snippetbar/snippetbar.less
@@ -131,28 +131,6 @@
 			margin-right: 3px;
 			font-size: 1.4em;
 		}
-		/* Fonts */
-		& i {
-			&.OpenSans+span {font-family: 'OpenSans';}
-			&.CodeBold+span {font-family: 'CodeBold';}
-			&.CodeLight+span {font-family: 'CodeLight';}
-			&.ScalySansRemake+span {font-family: 'ScalySansRemake';}
-			&.BookInsanityRemake+span {font-family: 'BookInsanityRemake';}
-			&.MrEavesRemake+span {font-family: 'MrEavesRemake';}
-			&.SolberaImitationRemake+span {font-family: 'SolberaImitationRemake';}
-			&.ScalySansSmallCapsRemake+span {font-family: 'ScalySansSmallCapsRemake';}
-			&.WalterTurncoat+span {font-family: 'WalterTurncoat';}
-			&.Lato+span {font-family: 'Lato';}
-			&.Courier+span {font-family: 'Courier';}
-			&.NodestoCapsCondensed+span {font-family: 'NodestoCapsCondensed';}
-			&.Overpass+span {font-family: 'Overpass';}
-			&.Davek+span {font-family: 'Davek';}
-			&.Iokharic+span {font-family: 'Iokharic';}
-			&.Rellanic+span {font-family: 'Rellanic';}
-			&.TimesNewRoman+span {font-family: 'Times New Roman';}
-
-			&:is(.OpenSans,.CodeBold,.CodeLight,.ScalySansRemake,.BookInsanityRemake,.MrEavesRemake,.SolberaImitationRemake,.ScalySansSmallCapsRemake,.WalterTurncoat,.Lato,.Courier,.NodestoCapsCondensed,.Overpass,.Davek,.Iokharic,.Rellanic,.TimesNewRoman) { font-size:12px}
-		}
 	}
 
 	.toggleMeta {
@@ -200,6 +178,34 @@
 						margin-right: 0;
 						margin-left: 5px;
 					}
+
+					/* Fonts */
+					&.font {
+						height:auto;
+						
+						&::before {
+							content:'F';
+							font-size:1.4em;
+						}
+
+						&.OpenSans {font-family: 'OpenSans';}
+						&.CodeBold {font-family: 'CodeBold';}
+						&.CodeLight {font-family: 'CodeLight';}
+						&.ScalySansRemake {font-family: 'ScalySansRemake';}
+						&.BookInsanityRemake {font-family: 'BookInsanityRemake';}
+						&.MrEavesRemake {font-family: 'MrEavesRemake';}
+						&.SolberaImitationRemake {font-family: 'SolberaImitationRemake';}
+						&.ScalySansSmallCapsRemake {font-family: 'ScalySansSmallCapsRemake';}
+						&.WalterTurncoat {font-family: 'WalterTurncoat';}
+						&.Lato {font-family: 'Lato';}
+						&.Courier {font-family: 'Courier';}
+						&.NodestoCapsCondensed {font-family: 'NodestoCapsCondensed';}
+						&.Overpass {font-family: 'Overpass';}
+						&.Davek {font-family: 'Davek';}
+						&.Iokharic {font-family: 'Iokharic';}
+						&.Rellanic {font-family: 'Rellanic';}
+						&.TimesNewRoman {font-family: 'Times New Roman';}
+					}
 				}
 
 				.name {
diff --git a/themes/V3/Blank/snippets.js b/themes/V3/Blank/snippets.js
index f2d73d357..74a7ce6ed 100644
--- a/themes/V3/Blank/snippets.js
+++ b/themes/V3/Blank/snippets.js
@@ -312,87 +312,87 @@ module.exports = [
 		snippets  : [
 			{
 				name : 'Open Sans',
-				icon : 'OpenSans',
+				icon : 'font OpenSans',
 				gen	 : dedent`{{OpenSans Dummy Text}}`
 			},
 			{
 				name : 'Code Bold',
-				icon : 'CodeBold',
+				icon : 'font CodeBold',
 				gen	 : dedent`{{CodeBold Dummy Text}}`
 			},
 			{
 				name : 'Code Light',
-				icon : 'CodeLight',
+				icon : 'font CodeLight',
 				gen	 : dedent`{{CodeLight Dummy Text}}`
 			},
 			{
 				name : 'Scaly Sans Remake',
-				icon : 'ScalySansRemake',
+				icon : 'font ScalySansRemake',
 				gen	 : dedent`{{ScalySansRemake Dummy Text}}`
 			},
 			{
 				name : 'Book Insanity Remake',
-				icon : 'BookInsanityRemake',
+				icon : 'font BookInsanityRemake',
 				gen	 : dedent`{{BookInsanityRemake Dummy Text}}`
 			},
 			{
 				name : 'Mr Eaves Remake',
-				icon : 'MrEavesRemake',
+				icon : 'font MrEavesRemake',
 				gen	 : dedent`{{MrEavesRemake Dummy Text}}`
 			},
 			{
 				name: 'Solbera Imitation Remake',
-				icon: 'SolberaImitationRemake',
+				icon: 'font SolberaImitationRemake',
 				gen: dedent`{{SolberaImitationRemake Dummy Text}}`
 			  },
 			  {
 				name: 'Scaly Sans Small Caps Remake',
-				icon: 'ScalySansSmallCapsRemake',
+				icon: 'font ScalySansSmallCapsRemake',
 				gen: dedent`{{ScalySansSmallCapsRemake Dummy Text}}`
 			  },
 			  {
 				name: 'Walter Turncoat',
-				icon: 'WalterTurncoat',
+				icon: 'font WalterTurncoat',
 				gen: dedent`{{WalterTurncoat Dummy Text}}`
 			  },
 			  {
 				name: 'Lato',
-				icon: 'Lato',
+				icon: 'font Lato',
 				gen: dedent`{{Lato Dummy Text}}`
 			  },
 			  {
 				name: 'Courier',
-				icon: 'Courier',
+				icon: 'font Courier',
 				gen: dedent`{{Courier Dummy Text}}`
 			  },
 			  {
 				name: 'Nodesto Caps Condensed',
-				icon: 'NodestoCapsCondensed',
+				icon: 'font NodestoCapsCondensed',
 				gen: dedent`{{NodestoCapsCondensed Dummy Text}}`
 			  },
 			  {
 				name: 'Overpass',
-				icon: 'Overpass',
+				icon: 'font Overpass',
 				gen: dedent`{{Overpass Dummy Text}}`
 			  },
 			  {
 				name: 'Davek',
-				icon: 'Davek',
+				icon: 'font Davek',
 				gen: dedent`{{Davek Dummy Text}}`
 			  },
 			  {
 				name: 'Iokharic',
-				icon: 'Iokharic',
+				icon: 'font Iokharic',
 				gen: dedent`{{Iokharic Dummy Text}}`
 			  },
 			  {
 				name: 'Rellanic',
-				icon: 'Rellanic',
+				icon: 'font Rellanic',
 				gen: dedent`{{Rellanic Dummy Text}}`
 			  },
 			  {
 				name: 'Times New Roman',
-				icon: 'TimesNewRoman',
+				icon: 'font TimesNewRoman',
 				gen: dedent`{{TimesNewRoman Dummy Text}}`
 			  }
 		]