diff --git a/e107_admin/image.php b/e107_admin/image.php
index b47a0c660..9a9b9e02b 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -2091,7 +2091,7 @@ class media_admin_ui extends e_admin_ui
 		foreach($bs2 as $val)
 		{
 			$items[] = array(
-					'previewHtml'   => $md->previewTag('glyphicon '.$val,array('type'=>'glyph')),
+					'previewHtml'   => $md->previewTag($val, array('type'=>'glyph')),
 					'previewUrl'	=> 'glyphicon '.$val,
 					'saveValue'		=> $val.'.glyph',
 					'thumbUrl'		=> $val,
@@ -2109,7 +2109,7 @@ class media_admin_ui extends e_admin_ui
 		foreach($fa4 as $val)
 		{
 			$items[] = array(
-					'previewHtml'   => $md->previewTag('fa fa-'.$val,array('type'=>'glyph')),
+					'previewHtml'   => $md->previewTag('fa-'.$val,array('type'=>'glyph')),
 					'previewUrl'	=> 'fa fa-'.$val,
 					'saveValue'		=> 'fa-'.$val.'.glyph',
 					'thumbUrl'		=> 'fa-'.$val,
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 97dd20428..9736caac8 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1453,7 +1453,7 @@ class e_form
 
 		if($parms['icon'])
 		{
-			$class = 'mediaselector-container-icon';
+			$class = 'icon-preview mediaselector-container-icon';
 			$parms['type'] = 'icon';
 		}
 
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index 4ae4ab4ca..2d60adb8d 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -1169,8 +1169,7 @@ class e_media
 				break;
 
 			case "glyph":
-				$preview = "<span class='icon-preview'>".$tp->toGlyph($default)."</span>";
-			//	$previewURL = false;
+				$preview = $tp->toGlyph($default);
 			break;
 
 			case "icon":