diff --git a/e107_admin/header.php b/e107_admin/header.php
index a0c30f282..095cd34ad 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -304,7 +304,7 @@ if(e_PAGE == 'menus.php' && vartrue($_GET['configure'])) // Quick fix for Menu M
 }
 else
 {
-	$e_js->coreCSS('font-awesome/css/font-awesome.min.css');	
+	// $e_js->coreCSS('font-awesome/css/font-awesome.min.css');	
 }
 
 
diff --git a/e107_admin/image.php b/e107_admin/image.php
index 1f34c5720..197eaeba8 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -1237,6 +1237,7 @@ class media_admin_ui extends e_admin_ui
 		);
 		
 		//TODO FIXME Upgrade to bs3 when Bootstrap3 Admin is ready. 
+		/*
 		$bs2 = e107::getMedia()->getGlyphs('bs2','icon-');
 		
 		foreach($bs2 as $val)
@@ -1250,20 +1251,15 @@ class media_admin_ui extends e_admin_ui
 					'slideCategory'	=> 'bootstrap'
 			); 		
 				
-			
-			
-			$text .= "<a data-toggle='context' class='e-media-select e-dialog-close e-tip' data-id='{$im['media_id']}' data-width='32' data-height='32' data-src='{$val}' data-type='glyph' data-bbcode='{$data_bb}' data-target='".$this->getQuery('tagid')."' data-path='{$val}.glyph' data-preview='{$val}.glyph' title='".$val."' style='float:left' href='#' >";
-			$text .= "<span style='margin:7px;display:inline-block'><i class='".$val."' style='color:white' ></i></span>";
-			$text .= "</a>\n\n";
 		}
-	
+		*/
+		
 		$fa4 = e107::getMedia()->getGlyphs('fa4');
-		e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css");
 
 		foreach($fa4 as $val)
 		{
 			$items[] = array( 
-					'previewUrl'	=> $val,
+					'previewUrl'	=> 'fa '.$val,
 					'saveValue'		=> $val.'.glyph',
 					'thumbUrl'		=> $val,
 					'title'			=> $val,
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 07c918417..da59b76e6 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -2722,7 +2722,9 @@ class e_parser
 			}
 
 
-			$text = (deftrue('BOOTSTRAP') === 3) ? "<span class='".$cls."'></span>"  : "<i class='".$cls."'></i>";	// retain space. 
+	//		$text = (deftrue('BOOTSTRAP') === 3) ? "<span class='".$cls."'></span>"  : "<i class='".$cls."'></i>";	// retain space. 
+			
+			$text = "<span class='".$cls."'></span>" ;
 			$text .= ($space !== false) ? $space : "";
 			
 			return $text;
diff --git a/e107_themes/bootstrap/admin_theme.php b/e107_themes/bootstrap/admin_theme.php
index f48a878f9..be9685149 100644
--- a/e107_themes/bootstrap/admin_theme.php
+++ b/e107_themes/bootstrap/admin_theme.php
@@ -1,12 +1,14 @@
 <?php
 if ( ! defined('e107_INIT')) { exit(); }
 
-define("SEP"," <i class='icon-play e-breadcrumb'></i> ");
+define("SEP"," <span class='icon-play e-breadcrumb'></span> ");
 
 // e107::lan('theme');
 e107::js('core','bootstrap/js/bootstrap.min.js');
 e107::css('core','bootstrap/css/bootstrap.min.css');
 e107::css('core','bootstrap/css/bootstrap-responsive.min.css');
+//e107::css('core','font-awesome/css/font-awesome.min.css');
+e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css");
 
 // e107::css('core','bootstrap/css/jquery-ui.custom.css');
 e107::css('theme','admin_style.css');
diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js
index f7ac4c69a..6a248a458 100644
--- a/e107_web/js/core/mediaManager.js
+++ b/e107_web/js/core/mediaManager.js
@@ -201,7 +201,7 @@ $(document).ready(function()
 					
 				if(type == 'glyph')
 				{
-					preview = "<i class='" + src + "'></i>";
+					preview = "<span class='" + src + "'></span>";
 					$('#html_holder').val(preview);
 					$('#path').attr('value',path);		
 				}