diff --git a/templates/web/prod/WorkZone/Basket.html.twig b/templates/web/prod/WorkZone/Basket.html.twig
index 38eddf5e10..4916d8aecd 100644
--- a/templates/web/prod/WorkZone/Basket.html.twig
+++ b/templates/web/prod/WorkZone/Basket.html.twig
@@ -62,7 +62,7 @@
         {% for plugin in plugins['actionbar'] %}
           {% for key, action in plugin.getBasketActionBar() %}
             {% set label = action.label %}
-            <button class="ui-corner-all basket_window  {{ action.classes|default('') }}" title="{% trans label plugin.PluginLocale %}">
+            <button class="ui-corner-all basket_window  {{ action.classes|default('') }}" title="{{ label|trans([], plugin.PluginLocale) }}">
               <img src="{{ plugin_asset(plugin.PluginName, action.icon) }}"/>
             </button>
           {% endfor %}
diff --git a/templates/web/prod/toolbar.html.twig b/templates/web/prod/toolbar.html.twig
index fe1f151370..29464f5f32 100644
--- a/templates/web/prod/toolbar.html.twig
+++ b/templates/web/prod/toolbar.html.twig
@@ -161,11 +161,11 @@
                                 <li>
                                     <a class="results_window {{ action.classes|default('') }}">
                                         {% if action.icon %}
-                                            <img src="{{ plugin.PluginName, action.icon) }}" height="16" width="16"/>
+                                            <img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16"/>
                                         {% endif %}
 
                                         {% set label = action.label %}
-                                        {% trans label plugin.PluginLocale %}
+                                        {% trans from plugin.PluginLocale %}label{% endtrans %}
                                     </a>
                                 </li>
                             {% endfor %}
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
index c1cc220358..ca0d6cc66b 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
@@ -104,8 +104,10 @@ class BasketTest extends \PhraseanetAuthenticatedWebTestCase
     public function testBasketGet()
     {
         $route = '/prod/baskets/1/';
-        self::$DI['client']->request('GET', $route);
-        $response = self::$DI['client']->getResponse();
+        $client = $this->getClient();
+
+        $client->request('GET', $route);
+        $response = $client->getResponse();
         $this->assertEquals(200, $response->getStatusCode());
     }