diff --git a/packages/sonata-integration-bundle/Resources/translations/SonataAdminBundle.en.yaml b/packages/sonata-integration-bundle/Resources/translations/SonataAdminBundle.en.yaml
index d3c111af6..adbb1bb9d 100644
--- a/packages/sonata-integration-bundle/Resources/translations/SonataAdminBundle.en.yaml
+++ b/packages/sonata-integration-bundle/Resources/translations/SonataAdminBundle.en.yaml
@@ -13,9 +13,6 @@ draw_user:
         password-expired:
           explanation: 'Password is expired, it was updated too long ago.'
 
-  button:
-    request_password_change: 'Request password change'
-
   flash:
     password_change_requested:
       success: 'Password change requested successfully for user %user%.'
diff --git a/packages/sonata-integration-bundle/Resources/views/User/Block/user_block.html.twig b/packages/sonata-integration-bundle/Resources/views/User/Block/user_block.html.twig
index 0c1cc9755..6a84365b0 100644
--- a/packages/sonata-integration-bundle/Resources/views/User/Block/user_block.html.twig
+++ b/packages/sonata-integration-bundle/Resources/views/User/Block/user_block.html.twig
@@ -6,10 +6,14 @@
         </li>
         <li class="user-footer">
             <div class="pull-left">
-                <a href="{{ _profile_uri }}" class="btn btn-default btn-flat"><i class="fas fa-user"></i> Profile</a>
+                <a href="{{ _profile_uri }}" class="btn btn-default btn-flat">
+                    <i class="fas fa-user"></i> {{ 'header.button.profile' | trans([], 'DrawUserBundle') }}
+                </a>
             </div>
             <div class="pull-right">
-                <a href="{{  url('admin_logout') }}" class="btn btn-default btn-flat"><i class="fas fa-sign-out-alt"></i> Logout</a>
+                <a href="{{ url('admin_logout') }}" class="btn btn-default btn-flat">
+                    <i class="fas fa-sign-out-alt"></i> {{ 'header.button.logout' | trans([], 'DrawUserBundle') }}
+                </a>
             </div>
         </li>
     {% endif %}
diff --git a/packages/sonata-integration-bundle/Resources/views/User/Buttons/disable-2fa.html.twig b/packages/sonata-integration-bundle/Resources/views/User/Buttons/disable-2fa.html.twig
index 8ae0ea93b..73bbb0811 100644
--- a/packages/sonata-integration-bundle/Resources/views/User/Buttons/disable-2fa.html.twig
+++ b/packages/sonata-integration-bundle/Resources/views/User/Buttons/disable-2fa.html.twig
@@ -1,6 +1,6 @@
 <li>
     <a class="sonata-action-element" href="{{ admin.generateObjectUrl('disable-2fa', object) }}">
-        <i class="fas fa-ban"></i></i><i class="fas fa-fingerprint"></i>
-        Disable 2FA
+        <i class="fas fa-ban"></i><i class="fas fa-fingerprint"></i>
+        {{ 'admin.button.disable_2fa' | trans([], 'DrawUserBundle') }}
     </a>
-</li>
\ No newline at end of file
+</li>
diff --git a/packages/sonata-integration-bundle/Resources/views/User/Buttons/enable-2fa.html.twig b/packages/sonata-integration-bundle/Resources/views/User/Buttons/enable-2fa.html.twig
index 4034f1fb3..6af0a80bc 100644
--- a/packages/sonata-integration-bundle/Resources/views/User/Buttons/enable-2fa.html.twig
+++ b/packages/sonata-integration-bundle/Resources/views/User/Buttons/enable-2fa.html.twig
@@ -2,7 +2,7 @@
     <li>
         <a class="sonata-action-element" href="{{ admin.generateObjectUrl('enable-2fa', object) }}">
             <i class="fas fa-fingerprint"></i>
-            Enable 2FA
+            {{ 'admin.button.enable_2fa' | trans([], 'DrawUserBundle') }}
         </a>
     </li>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/packages/sonata-integration-bundle/Resources/views/User/Buttons/request_password_change_button.html.twig b/packages/sonata-integration-bundle/Resources/views/User/Buttons/request_password_change_button.html.twig
index dc41c0272..d42aee9d3 100644
--- a/packages/sonata-integration-bundle/Resources/views/User/Buttons/request_password_change_button.html.twig
+++ b/packages/sonata-integration-bundle/Resources/views/User/Buttons/request_password_change_button.html.twig
@@ -7,7 +7,7 @@
     <li>
         <a class="sonata-action-element" href="{{ admin.generateObjectUrl('request_password_change', object) }}">
             <i class="fa fa-user-shield"></i>
-            {{ 'draw_user.button.request_password_change'|trans({}, 'SonataAdminBundle') }}
+            {{ 'admin.button.request_password_change' | trans([], 'DrawUserBundle') }}
         </a>
     </li>
 {% endif %}
diff --git a/packages/sonata-integration-bundle/Resources/views/User/Buttons/unlock_button.html.twig b/packages/sonata-integration-bundle/Resources/views/User/Buttons/unlock_button.html.twig
index 53750cc6a..e60daf145 100644
--- a/packages/sonata-integration-bundle/Resources/views/User/Buttons/unlock_button.html.twig
+++ b/packages/sonata-integration-bundle/Resources/views/User/Buttons/unlock_button.html.twig
@@ -2,11 +2,12 @@
     and object.isLocked()
     and admin.id(object) is not null
     and admin.hasAccess('unlock', object)
-    and admin.hasRoute('unlock') %}
+    and admin.hasRoute('unlock')
+%}
     <li>
         <a class="sonata-action-element" href="{{ admin.generateObjectUrl('unlock', object) }}">
             <i class="fas fa-unlock"></i>
-            Unlock for 24h
+            {{ 'admin.button.unlock_for_24h' | trans([], 'DrawUserBundle') }}
         </a>
     </li>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/packages/sonata-integration-bundle/Resources/views/User/enable_2fa.html.twig b/packages/sonata-integration-bundle/Resources/views/User/enable_2fa.html.twig
index 137ae63a7..b7ee77cb7 100644
--- a/packages/sonata-integration-bundle/Resources/views/User/enable_2fa.html.twig
+++ b/packages/sonata-integration-bundle/Resources/views/User/enable_2fa.html.twig
@@ -5,7 +5,7 @@
         <div class="col-md-6">
             <div class="box box-primary">
                 <div class="box-header">
-                    <h1>{{ 'form.enable_2fa.header' | trans([], 'DrawUserBundle') |raw }}</h1>
+                    <h1>{{ 'form.enable_2fa.header' | trans([], 'DrawUserBundle') | raw }}</h1>
                 </div>
                 <div class="box-body">
                     <div class="row">
@@ -26,4 +26,4 @@
             </div>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/packages/user-bundle/Resources/translations/DrawUserBundle.en.yaml b/packages/user-bundle/Resources/translations/DrawUserBundle.en.yaml
index 3e2c1cfbf..d8fcdc973 100644
--- a/packages/user-bundle/Resources/translations/DrawUserBundle.en.yaml
+++ b/packages/user-bundle/Resources/translations/DrawUserBundle.en.yaml
@@ -44,3 +44,13 @@ admin:
         2fa_enabled: '2FA enabled'
     form:
         2fa_enabled: '2FA enabled'
+    button:
+        enable_2fa: 'Enable 2FA'
+        disable_2fa: 'Disable 2FA'
+        unlock_for_24h: 'Unlock for 24h'
+        request_password_change: 'Request password change'
+
+header:
+    button:
+        profile: 'Profile'
+        logout: 'Logout'