diff --git a/classes/Media.php b/classes/Media.php
index f3ac52813..f58889220 100755
--- a/classes/Media.php
+++ b/classes/Media.php
@@ -68,7 +68,7 @@ class MediaCore
 		{
 			//set an alphabetical order for args
 			$html_content = preg_replace_callback(
-				'/(<[a-zA-Z0-9]+)((\s?[a-zA-Z0-9]+=[\"\\\'][^\"\\\']*[\"\\\']\s?)*)>/',
+				'/(<[a-zA-Z0-9]+)((\s\t?[a-zA-Z0-9]+=[\"\\\'][^\"\\\']*[\"\\\']\s\t?)*)>/',
 				array('Media', 'minifyHTMLpregCallback'),
 				$html_content,
 				Media::getBackTrackLimit());
diff --git a/themes/default-bootstrap/modules/blockcategories/category-tree-branch-top.tpl b/themes/default-bootstrap/modules/blockcategories/category-tree-branch-top.tpl
index ce97048b6..d84c173d1 100644
--- a/themes/default-bootstrap/modules/blockcategories/category-tree-branch-top.tpl
+++ b/themes/default-bootstrap/modules/blockcategories/category-tree-branch-top.tpl
@@ -24,8 +24,7 @@
 *}
 
 <li class="category_{$node.id}{if isset($last) && $last == 'true'} last{/if}">
-	<h4><a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
-			title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a></h4>
+	<h4><a href="{$node.link|escape:'html':'UTF-8'}"{if isset($currentCategoryId) && $node.id == $currentCategoryId} class="selected"{/if} title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a></h4>
 		
 	{if $node.children|@count > 0}
 		<ul class="main-level-submenus">
diff --git a/themes/default-bootstrap/modules/blockcategories/category-tree-branch.tpl b/themes/default-bootstrap/modules/blockcategories/category-tree-branch.tpl
index 5718b22d0..1037eb4a6 100644
--- a/themes/default-bootstrap/modules/blockcategories/category-tree-branch.tpl
+++ b/themes/default-bootstrap/modules/blockcategories/category-tree-branch.tpl
@@ -24,8 +24,7 @@
 *}
 
 <li {if isset($last) && $last == 'true'}class="last"{/if}>
-	<a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
-		title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
+	<a href="{$node.link|escape:'html':'UTF-8'}"{if isset($currentCategoryId) && $node.id == $currentCategoryId} class="selected"{/if} title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
 	{if $node.children|@count > 0}
 		<ul>
 		{foreach from=$node.children item=child name=categoryTreeBranch}