diff --git a/templates/admin/default/assets/less/thelia/tables.less b/templates/admin/default/assets/less/thelia/tables.less
index d8b3a9e4e..5997840a8 100755
--- a/templates/admin/default/assets/less/thelia/tables.less
+++ b/templates/admin/default/assets/less/thelia/tables.less
@@ -55,6 +55,13 @@
 .table-left-aligned {
     th, td {
         text-align: left;
+
+        &.text-center {
+            text-align: center;
+        }
+        &.text-right {
+            text-align: right;
+        }
     }
 
     select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
diff --git a/templates/admin/default/attribute-edit.html b/templates/admin/default/attribute-edit.html
index 1b290f222..882edd60c 100644
--- a/templates/admin/default/attribute-edit.html
+++ b/templates/admin/default/attribute-edit.html
@@ -37,6 +37,10 @@
 
 		                                <p class="title title-without-tabs">{intl l='Attribute information'}</p>
 
+                                        {form_field form=$form field='id'}
+                                            <input type="hidden" name="{$name}" value="{$attribute_id}" />
+                                        {/form_field}
+
      	                                {* Be sure to get the attribute ID, even if the form could not be validated *}
      	                                <input type="hidden" name="attribute_id" value="{$attribute_id}" />
 
@@ -52,7 +56,7 @@
 
      					            	{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
 
-                                        {include file="includes/standard-description-form-fields.html"}
+                                        {include file="includes/standard-description-form-fields.html" form=$form}
 		    						</div>
 
 		     						<div class="col-md-6">
@@ -79,9 +83,10 @@
 				                                <tr>
 				                                    <th>
 				                                        {admin_sortable_header
-				                                            current_order=$order
+				                                            current_order=$attributeav_order
 				                                            order='id'
 				                                            reverse_order='id_reverse'
+				                                            request_parameter_name='attributeav_order'
 				                                            path={url path='/admin/configuration/attributes/update' attribute_id=$attribute_id}
 				                                            label="{intl l='ID'}"
 				                                        }
@@ -89,9 +94,10 @@
 
 				                                    <th>
 				                                        {admin_sortable_header
-				                                            current_order=$order
+				                                            current_order=$attributeav_order
 				                                            order='alpha'
 				                                            reverse_order='alpha_reverse'
+				                                            request_parameter_name='attributeav_order'
 				                                            path={url path='/admin/configuration/attributes/update' attribute_id=$attribute_id}
 				                                            label="{intl l='Value'}"
 				                                        }
@@ -99,9 +105,10 @@
 
 				                                    <th class="text-center">
 				                                        {admin_sortable_header
-				                                            current_order=$order
+				                                            current_order=$attributeav_order
 				                                            order='manual'
 				                                            reverse_order='manual_reverse'
+				                                            request_parameter_name='attributeav_order'
 				                                            path={url path='/admin/configuration/attributes/update' attribute_id=$attribute_id}
 				                                            label="{intl l="Position"}"
 				                                        }
@@ -114,12 +121,13 @@
 				                            </thead>
 
 				                            <tbody>
-				                                {loop name="list" type="attribute_availability" attribute=$attribute_id backend_context="1" lang=$edit_language_id order=$order}
+				                                {loop name="list" type="attribute_availability" attribute=$attribute_id backend_context="1" lang=$edit_language_id order=$attributeav_order}
 				                                <tr>
 				                                    <td>{$ID}</td>
 
 				                                    <td>
-				                                        <input class="js-edit form-control" type="text" name="" value="{$TITLE}" />
+				                                        {* FIXME : integrate this in the encolsing form to provide standard form processing *}
+				                                        <input class="js-edit form-control" type="text" name="attribute_values[{$ID}]" value="{$TITLE}" />
 				                                    </td>
 
 				                                    <td class="text-center">
@@ -151,7 +159,7 @@
 				                                     <tr>
 				                                         <td colspan="4">
 				                                             <div class="alert alert-info">
-				                                                 {intl l="No product attribute has been created yet. Click the + button to create one."}
+				                                                 {intl l="No value has been created yet. Click the + button to create one."}
 				                                             </div>
 				                                         </td>
 				                                     </tr>
diff --git a/templates/admin/default/attributes.html b/templates/admin/default/attributes.html
index eab4996ac..57fd9c256 100644
--- a/templates/admin/default/attributes.html
+++ b/templates/admin/default/attributes.html
@@ -97,6 +97,17 @@
                                     {module_include location='attributes_table_row'}
 
                                     <td class="actions">
+                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
+                                        <div class="btn-group">
+                                            <a class="btn btn-default btn-xs attribute-remove-from-all" title="{intl l='Remove this attribute from all product templates'}" href="#remove_from_all_dialog" data-id="{$ID}" data-toggle="modal">
+                                                <span class="glyphicon glyphicon-minus"></span>
+                                            </a>
+                                            <a class="btn btn-default btn-xs attribute-add-to-all" title="{intl l='Add this attribute to all product templates'}" href="#add_to_all_dialog" data-id="{$ID}" data-toggle="modal">
+                                                <span class="glyphicon glyphicon-plus"></span>
+                                            </a>
+                                        </div>
+                                        {/loop}
+
                                         <div class="btn-group">
 	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
 	                                            <a class="btn btn-default btn-xs attribute-change" title="{intl l='Change this product attribute'}" href="{url path='/admin/configuration/attributes/update' attribute_id=$ID}"><span class="glyphicon glyphicon-edit"></span></a>
@@ -213,10 +224,51 @@
     dialog_title    = {intl l="Delete attribute"}
     dialog_message  = {intl l="Do you really want to delete this attribute ? It will be removed from all product templates."}
 
-    form_action     = {url path='/admin/configuration/attributes/delete'}
+    form_action     = {url path='/admin/configuration/attributes/remove_from-all-templates' attribute_id=$ID}
     form_content    = {$smarty.capture.delete_dialog nofilter}
 }
 
+
+{* Add to all dialog *}
+
+{capture "add_to_all_dialog"}
+    <input type="hidden" name="attribute_id" id="attribute_add_to_all_id" value="" />
+
+    {module_include location='attribute_add_to_all_form'}
+
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "add_to_all_dialog"
+    dialog_title    = {intl l="Add to all product templates"}
+    dialog_message  = {intl l="Do you really want to add this attribute to all product templates ?"}
+
+    form_action         = {url path='/admin/configuration/attributes/add-to-all-templates'}
+    form_content        = {$smarty.capture.add_to_all_dialog nofilter}
+}
+
+{* Remove from all dialog *}
+
+{capture "remove_from_all_dialog"}
+    <input type="hidden" name="attribute_id" id="attribute_remove_from_all_id" value="" />
+
+    {module_include location='attribute_add_to_all_form'}
+
+{/capture}
+
+{include
+    file = "includes/generic-confirm-dialog.html"
+
+    dialog_id       = "remove_from_all_dialog"
+    dialog_title    = {intl l="Remove from all product templates"}
+    dialog_message  = {intl l="Do you really want to remove this attribute from all product templates ? You'll loose all product related data for this attribute."}
+
+    form_action         = {url path='/admin/configuration/attributes/remove-from-all-templates'}
+    form_content        = {$smarty.capture.remove_from_all_dialog nofilter}
+}
+
 {/block}
 
 {block name="javascript-initialization"}
