diff --git a/css/backoffice/components/_button.scss b/css/backoffice/components/_button.scss
index 2d09186167..0c514ea72b 100644
--- a/css/backoffice/components/_button.scss
+++ b/css/backoffice/components/_button.scss
@@ -404,7 +404,7 @@ $ibo-button-colors: (
 }
 
 /* Only when a button has both an icon and a label */
-.ibo-button-icon + .ibo-button-label {
+.ibo-button--icon + .ibo-button--label {
 	margin-left: $ibo-button--label--margin-left;
 }
 
diff --git a/templates/components/button/layout.html.twig b/templates/components/button/layout.html.twig
index 7f39e07397..6307b3fbfb 100644
--- a/templates/components/button/layout.html.twig
+++ b/templates/components/button/layout.html.twig
@@ -1,5 +1,6 @@
 <button id="{{ oUIBlock.GetId() }}"
         class="ibo-button ibo-is-{{ oUIBlock.GetActionType() }} ibo-is-{{ oUIBlock.GetColor() }} {{ oUIBlock.GetAdditionalCSSClass() }}"
+        data-role="ibo-button"
         type="{{ oUIBlock.GetType() }}"
         name="{{ oUIBlock.GetName() }}"
         value="{{ oUIBlock.GetValue() }}"