diff --git a/openstack_dashboard/dashboards/identity/static/dashboard/identity/users/table/table.html b/openstack_dashboard/dashboards/identity/static/dashboard/identity/users/table/table.html
index 8c7a279f7c..08267ba92a 100644
--- a/openstack_dashboard/dashboards/identity/static/dashboard/identity/users/table/table.html
+++ b/openstack_dashboard/dashboards/identity/static/dashboard/identity/users/table/table.html
@@ -25,7 +25,12 @@
       Include action-col if you want to perform actions.
     -->
     <tr>
-      <th class="select-col"><input type="checkbox" hz-select-all="table.iusers"></th>
+      <th class="select-col">
+        <div class="themable-checkbox">
+          <input id="users-select-col" type="checkbox" hz-select-all="table.iusers">
+          <label for="users-select-col"></label>
+        </div>
+      </th>
       <th class="expander"></th>
       <th class="rsp-p1" st-sort="name" st-sort-default="name" translate>User Name</th>
       <th class="rsp-p2" st-sort="email" translate>Email</th>
@@ -47,7 +52,10 @@
         ng-class="{'st-selected': checked[user.id]}">
 
       <td class="select-col">
-        <input type="checkbox" ng-model="tCtrl.selections[user.id].checked" hz-select="user">
+        <div class="themable-checkbox">
+          <input id="user-{$ user.id $}" type="checkbox" ng-model="tCtrl.selections[user.id].checked" hz-select="user">
+          <label for="user-{$ user.id $}"></label>
+        </div>
       </td>
       <td class="expander">
         <span class="fa fa-chevron-right" hz-expand-detail duration="200"></span>
diff --git a/openstack_dashboard/static/app/core/images/table/images-table.html b/openstack_dashboard/static/app/core/images/table/images-table.html
index 6f3530c5ae..e9a93752f7 100644
--- a/openstack_dashboard/static/app/core/images/table/images-table.html
+++ b/openstack_dashboard/static/app/core/images/table/images-table.html
@@ -27,7 +27,10 @@
         Include action-col if you want to perform actions.
       -->
       <th class="multi_select_column">
-        <input type="checkbox" hz-select-all="table.images">
+        <div class="themable-checkbox">
+          <input id="images-multi-select" type="checkbox" hz-select-all="table.images">
+          <label for="images-multi-select"></label>
+        </div>
       </th>
 
       <th class="expander"></th>
@@ -55,9 +58,13 @@
     <tr ng-repeat-start="image in table.images track by image.id">
 
       <td class="multi_select_column">
-        <input type="checkbox"
-               ng-model="tCtrl.selections[image.id].checked"
-               hz-select="image">
+        <div class="themable-checkbox">
+          <input type="checkbox"
+                 id="images-{$ image.id $}"
+                 ng-model="tCtrl.selections[image.id].checked"
+                 hz-select="image">
+          <label for="images-{$ image.id $}"></label>
+        </div>
       </td>
       <td class="expander">
         <span class="fa fa-chevron-right"