@@ -233,6 +285,14 @@
                 $('#attribute_delete_id').val($(this).data('id'));
             });
 
+            $('a.attribute-add-to-all').click(function(ev) {
+                $('#attribute_add_to_all_id').val($(this).data('id'));
+            });
+
+            $('a.attribute-remove-from-all').click(function(ev) {
+                $('#attribute_remove_from_all_id').val($(this).data('id'));
+            });
+
             // JS stuff for creation form
             {include
                 file      = "includes/generic-js-dialog.html"
diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index 0423bcc66..6fe06f8bc 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -82,7 +82,7 @@
                                     }
 		                            </th>
 
-		                            <th>{intl l='Actions'}</th>
+		                            <th class="actions">{intl l='Actions'}</th>
 		                        </tr>
 		                    </thead>
 
diff --git a/templates/admin/default/currencies.html b/templates/admin/default/currencies.html
index 72bf01e75..fe4cfe882 100644
--- a/templates/admin/default/currencies.html
+++ b/templates/admin/default/currencies.html
@@ -111,7 +111,7 @@
 
                                         {module_include location='currencies_table_header'}
 
-                                        <th class="text-right">{intl l='Actions'}</th>
+                                        <th class="actions">{intl l='Actions'}</th>
                                     </tr>
                                 </thead>
 
diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index 799115bf3..72179f667 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -11,9 +11,9 @@
 
     <div class="customer">
         <div id="wrapper" class="container">
-            
+
             <ul class="breadcrumb">
-                <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>                    
+                <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
                 <li><a href="{url path='/admin/customers'}">{intl l="Customers"}</a></li>
             </ul>
 
@@ -58,7 +58,7 @@
 
                                     <th>{intl l='order amount'}</th>
 
-                                    <th>{intl l='Actions'}</th>
+                                    <th class="actions">{intl l='Actions'}</th>
                                 </tr>
                                 </thead>
 
@@ -154,23 +154,23 @@
                {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller  *}
                <input type="hidden" name="{$name}" value="{url path='/admin/customer/update/_ID_'}" />
             {/form_field}
-            
+
             {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" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Company'}">
                 </div>
             {/form_field}
-            
-            {form_field form=$form field='title'}                
+
+            {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>
-                    
+
                     <select name="{$name}" id="{$label_attr.for}" class="form-control">
                         {loop type="title" name="title1"}
                             <option value="{$ID}">{$LONG}</option>
                         {/loop}
-                    </select>                    
+                    </select>
                 </div>
             {/form_field}
 
@@ -191,13 +191,13 @@
             {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" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Address'}">                    
+                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$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" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Additional address'}">
-                    {/form_field}                    
+                    {/form_field}
                 </div>
 
                 <div class="form-group">
@@ -237,8 +237,8 @@
                     <label for="{$label_attr.for}" class="control-label">{intl l="{$label}"} : </label>
                     <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{intl l="{$label}"}" placeholder="{intl l='Email address'}">
                 </div>
-            {/form_field} 
-            
+            {/form_field}
+
         {/capture}
 
         {include
diff --git a/templates/admin/default/includes/inner-form-toolbar.html b/templates/admin/default/includes/inner-form-toolbar.html
index 518c204e3..c142cbdd7 100755
--- a/templates/admin/default/includes/inner-form-toolbar.html
+++ b/templates/admin/default/includes/inner-form-toolbar.html
@@ -12,7 +12,7 @@
 		<ul class="nav nav-pills">
 		    {loop name="lang_list" type="lang" default_only={$default_only}}
 		    <li {if $ID == $edit_language_id}class="active"{/if}>
-		        <a href="{$current_url nofilter}&amp;edit_language_id={$ID}" title="{intl l="Edit information in %lng" lng=$TITLE}">
+		        <a href="{url path=$current_url edit_language_id=$ID}" title="{intl l="Edit information in %lng" lng=$TITLE}">
 		            <img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" />
 		        </a>
 		    </li>
diff --git a/templates/admin/default/includes/standard-description-form-fields.html b/templates/admin/default/includes/standard-description-form-fields.html
index 0030af54f..58fa319c1 100644
--- a/templates/admin/default/includes/standard-description-form-fields.html
+++ b/templates/admin/default/includes/standard-description-form-fields.html
@@ -3,7 +3,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>
-    <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{$value|htmlspecialchars}">
+    <input type="text" id="{$label_attr.for}" name="{$name}" required="required" title="{intl l='Title'}" placeholder="{intl l='Title'}" class="form-control" value="{$value}">
 </div>
 {/form_field}
 
@@ -14,7 +14,7 @@
         <span class="label-help-block">{intl l="A short description, used when a summary or an introduction is required"}</span>
     </label>
 
-    <textarea name="{$name}" id="{$label_attr.for}" rows="3" title="{intl l='Short description'}" placeholder="{intl l='Short description'}" class="form-control">{$value|htmlspecialchars}</textarea>
+    <textarea name="{$name}" id="{$label_attr.for}" rows="3" title="{intl l='Short description'}" placeholder="{intl l='Short description'}" class="form-control">{$value}</textarea>
 </div>
 {/form_field}
 
@@ -25,7 +25,7 @@
         <span class="label-help-block">{intl l="The détailed description."}</span>
     </label>
 
-    <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control">{$value|htmlspecialchars}</textarea>
+    <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control">{$value}</textarea>
 </div>
 {/form_field}
 
@@ -36,6 +36,6 @@
         <span class="label-help-block">{intl l="A short post-description information"}</span>
     </label>
 
-    <textarea name="{$name}" id="{$label_attr.for}" rows="3" title="{intl l='Short conclusion'}" placeholder="{intl l='Short conclusion'}" class="form-control">{$value|htmlspecialchars}</textarea>
+    <textarea name="{$name}" id="{$label_attr.for}" rows="3" title="{intl l='Short conclusion'}" placeholder="{intl l='Short conclusion'}" class="form-control">{$value}</textarea>
 </div>
 {/form_field}
\ No newline at end of file
diff --git a/templates/admin/default/includes/thelia_news_feed.html b/templates/admin/default/includes/thelia_news_feed.html
index 6b9d2b5a9..09b3af020 100755
--- a/templates/admin/default/includes/thelia_news_feed.html
+++ b/templates/admin/default/includes/thelia_news_feed.html
@@ -4,7 +4,8 @@
      <div class="span4 feed-list-item">
          <h3>{$DATE}</h3>
          <h2><a href="{$URL}" target="_blank" title="{intl l='Lire la suite'}">{$TITLE|strip_tags nofilter}</a></h2>
-         <p>{$DESCRIPTION|strip_tags|truncate:250:"...":true nofilter}</p>
+         {* we use unescape:"htmlall" to unescape var before truncate, to prevent a cut in the middel of an HTML entity, eg &ea... *}
+         <p>{$DESCRIPTION|strip_tags|unescape:"htmlall"|truncate:250:"...":true nofilter}</p>
          <p><a class="btn" href="{$URL}" target="_blank">{intl l='Lire la suite »'}</a></p>
      </div>
 {/loop}
diff --git a/templates/admin/default/orders.html b/templates/admin/default/orders.html
index 947c615a3..4f9c6ecf8 100644
--- a/templates/admin/default/orders.html
+++ b/templates/admin/default/orders.html
@@ -17,7 +17,7 @@
         {module_include location='orders_top'}
 
         <div class="row">
-            <div class="col-md-12">          
+            <div class="col-md-12">
                 <div class="general-block-decorator">
                     <table class="table table-striped table-condensed table-left-aligned">
                         <caption class="clearfix">
@@ -36,14 +36,14 @@
                                <th>{intl l="Name"}</th>
                                <th>{intl l="Amount"}</th>
                                <th>{intl l="Status"}</th>
-                               
+
                                {module_include location='orders_table_header'}
 
-                               <th>{intl l="Actions"}</th>
+                               <th class="actions">{intl l="Actions"}</th>
 	                        </tr>
                         </thead>
 
-                        <tbody>    	                        
+                        <tbody>
 	                            <tr>
 
 	                               	<td><a href="">01230450123045</a></td>
@@ -116,7 +116,7 @@
 			                            </div>
 	                                </td>
 	                            </tr>
-	                        
+
 	                        <!-- <tr>
 	                           <td colspan="3">
 	                               <div class="alert alert-info">
@@ -124,10 +124,10 @@
 	                               </div>
 	                           </td>
 	                        </tr> -->
-	                        
+
                         </tbody>
                     </table>
-                </div>                
+                </div>
             </div>
         </div>