diff --git a/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html
index 27c800762a09d..7caa22b6139da 100644
--- a/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html
+++ b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html
@@ -41,7 +41,7 @@
           confirm-click="listingController.deleteSelectedItems()"
           confirmation="Are you sure you want to delete the selected visualizations? This action is irreversible!"
           aria-label="Delete selected objects"
-          ng-hide="listingController.getSelectedItemsCount() === 0"
+          ng-if="listingController.getSelectedItemsCount() > 0"
           tooltip="Delete selected visualizations"
         >
           <span aria-hidden="true" class="kuiButton__icon kuiIcon fa-trash"></span>
@@ -52,7 +52,7 @@
           class="kuiButton kuiButton--primary"
           href="#/visualize/step/1"
           aria-label="Create new visualization"
-          ng-hide="listingController.getSelectedItemsCount() > 0"
+          ng-if="listingController.getSelectedItemsCount() === 0"
           tooltip="Create new visualization"
         >
           <span aria-hidden="true" class="kuiButton__icon kuiIcon fa-plus"></span>
@@ -80,9 +80,6 @@
             >
           </th>
 
-          <th class="kuiTableHeaderCell kuiTableHeaderCell--icon">
-          </th>
-
           <th class="kuiTableHeaderCell">
             Name
           </th>
@@ -107,10 +104,6 @@
             >
           </td>
 
-          <td class="kuiTableRowCell kuiTableRowCell--icon">
-            <div class="kuiIcon kuiIcon--basic {{ item.icon }}"></div>
-          </td>
-
           <td class="kuiTableRowCell">
             <div class="kuiTableRowCell__liner">
               <a class="kuiLink" ng-href="{{ item.url }}">
@@ -121,7 +114,10 @@
 
           <td class="kuiTableRowCell">
             <div class="kuiTableRowCell__liner">
-              {{ item.type.title }}
+              <span class="kuiStatusText">
+                <span class="kuiStatusText__icon kuiIcon {{ item.icon }}"></span>
+                {{ item.type.title }}
+              </span>
             </div>
           </td>
         </tr>
diff --git a/ui_framework/components/table/_table.scss b/ui_framework/components/table/_table.scss
index 8bd03c772e454..66402eb89aa6a 100644
--- a/ui_framework/components/table/_table.scss
+++ b/ui_framework/components/table/_table.scss
@@ -88,9 +88,7 @@
  * 2. Align checkbox with text in other cells.
  */
 .kuiTableHeaderCell--checkBox,
-.kuiTableRowCell--checkBox,
-.kuiTableHeaderCell--icon,
-.kuiTableRowCell--icon {
+.kuiTableRowCell--checkBox {
   width: 28px; /* 1 */
   padding-right: 0;
   line-height: 1;
diff --git a/ui_framework/dist/ui_framework.css b/ui_framework/dist/ui_framework.css
index 76891ce3fa358..87b70556c9e44 100644
--- a/ui_framework/dist/ui_framework.css
+++ b/ui_framework/dist/ui_framework.css
@@ -1424,9 +1424,7 @@ body {
  * 2. Align checkbox with text in other cells.
  */
 .kuiTableHeaderCell--checkBox,
-.kuiTableRowCell--checkBox,
-.kuiTableHeaderCell--icon,
-.kuiTableRowCell--icon {
+.kuiTableRowCell--checkBox {
   width: 28px;
   /* 1 */
   padding-right: 0;
diff --git a/ui_framework/doc_site/src/views/table/controlled_table.html b/ui_framework/doc_site/src/views/table/controlled_table.html
index a55e1722e59bb..93dad0f2700ad 100644
--- a/ui_framework/doc_site/src/views/table/controlled_table.html
+++ b/ui_framework/doc_site/src/views/table/controlled_table.html
@@ -49,8 +49,6 @@
         <th class="kuiTableHeaderCell kuiTableHeaderCell--checkBox">
           <input type="checkbox" class="kuiCheckBox">
         </th>
-        <th class="kuiTableHeaderCell kuiTableHeaderCell--icon">
-        </th>
         <th class="kuiTableHeaderCell">
           Title
         </th>
@@ -71,9 +69,6 @@
         <td class="kuiTableRowCell kuiTableRowCell--checkBox">
           <input type="checkbox" class="kuiCheckBox">
         </td>
-        <th class="kuiTableRowCell kuiTableRowCell--icon">
-          <div class="kuiIcon kuiIcon--basic fa-coffee"></div>
-        </th>
         <td class="kuiTableRowCell">
           <a class="kuiLink" href="#">Alligator</a>
         </td>
@@ -96,9 +91,6 @@
         <td class="kuiTableRowCell kuiTableRowCell--checkBox">
           <input type="checkbox" class="kuiCheckBox">
         </td>
-        <th class="kuiTableRowCell kuiTableRowCell--icon">
-          <div class="kuiIcon kuiIcon--basic fa-bomb"></div>
-        </th>
         <td class="kuiTableRowCell">
           <a class="kuiLink" href="#">Boomerang</a>
         </td>
@@ -121,9 +113,6 @@
         <td class="kuiTableRowCell kuiTableRowCell--checkBox">
           <input type="checkbox" class="kuiCheckBox">
         </td>
-        <th class="kuiTableRowCell kuiTableRowCell--icon">
-          <div class="kuiIcon kuiIcon--basic fa-trophy"></div>
-        </th>
         <td class="kuiTableRowCell">
           <a class="kuiLink" href="#">Celebration</a>
         </td>
@@ -146,9 +135,6 @@
         <td class="kuiTableRowCell kuiTableRowCell--checkBox">
           <input type="checkbox" class="kuiCheckBox">
         </td>
-        <th class="kuiTableRowCell kuiTableRowCell--icon">
-          <div class="kuiIcon kuiIcon--basic fa-child"></div>
-        </th>
         <td class="kuiTableRowCell">
           <a class="kuiLink" href="#">Dog</a>
         </td>