diff --git a/lib/Alchemy/Phrasea/Helper/User/Edit.php b/lib/Alchemy/Phrasea/Helper/User/Edit.php
index 035d9afce4..08874ae68f 100644
--- a/lib/Alchemy/Phrasea/Helper/User/Edit.php
+++ b/lib/Alchemy/Phrasea/Helper/User/Edit.php
@@ -131,10 +131,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
             sum(remain_dwnld) as remain_dwnld,
             sum(month_dwnld_max) as month_dwnld_max,
 
-            mask_xor as maskxordec,
-            bin(mask_xor) as maskxorbin,
-            mask_and as maskanddec,
-            bin(mask_and) as maskandbin
+            sum(mask_and + mask_xor) as masks
 
             FROM (usr u, bas b, sbas s)
               LEFT JOIN (basusr bu)
@@ -206,8 +203,6 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
   {
     $this->base_id = (int) $this->request->get('base_id');
 
-//    $this->base_id = (int) $parm['base_id'];
-
     $sql = "SELECT u.usr_id, restrict_dwnld, remain_dwnld, month_dwnld_max
       FROM (usr u INNER JOIN basusr bu ON u.usr_id = bu.usr_id)
       WHERE u.usr_id = " . implode(' OR u.usr_id = ', $this->users) . "
diff --git a/templates/web/admin/editusers.twig b/templates/web/admin/editusers.twig
index fcd8a2b340..aaaedf4007 100644
--- a/templates/web/admin/editusers.twig
+++ b/templates/web/admin/editusers.twig
@@ -377,19 +377,31 @@
                 </td>
                 <td class="users_col case_right_quota">
                   <div class="quota_trigger quota_{{rights['base_id']}}">
-                    <img src="/skins/icons/buttoninfo2.gif" />
+                    {% if rights['restrict_dwnld'] > 0 %}
+                    <img src="/skins/icons/user_details_on.png" />
+                    {% else %}
+                    <img src="/skins/icons/user_details_off.png" />
+                    {% endif %}
                     <input type="hidden" name="quota_base_id" value="{{rights['base_id']}}"/>
                   </div>
                 </td>
                 <td class="users_col case_right_time">
                   <div class="time_trigger time_{{rights['base_id']}}">
-                    <img src="/skins/icons/buttoninfo2.gif" />
+                    {% if rights['time_limited'] > 0 %}
+                    <img src="/skins/icons/user_details_on.png" />
+                    {% else %}
+                    <img src="/skins/icons/user_details_off.png" />
+                    {% endif %}
                     <input type="hidden" name="time_base_id" value="{{rights['base_id']}}"/>
                   </div>
                 </td>
                 <td class="users_col case_right_masks">
                   <div class="masks_trigger quotatime_{{rights['base_id']}}">
-                    <img src="/skins/icons/buttoninfo2.gif" />
+                    {% if rights['masks'] > 0 %}
+                    <img src="/skins/icons/user_details_on.png" />
+                    {% else %}
+                    <img src="/skins/icons/user_details_off.png" />
+                    {% endif %}
                     <input type="hidden" name="masks_base_id" value="{{rights['base_id']}}"/>
                   </div>
                 </td>
diff --git a/templates/web/prod/Story/Create.html.twig b/templates/web/prod/Story/Create.html.twig
index 86f82d0112..af02d19bde 100644
--- a/templates/web/prod/Story/Create.html.twig
+++ b/templates/web/prod/Story/Create.html.twig
@@ -10,9 +10,6 @@
   <label>{% trans 'Story name' %}</label>
   <input name="name" value="" type="text"/>
 
-  <label>{% trans 'Story description' %}</label>
-  <textarea name="description"></textarea>
-
   <label for="add_sel">{% trans 'Ajouter ma selection courrante' %}</label>
   <input type="checkbox" name="lst" value=""/>
 
diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig
index c5cf7005cb..efdeb2d6c9 100644
--- a/templates/web/prod/WorkZone/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Basket.html.twig
@@ -33,6 +33,12 @@
         <img src="/skins/icons/push16.png"/>
       </button>
       {% endif %}
+
+      {% if user.ACL().has_right('push') %}
+      <button class="ui-corner-all TOOL_feedback_btn basket_window" title="{% trans 'Feedback' %}">
+        <img src="/skins/icons/feedback16.png"/>
+      </button>
+      {% endif %}
       {% if user.ACL().has_right('bas_chupub') %}
       <button class="ui-corner-all TOOL_bridge_btn basket_window" title="{% trans 'action : bridge' %}">
         <img src="/skins/icons/door.png"/>
diff --git a/templates/web/prod/WorkZone/Story.html.twig b/templates/web/prod/WorkZone/Story.html.twig
index d9aaa454f1..aebf458a7c 100644
--- a/templates/web/prod/WorkZone/Story.html.twig
+++ b/templates/web/prod/WorkZone/Story.html.twig
@@ -32,6 +32,12 @@
         <img src="/skins/icons/push16.png"/>
       </button>
       {% endif %}
+      
+      {% if user.ACL().has_right('push') %}
+      <button class="ui-corner-all TOOL_feedback_btn basket_window" title="{% trans 'Feedback' %}">
+        <img src="/skins/icons/feedback16.png"/>
+      </button>
+      {% endif %}
       {% if user.ACL().has_right('bas_chupub') %}
       <button class="ui-corner-all TOOL_bridge_btn story_window" title="{% trans 'action : bridge' %}">
         <img src="/skins/icons/door.png"/>
diff --git a/www/prod/page0.js b/www/prod/page0.js
index d89d28948f..45c6ace999 100644
--- a/www/prod/page0.js
+++ b/www/prod/page0.js
@@ -2252,9 +2252,9 @@ function activeIcons()
         }
       }
     }
-    if(value !== '' || sstt_id !== '')
+    if(value !== '' || sstt_id !== '' || story !== '')
     {
-      feedbackThis(sstt_id, value);
+      feedbackThis(sstt_id, value, story);
     }
     else
     {