diff --git a/templates/backOffice/default/admin-layout.tpl b/templates/backOffice/default/admin-layout.tpl
index e45fad512..42dcaed72 100644
--- a/templates/backOffice/default/admin-layout.tpl
+++ b/templates/backOffice/default/admin-layout.tpl
@@ -162,9 +162,9 @@
                                         {loop name="order-status-list" type="order-status"}
                                             {assign "orderStatusLabel" "order_$CODE"}
                                             <li role="menuitem">
-                                                <a class="clearfix" data-target="{url path="admin/orders/$LABEL"}" href="{url path="admin/orders" status=$ID}">
+                                                <a class="clearfix" data-target="{url path="admin/orders/$LABEL"}" href="{url path="admin/orders" status={$ID}}">
                                                     <span class="pull-left">{$TITLE}</span>
-                                                    <span class="label label-{#$orderStatusLabel#} pull-right">{count type="order" customer="*" backend_context="1" status=$ID}</span>
+                                                    <span class="label label-{#$orderStatusLabel#} pull-right">{count type="order" customer="*" backend_context="1" status={$ID}}</span>
                                                 </a>
                                             </li>
                                         {/loop}
diff --git a/templates/backOffice/default/administrators.html b/templates/backOffice/default/administrators.html
index 9c5b414c0..649501c79 100644
--- a/templates/backOffice/default/administrators.html
+++ b/templates/backOffice/default/administrators.html
@@ -67,7 +67,7 @@
                                     <td data-field-class="js-locale">{$LOCALE}</td>
                                     <td data-field-class="js-profile" data-value="{$PROFILE}">
                                        {if $PROFILE}
-                                            {loop type="profile" name="admin-profile" id=$PROFILE}
+                                            {loop type="profile" name="admin-profile" id={$PROFILE}}
                                                 <a title="{intl l='Afficher ce profil'}" href="{url path="/admin/configuration/profiles/update/$ID"}">{$TITLE}</a>
                                             {/loop}
                                         {else}
