diff --git a/app/views/cost_objects/_list.html.erb b/app/views/cost_objects/_list.html.erb
index cf381bfb20..71234f851a 100644
--- a/app/views/cost_objects/_list.html.erb
+++ b/app/views/cost_objects/_list.html.erb
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 <div class="generic-table--container">
   <div class="generic-table--results-container">
-    <table interactive-table class="generic-table" id="material_budget_items">
+    <table class="generic-table" id="material_budget_items">
       <colgroup>
         <col highlight-col>
         <col highlight-col>
@@ -103,8 +103,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <% end %>
       </tbody>
     </table>
-    <div class="generic-table--header-background"></div>
-  </div>  
+
+  </div>
 </div>
 
 <% end -%>
diff --git a/app/views/cost_objects/_show_variable_cost_object.html.erb b/app/views/cost_objects/_show_variable_cost_object.html.erb
index fd9fe264bf..abcb123144 100644
--- a/app/views/cost_objects/_show_variable_cost_object.html.erb
+++ b/app/views/cost_objects/_show_variable_cost_object.html.erb
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <div>
         <div class="generic-table--container -with-footer">
           <div class="generic-table--results-container">
-            <table interactive-table class="generic-table material_budget_items">
+            <table class="generic-table material_budget_items">
               <colgroup>
                 <col highlight-col>
                 <col highlight-col>
@@ -97,7 +97,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
               </tfoot>
               <% end %>
             </table>
-            <div class="generic-table--header-background"></div>
+
             <div class="generic-table--footer-background"></div>
           </div>
         </div>
@@ -108,7 +108,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <div>
         <div class="generic-table--container -with-footer">
           <div class="generic-table--results-container">
-            <table interactive-table class="generic-table material_budget_items">
+            <table class="generic-table material_budget_items">
               <colgroup>
                 <col highlight-col>
                 <col highlight-col>
@@ -190,7 +190,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
               </tfoot>
               <% end %>
             </table>
-            <div class="generic-table--header-background"></div>
+
             <div class="generic-table--footer-background"></div>
           </div>
         </div>
@@ -209,7 +209,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <div>
         <div class="generic-table--container -with-footer">
           <div class="generic-table--results-container">
-            <table interactive-table class="generic-table labor_budget_items">
+            <table class="generic-table labor_budget_items">
               <colgroup>
                 <col highlight-col>
                 <col highlight-col>
@@ -284,7 +284,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
               </tfoot>
               <% end %>
             </table>
-            <div class="generic-table--header-background"></div>
+
             <div class="generic-table--footer-background"></div>
           </div>
         </div>
@@ -295,7 +295,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <div>
         <div class="generic-table--container -with-footer">
           <div class="generic-table--results-container">
-            <table interactive-table class="generic-table labor_budget_items">
+            <table class="generic-table labor_budget_items">
               <colgroup>
                 <col highlight-col>
                 <col highlight-col>
@@ -378,7 +378,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </tr>
               </tfoot>
             </table>
-            <div class="generic-table--header-background"></div>
+
             <div class="generic-table--footer-background"></div>
           </div>
         </div>
diff --git a/app/views/cost_objects/subform/_labor_budget_subform.html.erb b/app/views/cost_objects/subform/_labor_budget_subform.html.erb
index 7c908694f4..da593627ea 100644
--- a/app/views/cost_objects/subform/_labor_budget_subform.html.erb
+++ b/app/views/cost_objects/subform/_labor_budget_subform.html.erb
@@ -29,7 +29,7 @@ end -%>
     <legend class="form--fieldset-legend" onclick="toggleFieldset(this);"><%= VariableCostObject.human_attribute_name(:labor_budget) %></legend>
     <div class="generic-table--container">
       <div class="generic-table--results-container">
-        <table interactive-table class="generic-table" id="labor_budget_items">
+        <table class="generic-table" id="labor_budget_items">
           <colgroup>
             <col highlight-col>
             <col highlight-col>
@@ -89,7 +89,7 @@ end -%>
             <%- end -%>
           </tbody>
         </table>
-        <div class="generic-table--header-background"></div>
+
       </div>
     </div>
     <div class="wp-inline-create-button">
diff --git a/app/views/cost_objects/subform/_material_budget_subform.html.erb b/app/views/cost_objects/subform/_material_budget_subform.html.erb
index f5b5e703af..1b8059eab0 100644
--- a/app/views/cost_objects/subform/_material_budget_subform.html.erb
+++ b/app/views/cost_objects/subform/_material_budget_subform.html.erb
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <legend class="form--fieldset-legend" onclick="toggleFieldset(this);"><%= VariableCostObject.human_attribute_name(:material_budget) %></legend>
       <div class="generic-table--container">
         <div class="generic-table--results-container">
-          <table interactive-table class="generic-table" id="material_budget_items">
+          <table class="generic-table" id="material_budget_items">
             <colgroup>
               <col highlight-col>
               <col highlight-col>
@@ -96,7 +96,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             <%- end -%>
           </tbody>
         </table>
-        <div class="generic-table--header-background"></div>
+
       </div>
     </div>
     <div class="wp-inline-create-button">
diff --git a/app/views/cost_types/_list.html.erb b/app/views/cost_types/_list.html.erb
index fdc365ba2d..4712c36ea0 100644
--- a/app/views/cost_types/_list.html.erb
+++ b/app/views/cost_types/_list.html.erb
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <% else %>
   <div class="generic-table--container">
     <div class="generic-table--results-container">
-      <table interactive-table class="generic-table">
+      <table class="generic-table">
         <colgroup>
           <col highlight-col>
           <col highlight-col>
@@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </div>
               </div>
             </th>
