diff --git a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
index ab86f44e8..f0b207425 100755
--- a/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
+++ b/core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
@@ -85,7 +85,7 @@ class SmartyParser extends Smarty implements ParserInterface
         $this->registerFilter('output', array($this, "removeBlankLines"));
         $this->registerFilter('variable', array(__CLASS__, "theliaEscape"));
     }
-    
+
     public function removeBlankLines($tpl_source, \Smarty_Internal_Template $template)
     {
         return preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $tpl_source);
diff --git a/templates/default/index.html b/templates/default/index.html
index bdf18cec8..e0411d6b9 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -17,8 +17,8 @@
                     </figure>
                 </div>
             </div>
-            <a class="left carousel-control" href="#carousel" data-slide="prev"><i class="icon-prev"></i></a>
-            <a class="right carousel-control" href="#carousel" data-slide="next"><i class="icon-next"></i></a>
+            <a class="left carousel-control" href="#carousel" data-slide="prev"><span class="icon-prev"></span></a>
+            <a class="right carousel-control" href="#carousel" data-slide="next"><span class="icon-next"></span></a>
         </div>
     </section><!-- #carousel -->
 
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 8cd5d0129..6bf781a3c 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -113,7 +113,7 @@ URL: http://www.thelia.net
                         <div class="input-group">
                             <input type="search" name="q" id="q" placeholder="Search..." class="form-control" aria-required="true" required pattern=". { 2,}" title="Minmimum 2 characters.">
                             <div class="input-group-btn">
-                                <button type="submit" class="btn btn-search"><i class="icon-search"></i> <span>Search</span></button>
+                                <button type="submit" class="btn btn-search"><span class="icon-search"></span> <span>Search</span></button>
                             </div>
                         </div>
                     </form>
@@ -158,15 +158,15 @@ URL: http://www.thelia.net
         <div class="container">
             <div class="banner banner-col-3">
                 <div class="col">
-                    <i class="icon-truck icon-flip-horizontal"></i>
+                    <span class="icon-truck icon-flip-horizontal"></span>
                     Free shipping <small>Orders over $50</small>
                 </div>
                 <div class="col">
-                    <i class="icon-credit-card"></i>
+                    <span class="icon-credit-card"></span>
                     Secure payment <small>Multi-payment plateform</small>
                 </div>
                 <div class="col">
-                    <i class="icon-info"></i>
+                    <span class="icon-info"></span>
                     Need help ? <small>Questions ? See or F.A.Q.</small>
                 </div>
             </div>
@@ -228,48 +228,48 @@ URL: http://www.thelia.net
                                 <li>
                                     <a href="http://facebook.com" class="facebook" data-toggle="tooltip" data-placement="top" title="facebook" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-facebook icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-facebook icon-light"></span>
 												</span>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="http://twitter.com" class="twitter" data-toggle="tooltip" data-placement="top" title="twitter" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-twitter icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-twitter icon-light"></span>
 												</span>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="http://instagram.com" class="instagram" data-toggle="tooltip" data-placement="top" title="instagram" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-instagram icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-instagram icon-light"></span>
 												</span>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="http://google.com" class="google-plus" data-toggle="tooltip" data-placement="top" title="google+" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-google-plus icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-google-plus icon-light"></span>
 												</span>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="http://youtube.com" class="youtube" data-toggle="tooltip" data-placement="top" title="youtube" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-youtube icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-youtube icon-light"></span>
 												</span>
                                     </a>
                                 </li>
                                 <li>
                                     <a href="#rss" class="rss" data-toggle="tooltip" data-placement="top" title="rss" target="_blank">
 												<span class="icon-stack">
-													<i class="icon-circle icon-stack-base"></i>
-													<i class="icon-rss icon-light"></i>
+													<span class="icon-circle icon-stack-base"></span>
+													<span class="icon-rss icon-light"></span>
 												</span>
                                     </a>
                                 </li>
diff --git a/templates/default/login.html b/templates/default/login.html
index c7eb03986..484125e5d 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -34,7 +34,7 @@
                             <div class="control-input">
                             <input type="email" name="{$name}" id="{$label_attr.for}" value="{$value}" class="form-control" {$attr}  aria-required="true" autofocus required>
                             {if $error}
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                <span class="help-block"><span class="icon-remove"></span> {$message}</span>
                             {/if}
                             </div>
                         </div>
@@ -58,7 +58,7 @@
                             <div class="control-input">
                             <input type="password" name="{$name}" id="{$label_attr.for}" class="form-control" autocomplete="off">
                             {if $error}
-                                <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                <span class="help-block"><span class="icon-remove"></span> {$message}</span>
                             {/if}
                             </div>
                         </div>
diff --git a/templates/default/register.html b/templates/default/register.html
index e38830743..f8f26e4c1 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -30,7 +30,7 @@
                             <label class="control-label" for="firstname">First Name: <span class="required">*</span></label>
                             <div class="control-input">
                                 <input type="text" name="firstname" id="firstname" class="form-control" placeholder="John" autofocus required>
-                                <span class="help-block"><i class="icon-ok"></i> Available input!</span>
+                                <span class="help-block"><span class="icon-ok"></span> Available input!</span>
                             </div>
                         </div><!--/.form-group-->
 
@@ -38,7 +38,7 @@
                             <label class="control-label " for="lastname">Last Name: <span class="required">*</span></label>
                             <div class="control-input">
                                 <input type="text" name="lastname" id="lastname" class="form-control" placeholder="Doe" required>
-                                <span class="help-block"><i class="icon-remove"></i> Invalid input!</span>
+                                <span class="help-block"><span class="icon-remove"></span> Invalid input!</span>
                             </div>
                         </div><!--/.form-group-->