@@ -125,21 +125,21 @@
 
     {form_field form=$form field='login'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Login'}" placeholder="{intl l='Login'}" class="form-control" value="{if $form_error}{$value}{/if}">
         </div>
     {/form_field}
 
     {form_field form=$form field='firstname'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='FirstName'}" placeholder="{intl l='FirstName'}" class="form-control" value="{if $form_error}{$value}{/if}">
         </div>
     {/form_field}
 
     {form_field form=$form field='lastname'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='LastName'}" placeholder="{intl l='LastName'}" class="form-control" value="{if $form_error}{$value}{/if}">
         </div>
     {/form_field}
@@ -150,21 +150,21 @@
 
     {form_field form=$form field='password'}
         <div class="form-group {if $passwordError}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="password" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Password'}" class="form-control">
         </div>
     {/form_field}
 
     {form_field form=$form field='password_confirm'}
         <div class="form-group {if $passwordError}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="password" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Password'}" class="form-control">
         </div>
     {/form_field}
 
     {form_field form=$form field='locale'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
 
             <select id="{$label_attr.for}" name="{$name}" required="required" data-toggle="selectpicker">
                 {loop name='lang-admin' type="lang"}
@@ -177,7 +177,7 @@
 
     {form_field form=$form field='profile'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
 
             <select id="{$label_attr.for}" name="{$name}" required="required" data-toggle="selectpicker">
                 {foreach $choices as $choice}
@@ -229,21 +229,21 @@
 
     {form_field form=$form field='login'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Login'}" placeholder="{intl l='Login'}" class="form-control js-login" value="{if $form_error}{$value}{/if}">
         </div>
     {/form_field}
 
     {form_field form=$form field='firstname'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='FirstName'}" placeholder="{intl l='FirstName'}" class="form-control js-firstname" value="{if $form_error}{$value}{/if}">
         </div>
     {/form_field}
 
     {form_field form=$form field='lastname'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='LastName'}" placeholder="{intl l='LastName'}" class="form-control js-lastname" value="{if $form_error}{$value}{/if}">
         </div>
     {/form_field}
@@ -254,21 +254,21 @@
 
     {form_field form=$form field='password'}
         <div class="form-group {if $passwordError}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="password" id="{$label_attr.for}" name="{$name}" title="{intl l='Password'}" placeholder="{intl l='Leave empty to keep current password'}" class="form-control">
         </div>
     {/form_field}
 
     {form_field form=$form field='password_confirm'}
         <div class="form-group {if $passwordError}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="password" id="{$label_attr.for}" name="{$name}" title="{intl l='Password'}" placeholder="{intl l='Leave empty to keep current password'}" class="form-control">
         </div>
     {/form_field}
 
     {form_field form=$form field='locale'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label}: </label>
+            <label for="{$label_attr.for}" class="control-label">{$label}: </label>
 
             <select id="{$label_attr.for}" name="{$name}" required="required" data-toggle="selectpicker">
                 {loop name='lang-admin' type="lang"}
@@ -281,7 +281,7 @@
 
     {form_field form=$form field='profile'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
 
             <select id="{$label_attr.for}" name="{$name}" required="required" data-toggle="selectpicker" class="js-profile">
                 {foreach $choices as $choice}
diff --git a/templates/backOffice/default/ajax/product-related-tab.html b/templates/backOffice/default/ajax/product-related-tab.html
index edaa101a9..8367e7f71 100644
--- a/templates/backOffice/default/ajax/product-related-tab.html
+++ b/templates/backOffice/default/ajax/product-related-tab.html
@@ -266,7 +266,7 @@
 	                    <p class="title title-without-tabs">{intl l='Additional categories'}</p>
 	                    <p>{intl l='A product could be attached to more than one category. Select here the additional categories for this product.'}
 	                    {loop name="default_category" type="category" id=$DEFAULT_CATEGORY}
-	                        {intl l='You can change the default category (%title) in the "General" tab.' title=$TITLE}
+	                        {intl l='You can change the default category (%title) in the "General" tab.' title={$TITLE}}
 	                    {/loop}
 
 	                    {$exclude_from_tree = "-1"}
diff --git a/templates/backOffice/default/attribute-edit.html b/templates/backOffice/default/attribute-edit.html
index e8058983b..a057fdd26 100644
--- a/templates/backOffice/default/attribute-edit.html
+++ b/templates/backOffice/default/attribute-edit.html
@@ -16,7 +16,7 @@
     			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
                 <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
                 <li><a href="{url path='/admin/configuration/attributes'}">{intl l="Attributes"}</a></li>
-                <li>{intl l='Editing attribute "%name"' name=$TITLE}</li>
+                <li>{intl l='Editing attribute "%name"' name={$TITLE}}</li>
             </ul>
 
     		<div class="row">
@@ -24,7 +24,7 @@
     				<div class="row">
 
     					<div class="col-md-12 title title-without-tabs">
-    					   {intl l='Edit attribute "%name"' name=$TITLE}
+    					   {intl l='Edit attribute "%name"' name={$TITLE}}
     					</div>
 
                         <div class="col-md-12">
@@ -186,7 +186,7 @@
             <div class="row">
                 <div class="col-md-12">
                     <div class="alert alert-error">
-                        {intl l="Sorry, attribute ID=%id was not found." id=$attribute_id}
+                        {intl l="Sorry, attribute ID=%id was not found." id={$attribute_id}}
                     </div>
                 </div>
             </div>
@@ -223,10 +223,10 @@
                 {loop type="lang" name="current-edit-lang" id="$edit_language_id"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Attribute title'}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l={$TITLE}}" /></span>
                     </div>
 
-                    <div class="help-block">{intl l="Enter here the value in the current edit language (%title)" title=$TITLE}</div>
+                    <div class="help-block">{intl l="Enter here the value in the current edit language (%title)" title={$TITLE}}</div>
 
                     {form_field form=$form field='locale'}
                         <input type="hidden" name="{$name}" value="{$LOCALE}" />
diff --git a/templates/backOffice/default/attributes.html b/templates/backOffice/default/attributes.html
index 1994c2e76..984dad6d5 100644
--- a/templates/backOffice/default/attributes.html
+++ b/templates/backOffice/default/attributes.html
@@ -166,10 +166,10 @@
                 {loop type="lang" name="default-lang" default_only="1"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Attribute title'}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
                     </div>
 
-                    <div class="help-block">{intl l="Enter here the attribute name in the default language (%language_name)" language_name=$TITLE}</div>
+                    <div class="help-block">{intl l="Enter here the attribute name in the default language (%language_name)" language_name={$TITLE}}</div>
 
                     {* Switch edition to the current locale *}
                     <input type="hidden" name="edit_language_id" value="{$ID}" />
diff --git a/templates/backOffice/default/categories.html b/templates/backOffice/default/categories.html
index 4d4952f8e..3cf007adf 100644
--- a/templates/backOffice/default/categories.html
+++ b/templates/backOffice/default/categories.html
@@ -22,7 +22,7 @@
                              <caption>
                                  {* display parent category name, and get current cat ID *}
                                  {loop name="category_title" type="category" visible="*" id=$category_id}
-                                     {intl l="Categories in %cat" cat=$TITLE}
+                                     {intl l="Categories in %cat" cat={$TITLE}}
                                      {$cat_id = $ID}
                                  {/loop}
                                  {elseloop rel="category_title"}
@@ -192,7 +192,7 @@
                      <caption>
                          {* display parent category name *}
                          {loop name="category_title" type="category" visible="*" id=$category_id}
-                             {intl l="Products in %cat" cat=$TITLE}
+                             {intl l="Products in %cat" cat={$TITLE}}
                          {/loop}
 
                          {elseloop rel="category_title"}
@@ -505,7 +505,7 @@
 					    </div>
 					</div>
 
-					<div class="help-block">{intl l='Enter here the product price in %title' title=$NAME}</div>
+					<div class="help-block">{intl l='Enter here the product price in %title' title={$NAME}}</div>
 
 			        {form_field form=$form field='currency'}
 			            <input type="hidden" name="{$name}" value="{$ID}" />
@@ -529,7 +529,7 @@
 					    </div>
 					</div>
 
-					<div class="help-block">{intl l='Enter here the product tax price in %title' title=$NAME}</div>
+					<div class="help-block">{intl l='Enter here the product tax price in %title' title={$NAME}}</div>
 				{/loop}
             </div>
         {/form_field}
diff --git a/templates/backOffice/default/category-edit.html b/templates/backOffice/default/category-edit.html
index 4d9682d7a..b245ecc04 100644
--- a/templates/backOffice/default/category-edit.html
+++ b/templates/backOffice/default/category-edit.html
@@ -26,7 +26,7 @@
                 <div class="col-md-12 general-block-decorator">
                     <div class="row">
                         <div class="col-md-7 title">
-                            {intl l='Edit category %title' title=$TITLE}
+                            {intl l='Edit category %title' title={$TITLE}}
                         </div>
 
                         <div class="col-md-5 actions">
diff --git a/templates/backOffice/default/content-edit.html b/templates/backOffice/default/content-edit.html
index 1dad037c3..c30dac683 100644
--- a/templates/backOffice/default/content-edit.html
+++ b/templates/backOffice/default/content-edit.html
@@ -16,7 +16,7 @@
                     <div class="col-md-12 general-block-decorator">
                         <div class="row">
                             <div class="col-md-7 title">
-                                {intl l='Edit content %title' title=$TITLE}
+                                {intl l='Edit content %title' title={$TITLE}}
                             </div>
 
                             <div class="col-md-5 actions">
diff --git a/templates/backOffice/default/countries.html b/templates/backOffice/default/countries.html
index 35c6e37a8..87aeaed22 100644
--- a/templates/backOffice/default/countries.html
+++ b/templates/backOffice/default/countries.html
@@ -132,9 +132,9 @@
                         <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                         <div class="input-group">
                             <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Country title'}">
-                            <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
+                            <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
                         </div>
-                        <div class="help-block">{intl l="Enter here the value in the default language (%title)" title=$TITLE}</div>
+                        <div class="help-block">{intl l="Enter here the value in the default language (%title)" title={$TITLE}}</div>
                     </div>
                 {/form_field}
 
diff --git a/templates/backOffice/default/country-edit.html b/templates/backOffice/default/country-edit.html
index b3177a1ee..4a513ff23 100644
--- a/templates/backOffice/default/country-edit.html
+++ b/templates/backOffice/default/country-edit.html
@@ -122,7 +122,7 @@
                 <div class="row">
                     <div class="col-md-12">
                         <div class="alert alert-error">
-                            {intl l="Sorry, country ID=%id was not found." id=$country_id}
+                            {intl l="Sorry, country ID=%id was not found." id={$country_id}}
                         </div>
                     </div>
                 </div>
diff --git a/templates/backOffice/default/coupon/form.html b/templates/backOffice/default/coupon/form.html
index 4f1650bca..f6d4365c0 100644
--- a/templates/backOffice/default/coupon/form.html
+++ b/templates/backOffice/default/coupon/form.html
@@ -5,7 +5,7 @@
     <div class="col-md-12 general-block-decorator">
         <div class="row">
             <div class="col-md-7 title">
-                {intl l='Edit %title' title=$couponCode}
+                {intl l='Edit %title' title={$couponCode}}
             </div>
         </div>
 
diff --git a/templates/backOffice/default/currencies.html b/templates/backOffice/default/currencies.html
index 98790333b..475aac143 100644
--- a/templates/backOffice/default/currencies.html
+++ b/templates/backOffice/default/currencies.html
@@ -219,10 +219,10 @@
 			        {loop type="lang" name="default-lang" default_only="1"}
 			            <div class="input-group">
 			                <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Currency name'}" placeholder="{intl l='Name'}">
-			                <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
+			                <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
 			            </div>
 
-			            <div class="help-block">{intl l="Enter here the currency name in the default language (%title)" title=$TITLE}</div>
+			            <div class="help-block">{intl l="Enter here the currency name in the default language (%title)" title={$TITLE}}</div>
 
 			            {* Switch edition to the current locale *}
 			            <input type="hidden" name="edit_language_id" value="{$ID}" />
diff --git a/templates/backOffice/default/currency-edit.html b/templates/backOffice/default/currency-edit.html
index 92ff36649..4d59e0fee 100644
--- a/templates/backOffice/default/currency-edit.html
+++ b/templates/backOffice/default/currency-edit.html
@@ -24,7 +24,7 @@
         				<div class="row">
 
         					<div class="col-md-12 title title-without-tabs">
-        					   {intl l='Edit currency "%name"' name=$NAME}
+        					   {intl l='Edit currency "%name"' name={$NAME}}
         					</div>
 
                             <div class="form-container">
@@ -115,7 +115,7 @@
                 <div class="row">
                     <div class="col-md-12">
                         <div class="alert alert-error">
-                            {intl l="Sorry, currency ID=%id was not found." id=$currency_id}
+                            {intl l="Sorry, currency ID=%id was not found." id={$currency_id}}
                         </div>
                     </div>
                 </div>
diff --git a/templates/backOffice/default/customer-edit.html b/templates/backOffice/default/customer-edit.html
index ff0a4a490..ade8e8741 100644
--- a/templates/backOffice/default/customer-edit.html
+++ b/templates/backOffice/default/customer-edit.html
@@ -14,7 +14,7 @@
                 <ul class="breadcrumb">
         			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
                     <li><a href="{url path='/admin/customers'}">{intl l="Customers"}</a></li>
-                    <li>{intl l='Editing customer "%name"' name="{$FIRSTNAME} {$LASTNAME}"}</li>
+                    <li>{intl l="Edit customer %firstname %lastname" firstname={$FIRSTNAME} lastname={$LASTNAME}}</li>
                 </ul>
 
         		<div class="row">
@@ -22,7 +22,7 @@
         				<div class="row">
 
         					<div class="col-md-12 title title-without-tabs">
-        					   {intl l="Edit customer %firstname %lastname" firstname=$FIRSTNAME lastname=$LASTNAME}
+                                {intl l="Edit customer %firstname %lastname" firstname={$FIRSTNAME} lastname={$LASTNAME}}
         					</div>
 
                             <div class="form-container">
diff --git a/templates/backOffice/default/document-edit.html b/templates/backOffice/default/document-edit.html
index 68d4bb85d..5206250b3 100644
--- a/templates/backOffice/default/document-edit.html
+++ b/templates/backOffice/default/document-edit.html
@@ -132,7 +132,7 @@
                             </div>
                         </div>
                         <div class="alert alert-error">
-                            {intl l="Sorry, document ID=%id was not found." id=$documentId}
+                            {intl l="Sorry, document ID=%id was not found." id={$documentId}}
                         </div>
                     </div>
                 </div>
diff --git a/templates/backOffice/default/feature-edit.html b/templates/backOffice/default/feature-edit.html
index 8c19ed761..31c01edac 100644
--- a/templates/backOffice/default/feature-edit.html
+++ b/templates/backOffice/default/feature-edit.html
@@ -16,7 +16,7 @@
     			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
                 <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
                 <li><a href="{url path='/admin/configuration/features'}">{intl l="Features"}</a></li>
-                <li>{intl l='Editing feature "%name"' name=$TITLE}</li>
+                <li>{intl l='Editing feature "%name"' name={$TITLE}}</li>
             </ul>
 
     		<div class="row">
@@ -24,7 +24,7 @@
     				<div class="row">
 
     					<div class="col-md-12 title title-without-tabs">
-    					   {intl l='Edit feature "%name"' name=$TITLE}
+    					   {intl l='Edit feature "%name"' name={$TITLE}}
     					</div>
 
                         <div class="col-md-12">
@@ -186,7 +186,7 @@
             <div class="row">
                 <div class="col-md-12">
                     <div class="alert alert-error">
-                        {intl l="Sorry, feature ID=%id was not found." id=$feature_id}
+                        {intl l="Sorry, feature ID=%id was not found." id={$feature_id}}
                     </div>
                 </div>
             </div>
@@ -223,10 +223,10 @@
                 {loop type="lang" name="current-edit-lang" id="$edit_language_id"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Feature title'}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
                     </div>
 
-                    <div class="help-block">{intl l="Enter here the value in the current edit language (%language_name)" language_name=$TITLE}</div>
+                    <div class="help-block">{intl l="Enter here the value in the current edit language (%language_name)" language_name={$TITLE}}</div>
 
                     {form_field form=$form field='locale'}
                         <input type="hidden" name="{$name}" value="{$LOCALE}" />
diff --git a/templates/backOffice/default/features.html b/templates/backOffice/default/features.html
index b44679348..6e5c18b91 100644
--- a/templates/backOffice/default/features.html
+++ b/templates/backOffice/default/features.html
@@ -166,10 +166,10 @@
                 {loop type="lang" name="default-lang" default_only="1"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Feature title'}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
                     </div>
 
-                    <div class="help-block">{intl l="Enter here the feature name in the default language (%title)" title=$TITLE}</div>
+                    <div class="help-block">{intl l="Enter here the feature name in the default language (%title)" title={$TITLE}}</div>
 
                     {* Switch edition to the current locale *}
                     <input type="hidden" name="edit_language_id" value="{$ID}" />
diff --git a/templates/backOffice/default/folder-edit.html b/templates/backOffice/default/folder-edit.html
index 2eb4350b3..2a22d3741 100644
--- a/templates/backOffice/default/folder-edit.html
+++ b/templates/backOffice/default/folder-edit.html
@@ -20,7 +20,7 @@
             <div class="col-md-12 general-block-decorator">
                 <div class="row">
                     <div class="col-md-7 title">
-						{intl l='Edit folder %title' title=$TITLE}
+						{intl l='Edit folder %title' title={$TITLE}}
 		            </div>
 
                     <div class="col-md-5 actions">
diff --git a/templates/backOffice/default/folders.html b/templates/backOffice/default/folders.html
index 0557d79ac..1b96fd9b7 100644
--- a/templates/backOffice/default/folders.html
+++ b/templates/backOffice/default/folders.html
@@ -22,7 +22,7 @@
                         <caption>
                             {* display parent folder name, and get current folder ID *}
                             {loop name="folder_title" type="folder" visible="*" id=$parent}
-                                {intl l="Folders in %fold" fold=$TITLE}
+                                {intl l="Folders in %fold" fold={$TITLE}}
                                 {$fold_id = $ID}
                             {/loop}
                             {elseloop rel="folder_title"}
@@ -191,7 +191,7 @@
                         <caption>
                             {* display parent folder name *}
                             {loop name="folder_title" type="folder" visible="*" id=$parent}
-                            {intl l="Contents in %fold" fold=$TITLE}
+                            {intl l="Contents in %fold" fold={$TITLE}}
                             {/loop}
 
                             {elseloop rel="folder_title"}
diff --git a/templates/backOffice/default/image-edit.html b/templates/backOffice/default/image-edit.html
index b65c6707d..f9cdc29ce 100644
--- a/templates/backOffice/default/image-edit.html
+++ b/templates/backOffice/default/image-edit.html
@@ -14,7 +14,7 @@
                 <ul class="breadcrumb">
         			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
                     <li><a href="{url path="{$redirectUrl}"}">{intl l="Image"}</a></li>
-                    <li>{intl l='Editing image "%name"' name=$TITLE}</li>
+                    <li>{intl l='Editing image "%name"' name={$TITLE}}</li>
                 </ul>
 
         		<div class="row">
@@ -22,7 +22,7 @@
         				<div class="row">
 
         					<div class="col-md-12 title title-without-tabs">
-        					   {intl l='Edit image "%name"' name=$TITLE}
+        					   {intl l='Edit image "%name"' name={$TITLE}}
         					</div>
 
                             <div class="form-container">
@@ -137,7 +137,7 @@
                             </div>
                         </div>
                         <div class="alert alert-error">
-                            {intl l="Sorry, image ID=%id was not found." id=$imageId}
+                            {intl l="Sorry, image ID=%id was not found." id={$imageId}}
                         </div>
                     </div>
                 </div>
diff --git a/templates/backOffice/default/includes/content-folder-management.html b/templates/backOffice/default/includes/content-folder-management.html
index 6f1b3566b..4bd8c16b7 100644
--- a/templates/backOffice/default/includes/content-folder-management.html
+++ b/templates/backOffice/default/includes/content-folder-management.html
@@ -9,7 +9,7 @@
                         <p class="title title-without-tabs">{intl l='Additional Folders'}</p>
                         <p>{intl l='A content could be attached to more than one folder. Select here the additional folders for this content.'}
                             {loop name="default_folder" type="folder" id=$DEFAULT_FOLDER}
-                            {intl l='You can change the default folder (%title) in the "General" tab.' title=$TITLE}
+                            {intl l='You can change the default folder (%title) in the "General" tab.' title={$TITLE}}
                             {/loop}
 
                             {$exclude_from_tree = "-1"}
diff --git a/templates/backOffice/default/includes/document-upload-list-ajax.html b/templates/backOffice/default/includes/document-upload-list-ajax.html
index 768129554..c081c64d2 100644
--- a/templates/backOffice/default/includes/document-upload-list-ajax.html
+++ b/templates/backOffice/default/includes/document-upload-list-ajax.html
@@ -29,5 +29,5 @@ Parameters:
 {/ifloop}
 
 {elseloop rel="document"}
-<div class="alert alert-info">{intl l='There is no documents attached to this %type.' type=$documentType}</div>
+<div class="alert alert-info">{intl l='There is no documents attached to this %type.' type={$documentType}}</div>
 {/elseloop}
diff --git a/templates/backOffice/default/includes/image-upload-list-ajax.html b/templates/backOffice/default/includes/image-upload-list-ajax.html
index 937aca1a5..185baa092 100644
--- a/templates/backOffice/default/includes/image-upload-list-ajax.html
+++ b/templates/backOffice/default/includes/image-upload-list-ajax.html
@@ -30,5 +30,5 @@ Parameters:
     </ul>
 {/ifloop}
 {elseloop rel="image"}
-<div class="alert alert-info">{intl l='There is no images attached to this %type.' type=$imageType}</div>
+<div class="alert alert-info">{intl l='There is no images attached to this %type.' type={$imageType}}</div>
 {/elseloop}
\ No newline at end of file
diff --git a/templates/backOffice/default/includes/inner-form-toolbar.html b/templates/backOffice/default/includes/inner-form-toolbar.html
index 92bee1af8..ed0cf3b3c 100644
--- a/templates/backOffice/default/includes/inner-form-toolbar.html
+++ b/templates/backOffice/default/includes/inner-form-toolbar.html
@@ -21,7 +21,7 @@ Parameters:
                 {else}
                     {$lang_url = {url path={$page_url|default:$current_url nofilter} edit_language_id=$ID}}
                 {/if}
-		        <a class="language-change-button" data-language-id="{$ID}" href="{$lang_url nofilter}" title="{intl l='Edit information in %lng' lng=$TITLE}">
+		        <a class="language-change-button" data-language-id="{$ID}" href="{$lang_url nofilter}" title="{intl l='Edit information in %lng' lng={$TITLE}}">
 		            <img src="{image file="../assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" />
 		        </a>
 		    </li>
@@ -36,7 +36,7 @@ Parameters:
             <div class="col-md-12">
                 <div class="button-group">
                     {loop name="currency_list" type="currency"}
-                        <a class="btn btn-sm {if $ID == $edit_currency_id}btn-primary{else}btn-default{/if}" href="{url noamp=1 path='/admin/products/update' edit_currency_id=$ID product_id=$product_id current_tab='details'}" title="{intl l='Edit prices in %curr' curr=$NAME}">
+                        <a class="btn btn-sm {if $ID == $edit_currency_id}btn-primary{else}btn-default{/if}" href="{url noamp=1 path='/admin/products/update' edit_currency_id=$ID product_id=$product_id current_tab='details'}" title="{intl l='Edit prices in %curr' curr={$NAME}}">
                             {$SYMBOL}
                         </a>
                     {/loop}
diff --git a/templates/backOffice/default/includes/module-block.html b/templates/backOffice/default/includes/module-block.html
index 6ea8fcda5..36983c4ba 100644
--- a/templates/backOffice/default/includes/module-block.html
+++ b/templates/backOffice/default/includes/module-block.html
@@ -91,9 +91,9 @@
                         </div>
                         <noscript>
                             {if $ACTIVE}
-                                <a title="{intl l="Deactivate %title module" title=$TITLE}" href="{url path="/admin/module/toggle-activation/{$ID}"}">{intl l="deactivation"}</a>
+                                <a title="{intl l="Deactivate %title module" title={$TITLE}}" href="{url path="/admin/module/toggle-activation/{$ID}"}">{intl l="deactivation"}</a>
                             {else}
-                                <a title="{intl l="activate %title module" title=$TITLE}" href="{url path="/admin/module/toggle-activation/{$ID}"}">{intl l="activation"}</a>
+                                <a title="{intl l="activate %title module" title={$TITLE}}" href="{url path="/admin/module/toggle-activation/{$ID}"}">{intl l="activation"}</a>
                             {/if}
                         </noscript>
                     </td>
diff --git a/templates/backOffice/default/includes/product-prices-tab.html b/templates/backOffice/default/includes/product-prices-tab.html
index 3e93352d7..8c55d0fc3 100644
--- a/templates/backOffice/default/includes/product-prices-tab.html
+++ b/templates/backOffice/default/includes/product-prices-tab.html
@@ -350,14 +350,14 @@
                                 <th class="text-center">{intl l='Reference'}</th>
                                 <th class="text-center">{intl l='EAN Code'}</th>
                                 <th class="text-center">{intl l='Stock'}</th>
-								<th class="text-center">{intl l='Price<br />w/o taxes (%currency)' currency=$currency_symbol}</th>
-								<th class="text-center">{intl l='Price<br />w/ taxes (%currency)' currency=$currency_symbol}</th>
+								<th class="text-center">{intl l='Price<br />w/o taxes (%currency)' currency={$currency_symbol}}</th>
+								<th class="text-center">{intl l='Price<br />w/ taxes (%currency)' currency={$currency_symbol}}</th>
 								<th class="text-center">{intl l='Weight<br />(Kg)'}</th>
                                 <th class="text-center">{intl l='Default'}</th>
                                 <th class="text-center">{intl l='Sale'}</th>
                                 <th class="text-center">{intl l='New'}</th>
-								<th class="text-center">{intl l='Sale price<br />w/o taxes (%currency)' currency=$currency_symbol}</th>
-								<th class="text-center">{intl l='Sale price<br />w/ taxes (%currency)' currency=$currency_symbol}</th>
+								<th class="text-center">{intl l='Sale price<br />w/o taxes (%currency)' currency={$currency_symbol}}</th>
+								<th class="text-center">{intl l='Sale price<br />w/ taxes (%currency)' currency={$currency_symbol}}</th>
 								<th class="actions">&nbsp;</th>
 					        </tr>
 					    </thead>
diff --git a/templates/backOffice/default/message-edit.html b/templates/backOffice/default/message-edit.html
index 6de72a897..5eeff56ce 100644
--- a/templates/backOffice/default/message-edit.html
+++ b/templates/backOffice/default/message-edit.html
@@ -16,7 +16,7 @@
 			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
             <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
             <li><a href="{url path='/admin/configuration/messages'}">{intl l="Mailing templates"}</a></li>
-            <li>{intl l='Editing mailing template "%name"' name=$NAME}</li>
+            <li>{intl l='Editing mailing template "%name"' name={$NAME}}</li>
         </ul>
 
 		<div class="row">
@@ -24,7 +24,7 @@
 				<div class="row">
 
 					<div class="col-md-12 title title-without-tabs">
-					   {intl l='Edit mailing template "%name"' name=$NAME}
+					   {intl l='Edit mailing template "%name"' name={$NAME}}
 					</div>
 
                     <div class="form-container">
@@ -209,7 +209,7 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="alert alert-error">
-                    {intl l="Sorry, message ID=%id was not found." id=$message_id}
+                    {intl l="Sorry, message ID=%id was not found." id={$message_id}}
                 </div>
             </div>
         </div>
diff --git a/templates/backOffice/default/messages.html b/templates/backOffice/default/messages.html
index 6344aa45b..c299942da 100644
--- a/templates/backOffice/default/messages.html
+++ b/templates/backOffice/default/messages.html
@@ -143,10 +143,10 @@
 
 	                <div class="input-group">
 	                    <input type="text" id="{$label_attr.for}" {if $required}required="required"{/if} name="{$name}" value="{$value}" title="{intl l='Mailing template purpose'}" placeholder="{intl l='Mailing template purpose'}" class="form-control">
-	                    <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
+	                    <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
 	                </div>
 
-	                <div class="help-block">{intl l="Enter here the mailing template purpose in the default language (%title)" title=$TITLE}</div>
+	                <div class="help-block">{intl l="Enter here the mailing template purpose in the default language (%title)" title={$TITLE}}</div>
 
 	                {form_field form=$form field='locale'}
 	                    <input type="hidden" name="{$name}" value="{$LOCALE}" />
diff --git a/templates/backOffice/default/order-edit.html b/templates/backOffice/default/order-edit.html
index 11f576fa9..238938e7a 100644
--- a/templates/backOffice/default/order-edit.html
+++ b/templates/backOffice/default/order-edit.html
@@ -36,7 +36,7 @@
 
                                 <div class="row">
                                     <div class="col-md-7 title">
-                                        {intl l='Order %ref - ID %id' id=$ID ref=$REF}
+                                        {intl l='Order %ref - ID %id' id={$ID} ref={$REF}}
                                     </div>
 
                                     <div class="col-md-5 actions">
@@ -69,7 +69,7 @@
                                         <div class="table-responsive">
                                             <table class="table table-striped table-condensed table-left-aligned">
                                                 <caption class="clearfix">
-                                                   {intl l='Cart - Prices in %currency' currency=$orderCurrency}
+                                                   {intl l='Cart - Prices in %currency' currency={$orderCurrency}}
                                                 </caption>
                                                 <thead>
                                                     <tr>
@@ -388,14 +388,14 @@
 
             {form_field form=$form field='company'}
                 <div class="form-group {if $error}has-error{/if}">
-                    <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
-                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-company" value="{$value}" title="{intl l=$label}" placeholder="{intl l='Company'}">
+                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-company" value="{$value}" title="{$label}" placeholder="{intl l='Company'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='title'}                
                 <div class="form-group {if $error}has-error{/if}">
-                    <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                     
                     <select name="{$name}" id="{$label_attr.for}" class="form-control js-title">
                         {loop type="title" name="title1"}
@@ -407,54 +407,54 @@
 
             {form_field form=$form field='firstname'}
                 <div class="form-group {if $error}has-error{/if}">
-                    <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
-                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-firstname" value="{$value}" title="{intl l=$label}" placeholder="{intl l='Firstname'}">
+                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-firstname" value="{$value}" title="{$label}" placeholder="{intl l='Firstname'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='lastname'}
                 <div class="form-group {if $error}has-error{/if}">
-                    <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
-                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-lastname" value="{$value}" title="{intl l=$label}" placeholder="{intl l='Lastname'}">
+                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-lastname" value="{$value}" title="{$label}" placeholder="{intl l='Lastname'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='address1'}
                 <div class="form-group {if $error}has-error{/if}">
-                    <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
-                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-address1" value="{$value}" title="{intl l=$label}" placeholder="{intl l='Address'}">
+                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-address1" value="{$value}" title="{$label}" placeholder="{intl l='Address'}">
                 </div>
 
                 <div class="form-group">
                     {form_field form=$form field='address2'}
-                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-address2" value="{$value}" title="{intl l=$label}" placeholder="{intl l='Additional address'}">
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-address2" value="{$value}" title="{$label}" placeholder="{intl l='Additional address'}">
                     {/form_field}                    
                 </div>
 
                 <div class="form-group">
                     {form_field form=$form field='address3'}
-                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-address3" value="{$value}" title="{intl l=$label}" placeholder="{intl l='Additional address'}">
+                        <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-address3" value="{$value}" title="{$label}" placeholder="{intl l='Additional address'}">
                     {/form_field}
                 </div>
             {/form_field}
 
             {form_field form=$form field='zipcode'}
                 <div class="form-group {if $error}has-error{/if}">
-                    <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
-                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-zipcode" value="{$value}" title="{intl l=$label}" placeholder="{intl l='Zip code'}">
+                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-zipcode" value="{$value}" title="{$label}" placeholder="{intl l='Zip code'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='city'}
                 <div class="form-group {if $error}has-error{/if}">
-                    <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
-                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-city" value="{$value}" title="{intl l=$label}" placeholder="{intl l='City'}">
+                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-city" value="{$value}" title="{$label}" placeholder="{intl l='City'}">
                 </div>
             {/form_field}
 
             {form_field form=$form field='country'}
                 <div class="form-group {if $error}has-error{/if}">
-                    <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                     <select name="{$name}" id="{$label_attr.for}" class="form-control js-country">
                         {loop type="country" name="country1"}
                             <option value="{$ID}">{$TITLE}</option>
@@ -465,8 +465,8 @@
 
             {form_field form=$form field='phone'}
                 <div class="form-group {if $error}has-error{/if}">
-                    <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
-                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-phone" value="{$value}" title="{intl l=$label}" placeholder="{intl l='Phone'}">
+                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control js-phone" value="{$value}" title="{$label}" placeholder="{intl l='Phone'}">
                 </div>
             {/form_field}
 
diff --git a/templates/backOffice/default/product-edit.html b/templates/backOffice/default/product-edit.html
index 1612c54b5..11369ed17 100644
--- a/templates/backOffice/default/product-edit.html
+++ b/templates/backOffice/default/product-edit.html
@@ -22,7 +22,7 @@
                 <div class="col-md-12 general-block-decorator">
                     <div class="row">
                         <div class="col-md-7 title">
-                            {intl l='Edit product %title' title=$TITLE}
+                            {intl l='Edit product %title' title={$TITLE}}
                         </div>
 
                         <div class="col-md-5 actions">
diff --git a/templates/backOffice/default/profile-edit.html b/templates/backOffice/default/profile-edit.html
index 7a5bed341..fde3ad01a 100644
--- a/templates/backOffice/default/profile-edit.html
+++ b/templates/backOffice/default/profile-edit.html
@@ -69,14 +69,14 @@
 
                                     {form_field form=$form field='title'}
                                         <div class="form-group {if $error}has-error{/if}">
-                                            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+                                            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                                             <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{if $error}{$value}{else}{if $IS_TRANSLATED == 1}{$TITLE}{/if}{/if}">
                                         </div>
                                     {/form_field}
 
                                     {form_field form=$form field='chapo'}
                                         <div class="form-group {if $error}has-error{/if}">
-                                            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+                                            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                                             <input type="text" id="{$label_attr.for}" name="{$name}" title="{intl l='Chapo'}" placeholder="{intl l='Chapo'}" class="form-control" value="{if $error}{$value}{else}{if $IS_TRANSLATED == 1}{$CHAPO}{/if}{/if}">
                                         </div>
                                     {/form_field}
@@ -84,7 +84,7 @@
                                     {form_field form=$form field='description'}
                                         <div class="form-group {if $error}has-error{/if}">
                                             <label for="{$label_attr.for}" class="control-label">
-                                                {intl l=$label} :
+                                                {$label} :
                                                 <span class="label-help-block">{intl l="The detailed description."}</span>
                                             </label>
 
@@ -94,7 +94,7 @@
 
                                     {form_field form=$form field='postscriptum'}
                                         <div class="form-group {if $error}has-error{/if}">
-                                            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+                                            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                                             <input type="text" id="{$label_attr.for}" name="{$name}" title="{intl l='Postscriptum'}" placeholder="{intl l='Postscriptum'}" class="form-control" value="{if $error}{$value}{else}{if $IS_TRANSLATED == 1}{$POSTSCRIPTUM}{/if}{/if}">
                                         </div>
                                     {/form_field}
diff --git a/templates/backOffice/default/profiles.html b/templates/backOffice/default/profiles.html
index f6127cf6f..a7d9d701c 100644
--- a/templates/backOffice/default/profiles.html
+++ b/templates/backOffice/default/profiles.html
@@ -118,8 +118,8 @@
 
     {loop type="lang" name="current-edit-lang" default_only="1"}
         <div class="text-center well well-sm">
-            <img src="{image file="assets/img/flags/$CODE.png"}" alt="{intl l=$TITLE}" />
-            {intl l="Enter information in the default language (%title)" title=$TITLE}
+            <img src="{image file="assets/img/flags/$CODE.png"}" alt="{$TITLE}" />
+            {intl l="Enter information in the default language (%title)" title={$TITLE}}
         </div>
 
         {form_field form=$form field='locale'}
@@ -129,21 +129,21 @@
 
     {form_field form=$form field='code'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Profile code'}" placeholder="{intl l='Profile code'}" class="form-control" value="{if $form_error}{$value}{/if}">
         </div>
     {/form_field}
 
     {form_field form=$form field='title'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{if $form_error}{$value}{/if}">
         </div>
     {/form_field}
 
     {form_field form=$form field='chapo'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" title="{intl l='Short description'}" placeholder="{intl l='Short description'}" class="form-control" value="{if $form_error}{$value}{/if}">
         </div>
     {/form_field}
@@ -151,7 +151,7 @@
     {form_field form=$form field='description'}
         <div class="form-group {if $error}has-error{/if}">
             <label for="{$label_attr.for}" class="control-label">
-                {intl l=$label} :
+                {$label} :
                 <span class="label-help-block">{intl l="The detailed description."}</span>
             </label>
 
@@ -161,7 +161,7 @@
 
     {form_field form=$form field='postscriptum'}
         <div class="form-group {if $error}has-error{/if}">
-            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
             <input type="text" id="{$label_attr.for}" name="{$name}" title="{intl l='Postscriptum'}" placeholder="{intl l='Postscriptum'}" class="form-control" value="{if $form_error}{$value}{/if}">
         </div>
     {/form_field}
diff --git a/templates/backOffice/default/shipping-configuration-edit.html b/templates/backOffice/default/shipping-configuration-edit.html
index ded4cf07d..773794b1b 100644
--- a/templates/backOffice/default/shipping-configuration-edit.html
+++ b/templates/backOffice/default/shipping-configuration-edit.html
@@ -24,7 +24,7 @@
                     <div class="title title-without-tabs">
                         <div class="row">
                             <div class="col-md-10">
-                                {intl l='Shipping zone "%title"' title=$NAME}
+                                {intl l='Shipping zone "%title"' title={$NAME}}
                             </div>
                             <div class="col-md-2 text-right">
                                 <a href="{url path='/admin/configuration/shipping_configuration'}" class="btn btn-sm btn-default">{intl l='Close'} <span class="glyphicon glyphicon-remove"></span></a>
diff --git a/templates/backOffice/default/shipping-configuration.html b/templates/backOffice/default/shipping-configuration.html
index 629856db5..ae662816f 100644
--- a/templates/backOffice/default/shipping-configuration.html
+++ b/templates/backOffice/default/shipping-configuration.html
@@ -59,7 +59,7 @@
                                             {/loop}
                                             {$countries = ltrim($countries, ', ')}
 
-                                            <span class="badge" title="{$countries}">{intl l="%count more..." count=$ctry_count}</span>
+                                            <span class="badge" title="{$countries}">{intl l="%count more..." count={$ctry_count}}</span>
                                         {/ifloop}
                                     </td>
 
diff --git a/templates/backOffice/default/shipping-zones-edit.html b/templates/backOffice/default/shipping-zones-edit.html
index 4d75908fd..72e824af9 100644
--- a/templates/backOffice/default/shipping-zones-edit.html
+++ b/templates/backOffice/default/shipping-zones-edit.html
@@ -26,7 +26,7 @@
                     <div class="title title-without-tabs">
                         <div class="row">
                             <div class="col-md-10">
-                                {intl l='Shipping configuration of delivery module "%title"' title=$TITLE}
+                                {intl l='Shipping configuration of delivery module "%title"' title={$TITLE}}
                             </div>
                             <div class="col-md-2 text-right">
                                 <a href="{url path='/admin/configuration/shipping_zones'}" class="btn btn-sm btn-default">{intl l='Close'} <span class="glyphicon glyphicon-remove"></span></a>
diff --git a/templates/backOffice/default/system-logs.html b/templates/backOffice/default/system-logs.html
index 9cf7f64fe..4bf8a1f60 100644
--- a/templates/backOffice/default/system-logs.html
+++ b/templates/backOffice/default/system-logs.html
@@ -129,7 +129,7 @@
                                                    </div>
 
                                                    <span class="help-block">{intl l='Enter one or more IP V4 addresses separated by ";". Leave empty to display logs for all IP addresses'}</span>
-                                                   <span class="help-block">{intl l='Your current IP address is %ip' ip=$ip_address}</span>
+                                                   <span class="help-block">{intl l='Your current IP address is %ip' ip={$ip_address}}</span>
                                                </div>
                                             {/form_field}
 
diff --git a/templates/backOffice/default/tax-edit.html b/templates/backOffice/default/tax-edit.html
index de2d39d1b..31ff9ccd9 100644
--- a/templates/backOffice/default/tax-edit.html
+++ b/templates/backOffice/default/tax-edit.html
@@ -54,7 +54,7 @@
 
                     {form_field form=$form field='title'}
                     <div class="form-group {if $error}has-error{/if}">
-                        <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+                        <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                         <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{if $form_error}{$value}{else}{if $IS_TRANSLATED == 1}{$TITLE}{/if}{/if}">
                     </div>
                     {/form_field}
@@ -62,7 +62,7 @@
                     {form_field form=$form field='description'}
                     <div class="form-group {if $error}has-error{/if}">
                         <label for="{$label_attr.for}" class="control-label">
-                            {intl l=$label} :
+                            {$label} :
                             <span class="label-help-block">{intl l="The detailed description."}</span>
                         </label>
 
@@ -73,7 +73,7 @@
                     {form_field form=$form field='type'}
                         <div class="form-group {if $error}has-error{/if}">
                             <label for="{$label_attr.for}" class="control-label">
-                                {intl l=$label} :
+                                {$label} :
                             </label>
 
                             <div class="form-group">
@@ -91,7 +91,7 @@
                     {form_tagged_fields form=$form tag='requirements'}
                         <div class="form-group {if $error}has-error{/if} js-tax-requirements" data-tax-type="{$attr_list.tax_type}" {if !$form_error && $attr_list.tax_type != $ESCAPED_TYPE || $form_error && $attr_list.tax_type != $typeValue}style="display: none"{/if}>
                             <label for="{$label_attr.for}" class="control-label">
-                                {intl l=$label}
+                                {$label}
                             </label>
                             {if $formType == 'choice'}
                                 <select name="{$name}" data-toggle="selectpicker" {if !$form_error && $attr_list.tax_type != $ESCAPED_TYPE || $form_error && $attr_list.tax_type != $typeValue}disabled="disabled"{/if}>
diff --git a/templates/backOffice/default/tax-rule-edit.html b/templates/backOffice/default/tax-rule-edit.html
index 9b9d44d20..eb8220372 100644
--- a/templates/backOffice/default/tax-rule-edit.html
+++ b/templates/backOffice/default/tax-rule-edit.html
@@ -65,7 +65,7 @@
 
                                     {form_field form=$form field='title'}
                                         <div class="form-group {if $error}has-error{/if}">
-                                            <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+                                            <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                                             <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{if $error}{$value}{else}{if $IS_TRANSLATED == 1}{$TITLE}{/if}{/if}">
                                         </div>
                                     {/form_field}
@@ -73,7 +73,7 @@
                                     {form_field form=$form field='description'}
                                         <div class="form-group {if $error}has-error{/if}">
                                             <label for="{$label_attr.for}" class="control-label">
-                                                {intl l=$label} :
+                                                {$label} :
                                                 <span class="label-help-block">{intl l="The detailed description."}</span>
                                             </label>
 
diff --git a/templates/backOffice/default/taxes-rules.html b/templates/backOffice/default/taxes-rules.html
index e9d80efed..2d8d6c118 100644
--- a/templates/backOffice/default/taxes-rules.html
+++ b/templates/backOffice/default/taxes-rules.html
@@ -167,7 +167,7 @@
 
         {form_field form=$form field='title'}
             <div class="form-group {if $error}has-error{/if}">
-                <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+                <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                 <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{if $form_error}{$value}{else}{if $IS_TRANSLATED == 1}{$TITLE}{/if}{/if}">
             </div>
         {/form_field}
@@ -175,7 +175,7 @@
         {form_field form=$form field='description'}
             <div class="form-group {if $error}has-error{/if}">
                 <label for="{$label_attr.for}" class="control-label">
-                    {intl l=$label} :
+                    {$label} :
                     <span class="label-help-block">{intl l="The detailed description."}</span>
                 </label>
 
@@ -186,7 +186,7 @@
         {form_field form=$form field='type'}
             <div class="form-group {if $error}has-error{/if}">
                 <label for="{$label_attr.for}" class="control-label">
-                    {intl l=$label} :
+                    {$label} :
                 </label>
 
                 <div class="form-group">
@@ -206,7 +206,7 @@
         {form_tagged_fields form=$form tag='requirements'}
             <div class="form-group {if $error}has-error{/if} js-tax-requirements" data-tax-type="{$attr_list.tax_type}" {if !$form_error && $attr_list.tax_type != $typeValue || $form_error && $attr_list.tax_type != $typeValueWithError}style="display: none"{/if}>
                 <label for="{$label_attr.for}" class="control-label">
-                    {intl l=$label}
+                    {$label}
                 </label>
                 {if $formType == 'choice'}
                     <select name="{$name}" data-toggle="selectpicker" {if !$form_error && $attr_list.tax_type != $typeValue || $form_error && $attr_list.tax_type != $typeValueWithError}disabled="disabled"{/if}>
@@ -282,7 +282,7 @@ form_content        = {$smarty.capture.tax_delete_dialog nofilter}
 
         {form_field form=$form field='title'}
             <div class="form-group {if $error}has-error{/if}">
-                <label for="{$label_attr.for}" class="control-label">{intl l=$label} : </label>
+                <label for="{$label_attr.for}" class="control-label">{$label} : </label>
                 <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{if $error}{$value}{/if}">
             </div>
         {/form_field}
@@ -290,7 +290,7 @@ form_content        = {$smarty.capture.tax_delete_dialog nofilter}
         {form_field form=$form field='description'}
             <div class="form-group {if $error}has-error{/if}">
                 <label for="{$label_attr.for}" class="control-label">
-                    {intl l=$label} :
+                    {$label} :
                     <span class="label-help-block">{intl l="The detailed description."}</span>
                 </label>
 
diff --git a/templates/backOffice/default/template-edit.html b/templates/backOffice/default/template-edit.html
index 5c0fc8114..a41cf8b26 100644
--- a/templates/backOffice/default/template-edit.html
+++ b/templates/backOffice/default/template-edit.html
@@ -16,7 +16,7 @@
         			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
                     <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
                     <li><a href="{url path='/admin/configuration/templates'}">{intl l="Templates"}</a></li>
-                    <li>{intl l='Editing template "%name"' name=$NAME}</li>
+                    <li>{intl l='Editing template "%name"' name={$NAME}}</li>
                 </ul>
 
         		<div class="row">
@@ -97,7 +97,7 @@
                 <div class="row">
                     <div class="col-md-12">
                         <div class="alert alert-error">
-                            {intl l="Sorry, template ID=%id was not found." id=$template_id}
+                            {intl l="Sorry, template ID=%id was not found." id={$template_id}}
                         </div>
                     </div>
                 </div>
diff --git a/templates/backOffice/default/templates.html b/templates/backOffice/default/templates.html
index 2fa5d61b9..0e9370b25 100644
--- a/templates/backOffice/default/templates.html
+++ b/templates/backOffice/default/templates.html
@@ -138,10 +138,10 @@
                 {loop type="lang" name="default-lang" default_only="1"}
                     <div class="input-group">
                         <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{intl l='Template title'}" placeholder="{intl l='Title'}">
-                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
+                        <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
                     </div>
 
-                    <div class="help-block">{intl l="Enter here the template name in the default language (%title)" title=$TITLE}</div>
+                    <div class="help-block">{intl l="Enter here the template name in the default language (%title)" title={$TITLE}}</div>
 
                     {* Switch edition to the current locale *}
                     <input type="hidden" name="edit_language_id" value="{$ID}" />
diff --git a/templates/backOffice/default/variable-edit.html b/templates/backOffice/default/variable-edit.html
index e5c801ee5..05d831e6f 100644
--- a/templates/backOffice/default/variable-edit.html
+++ b/templates/backOffice/default/variable-edit.html
@@ -16,7 +16,7 @@
 			<li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
             <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
             <li><a href="{url path='/admin/configuration/variables'}">{intl l="System variables"}</a></li>
-            <li>{intl l='Editing variable "%name"' name=$NAME}</li>
+            <li>{intl l='Editing variable "%name"' name={$NAME}}</li>
         </ul>
 
 		<div class="row">
@@ -24,7 +24,7 @@
 				<div class="row">
 
 					<div class="col-md-12 title title-without-tabs">
-					   {intl l="Edit variable %name" name=$NAME}
+					   {intl l="Edit variable %name" name={$NAME}}
 					</div>
 
                     <div class="form-container">
@@ -106,7 +106,7 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="alert alert-error">
-                    {intl l="Sorry, variable ID=%id was not found." id=$variable_id}
+                    {intl l="Sorry, variable ID=%id was not found." id={$variable_id}}
                 </div>
             </div>
         </div>
diff --git a/templates/backOffice/default/variables.html b/templates/backOffice/default/variables.html
index a6433a023..a31dababa 100644
--- a/templates/backOffice/default/variables.html
+++ b/templates/backOffice/default/variables.html
@@ -186,10 +186,10 @@
 
 		            <div class="input-group">
 		              <input type="text" id="{$label_attr.for}" required="required" name="{$name}" value="{$value}" title="{intl l='Variable purpose'}" placeholder="{intl l='Variable purpose'}" class="form-control">
-		              <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
+		              <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{$TITLE}" /></span>
 		            </div>
 
-		            <div class="help-block">{intl l='Enter here the category name in the default language (%title)' title="$TITLE"}</div>
+		            <div class="help-block">{intl l='Enter here the category name in the default language (%title)' title={$TITLE}}</div>
 
 		            {form_field form=$form field='locale'}
 		              <input type="hidden" name="{$name}" value="{$LOCALE}" />
diff --git a/templates/frontOffice/default/order-invoice.html b/templates/frontOffice/default/order-invoice.html
index 32d5408b8..be3cd229f 100644
--- a/templates/frontOffice/default/order-invoice.html
+++ b/templates/frontOffice/default/order-invoice.html
@@ -271,11 +271,11 @@
                                             <input type="radio" name="{$name}" id="payment_{$paymentModuleId}" value="{$paymentModuleId}">
 
                                             {loop type="image" name="paymentspicture" source="module" source_id=$ID force_return="true" width="100" height="72"}
-                                                <img src="{$IMAGE_URL}" alt="{intl l="Pay with %module_title" module_title=$TITLE}">
+                                                <img src="{$IMAGE_URL}" alt="{intl l="Pay with %module_title" module_title={$TITLE}}">
                                             {/loop}
 
                                             {elseloop rel="paymentspicture"}
-                                                {intl l="Pay with %module_title" module_title=$TITLE}
+                                                {intl l="Pay with %module_title" module_title={$TITLE}}
                                             {/elseloop}
                                         </label>
                                     </div>