-            <th></th>
+            <th><div class="generic-table--empty-header"></div></th>
           </tr>
         </thead>
         <tbody>
@@ -102,7 +102,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
           <% end %>
         </tbody>
       </table>
-      <div class="generic-table--header-background"></div>
+
     </div>
   </div>
 <%# Moved from assets since this is the only remaining confirmation JS from the old costs code %>
diff --git a/app/views/cost_types/_list_deleted.html.erb b/app/views/cost_types/_list_deleted.html.erb
index 19fe703046..341ace1bc1 100644
--- a/app/views/cost_types/_list_deleted.html.erb
+++ b/app/views/cost_types/_list_deleted.html.erb
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <% else %>
   <div class="generic-table--container">
     <div class="generic-table--results-container">
-      <table interactive-table class="generic-table locked_cost_types">
+      <table class="generic-table locked_cost_types">
         <colgroup>
           <col highlight-col>
           <col highlight-col>
@@ -57,7 +57,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </div>
               </div>
             </th>
-            <th></th>
+            <th><div class="generic-table--empty-header"></div></th>
           </tr>
           </thead>
           <tbody>
@@ -80,7 +80,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             <% end %>
           </tbody>
         </table>
-        <div class="generic-table--header-background"></div>
+
       </div>
     </div>
 <% end %>
diff --git a/app/views/cost_types/edit.html.erb b/app/views/cost_types/edit.html.erb
index 431066a8ce..a967ee1b82 100644
--- a/app/views/cost_types/edit.html.erb
+++ b/app/views/cost_types/edit.html.erb
@@ -52,7 +52,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <h3><%= t :caption_rate_history %></h3>
   <div class="generic-table--container">
     <div class="generic-table--results-container">
-      <table interactive-table class="generic-table">
+      <table class="generic-table">
         <colgroup>
           <col highlight-col>
           <col highlight-col>
@@ -78,7 +78,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </div>
               </div>
             </th>
-            <th></th>
+            <th><div class="generic-table--empty-header"></div></th>
           </tr>
         </thead>
         <tbody id="rates_body" class="subform-container">
@@ -99,7 +99,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
           <%- end -%>
         </tbody>
       </table>
-      <div class="generic-table--header-background"></div>
+
     </div>
   </div>
   <div class="wp-inline-create-button">
diff --git a/app/views/costlog/_list.html.erb b/app/views/costlog/_list.html.erb
index 4d94d07806..eb76769a1b 100644
--- a/app/views/costlog/_list.html.erb
+++ b/app/views/costlog/_list.html.erb
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 <div class="generic-table--container">
   <div class="generic-table--results-container">
-    <table interactive-table class="generic-table cost_entries">
+    <table class="generic-table cost_entries">
       <colgroup>
         <col highlight-col>
         <col highlight-col>
@@ -48,7 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         </th>
         <%= sort_header_tag('units', :caption => t(:label_units)) %>
         <%= sort_header_tag('costs', :caption => t(:label_overall_costs)) %>
-        <th></th>
+        <th><div class="generic-table--empty-header"></div></th>
       </tr>
       </thead>
       <tbody>
@@ -88,6 +88,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <% end -%>
       </tbody>
       </table>
-      <div class="generic-table--header-background"></div>
+
     </div>
   </div>
diff --git a/app/views/hourly_rates/_list_default.html.erb b/app/views/hourly_rates/_list_default.html.erb
index 3cb0905165..b8fa13028b 100644
--- a/app/views/hourly_rates/_list_default.html.erb
+++ b/app/views/hourly_rates/_list_default.html.erb
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <% else %>
   <div class="generic-table--container">
     <div class="generic-table--results-container">
-      <table interactive-table class="generic-table rates">
+      <table class="generic-table rates">
         <colgroup>
           <col highlight-col>
           <col highlight-col>
@@ -75,7 +75,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <%- end -%>
         </tbody>
       </table>
-      <div class="generic-table--header-background"></div>
+
     </div>
   </div>
 <% end %>
diff --git a/app/views/hourly_rates/_list_project.html.erb b/app/views/hourly_rates/_list_project.html.erb
index bb7a16ad1a..967134ba74 100644
--- a/app/views/hourly_rates/_list_project.html.erb
+++ b/app/views/hourly_rates/_list_project.html.erb
@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <% else %>
   <div class="generic-table--container">
     <div class="generic-table--results-container">
-      <table interactive-table class="generic-table rates">
+      <table class="generic-table rates">
         <colgroup>
           <col highlight-col>
           <col highlight-col>
@@ -87,7 +87,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <%- end -%>
         </tbody>
       </table>
-      <div class="generic-table--header-background"></div>
+
     </div>
   </div>
 <% end %>
diff --git a/app/views/hourly_rates/edit.html.erb b/app/views/hourly_rates/edit.html.erb
index fdd1756a11..d489fdb33d 100644
--- a/app/views/hourly_rates/edit.html.erb
+++ b/app/views/hourly_rates/edit.html.erb
@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <%- end -%>
   <div class="generic-table--container">
     <div class="generic-table--results-container">
-      <table interactive-table class="generic-table rates" width="200px">
+      <table class="generic-table rates" width="200px">
         <colgroup>
           <col highlight-col>
           <col highlight-col>
@@ -65,7 +65,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 </div>
               </div>
             </th>
-            <th></th>
+            <th><div class="generic-table--empty-header"></div></th>
           </tr>
         </thead>
         <tbody id="rates_body" class="subform-container">
@@ -75,7 +75,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
           <%- end -%>
         </tbody>
       </table>
-      <div class="generic-table--header-background"></div>
+
     </div>
   </div>
   <div class="wp-inline-create-button">