diff --git a/src/features/expandable/templates/expandableTopRowHeader.html b/src/features/expandable/templates/expandableTopRowHeader.html
index a491f23e0b..f9633acb5d 100644
--- a/src/features/expandable/templates/expandableTopRowHeader.html
+++ b/src/features/expandable/templates/expandableTopRowHeader.html
@@ -1,7 +1,7 @@
 <div class="ui-grid-row-header-cell ui-grid-expandable-buttons-cell">
   <div class="ui-grid-cell-contents">
     <span class="ui-grid-cell-empty" ng-if="!grid.options.showExpandAllButton"></span>
-    <button type="button" class="ui-grid-icon-button"
+    <button type="button" class="ui-grid-icon-button clickable"
       ng-if="grid.options.showExpandAllButton"
       ng-class="{ 'ui-grid-icon-plus-squared' : !grid.expandable.expandedAll, 'ui-grid-icon-minus-squared' : grid.expandable.expandedAll }"
       ng-click="grid.api.expandable.toggleAllRows()">
diff --git a/src/features/selection/templates/selectionRowHeader.html b/src/features/selection/templates/selectionRowHeader.html
index 148a172358..eb853ad519 100644
--- a/src/features/selection/templates/selectionRowHeader.html
+++ b/src/features/selection/templates/selectionRowHeader.html
@@ -1,4 +1,4 @@
-<div class="ui-grid-cell-contents ui-grid-disable-selection">
+<div class="ui-grid-cell-contents ui-grid-disable-selection clickable">
   <ui-grid-selection-row-header-buttons>
   </ui-grid-selection-row-header-buttons>
 </div>
diff --git a/src/features/selection/templates/selectionRowHeaderButtons.html b/src/features/selection/templates/selectionRowHeaderButtons.html
index 802cf81344..de8f0c6c77 100644
--- a/src/features/selection/templates/selectionRowHeaderButtons.html
+++ b/src/features/selection/templates/selectionRowHeaderButtons.html
@@ -1,5 +1,5 @@
 <div
-  class="ui-grid-selection-row-header-buttons ui-grid-icon-ok"
+  class="ui-grid-selection-row-header-buttons ui-grid-icon-ok clickable"
   ng-class="{'ui-grid-row-selected': row.isSelected}"
   ng-click="selectButtonClick(row, $event)"
   ng-keydown="selectButtonKeyDown(row, $event)"
diff --git a/src/less/grid.less b/src/less/grid.less
index 064cb0a9c5..3655e76edd 100644
--- a/src/less/grid.less
+++ b/src/less/grid.less
@@ -79,12 +79,12 @@
   border: 0;
 }
 
-.clickable {
-  cursor: pointer;
-}
-
 .ui-grid-icon-button {
   background-color: transparent;
   border: none;
   padding: 0;
 }
+
+.clickable {
+  cursor: pointer;
+}