diff --git a/src-docs/src/views/tables/custom/custom.js b/src-docs/src/views/tables/custom/custom.js
index ca9c9c4fd488..5b7979693d85 100644
--- a/src-docs/src/views/tables/custom/custom.js
+++ b/src-docs/src/views/tables/custom/custom.js
@@ -26,6 +26,9 @@ import {
   EuiTableRow,
   EuiTableRowCell,
   EuiTableRowCellCheckbox,
+  EuiTableSortMobile,
+  EuiTableSortMobileItem,
+  EuiTableHeaderMobile,
 } from '../../../../../src/components';
 
 import {
@@ -207,11 +210,20 @@ export default class extends Component {
       alignment: LEFT_ALIGNMENT,
       width: '24px',
       cellProvider: cell => <EuiIcon type={cell} size="m" />,
+      hideForMobile: true,
     }, {
       id: 'title',
       label: 'Title',
       alignment: LEFT_ALIGNMENT,
       isSortable: true,
+      hideForMobile: true,
+    }, {
+      id: 'title_type',
+      label: 'Title',
+      isMobileHeader: true,
+      render: (title, item) => (
+        <span><EuiIcon type={item.type} size="m" style={{ verticalAlign: "baseline" }} /> {title}</span>
+      ),
     }, {
       id: 'health',
       label: 'Health',
@@ -332,36 +344,59 @@ export default class extends Component {
     return this.state.itemIdToOpenActionsPopoverMap[itemId];
   };
 
-  renderHeaderCells() {
+  renderSelectAll = mobile => {
+    return (
+      <EuiCheckbox
+        id="selectAllCheckbox"
+        label={mobile ? 'Select all' : null}
+        checked={this.areAllItemsSelected()}
+        onChange={this.toggleAll.bind(this)}
+        type={mobile ? null : 'inList'}
+      />
+    );
+  }
+
+  renderHeaderCells(mobile) {
     return this.columns.map((column, columnIndex) => {
       if (column.isCheckbox) {
+        if (!mobile) {
+          return (
+            <EuiTableHeaderCellCheckbox
+              key={column.id}
+              width={column.width}
+            >
+              {this.renderSelectAll()}
+            </EuiTableHeaderCellCheckbox>
+          );
+        }
+      }
+
+      if (mobile) {
+        return (
+          <EuiTableSortMobileItem
+            key={column.id}
+            onSort={column.isSortable ? this.onSort.bind(this, column.id) : undefined}
+            isSorted={this.state.sortedColumn === column.id}
+            isSortAscending={this.sortableProperties.isAscendingByName(column.id)}
+          >
+            {column.label}
+          </EuiTableSortMobileItem>
+        );
+      } else {
         return (
-          <EuiTableHeaderCellCheckbox
+          <EuiTableHeaderCell
             key={column.id}
+            align={this.columns[columnIndex].alignment}
             width={column.width}
+            onSort={column.isSortable ? this.onSort.bind(this, column.id) : undefined}
+            isSorted={this.state.sortedColumn === column.id}
+            isSortAscending={this.sortableProperties.isAscendingByName(column.id)}
+            isMobileHeader={column.isMobileHeader}
           >
-            <EuiCheckbox
-              id="selectAllCheckbox"
-              checked={this.areAllItemsSelected()}
-              onChange={this.toggleAll.bind(this)}
-              type="inList"
-            />
-          </EuiTableHeaderCellCheckbox>
+            {column.label}
+          </EuiTableHeaderCell>
         );
       }
-
-      return (
-        <EuiTableHeaderCell
-          key={column.id}
-          align={this.columns[columnIndex].alignment}
-          width={column.width}
-          onSort={column.isSortable ? this.onSort.bind(this, column.id) : undefined}
-          isSorted={this.state.sortedColumn === column.id}
-          isSortAscending={this.sortableProperties.isAscendingByName(column.id)}
-        >
-          {column.label}
-        </EuiTableHeaderCell>
-      );
     });
   }
 
@@ -391,6 +426,7 @@ export default class extends Component {
               key={column.id}
               header={column.label}
               textOnly={false}
+              hasActions={true}
               align="right"
             >
               <EuiPopover
@@ -443,7 +479,11 @@ export default class extends Component {
           );
         }
 
-        if (column.cellProvider) {
+        if (column.render) {
+          const titleText = item.title.truncateText ? item.title.value : item.title;
+          const title = item.title.isLink ? <EuiLink href="">{item.title.value}</EuiLink> : titleText;
+          child = column.render(title, item);
+        } else if (column.cellProvider) {
           child = column.cellProvider(cell);
         } else if (cell.isLink) {
           child = <EuiLink href="">{cell.value}</EuiLink>;
@@ -460,6 +500,8 @@ export default class extends Component {
             align={column.alignment}
             truncateText={cell && cell.truncateText}
             textOnly={cell ? cell.textOnly : true}
+            hideForMobile={column.hideForMobile}
+            isMobileHeader={column.isMobileHeader}
           >
             {child}
           </EuiTableRowCell>
@@ -470,6 +512,8 @@ export default class extends Component {
         <EuiTableRow
           key={item.id}
           isSelected={this.isItemSelected(item.id)}
+          isSelectable={true}
+          hasActions={true}
         >
           {cells}
         </EuiTableRow>
@@ -509,6 +553,17 @@ export default class extends Component {
 
         <EuiSpacer size="m" />
 
+        <EuiTableHeaderMobile>
+          <EuiFlexGroup responsive={false} justifyContent="spaceBetween" alignItems="baseline">
+            <EuiFlexItem grow={false}>{this.renderSelectAll(true)}</EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiTableSortMobile anchorPosition="downRight">
+                {this.renderHeaderCells(true)}
+              </EuiTableSortMobile>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiTableHeaderMobile>
+
         <EuiTable>
           <EuiTableHeader>
             {this.renderHeaderCells()}
diff --git a/src/components/basic_table/__snapshots__/basic_table.test.js.snap b/src/components/basic_table/__snapshots__/basic_table.test.js.snap
index 0bf9cfc7f5fc..3f4dfbb3e9f0 100644
--- a/src/components/basic_table/__snapshots__/basic_table.test.js.snap
+++ b/src/components/basic_table/__snapshots__/basic_table.test.js.snap
@@ -5,6 +5,7 @@ exports[`EuiBasicTable basic - empty - custom message 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
+    <EuiTableHeaderMobile />
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCell
@@ -36,6 +37,7 @@ exports[`EuiBasicTable basic - empty - custom message as node 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
+    <EuiTableHeaderMobile />
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCell
@@ -75,6 +77,7 @@ exports[`EuiBasicTable basic - empty 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
+    <EuiTableHeaderMobile />
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCell
@@ -106,6 +109,7 @@ exports[`EuiBasicTable basic - with items 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
+    <EuiTableHeaderMobile />
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCell
@@ -173,6 +177,7 @@ exports[`EuiBasicTable with pagination - 2nd page 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
+    <EuiTableHeaderMobile />
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCell
@@ -236,6 +241,7 @@ exports[`EuiBasicTable with pagination 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
+    <EuiTableHeaderMobile />
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCell
@@ -314,6 +320,7 @@ exports[`EuiBasicTable with pagination and error 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
+    <EuiTableHeaderMobile />
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCell
@@ -351,6 +358,7 @@ exports[`EuiBasicTable with pagination and selection 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
+    <EuiTableHeaderMobile />
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCellCheckbox
@@ -479,16 +487,18 @@ exports[`EuiBasicTable with pagination, selection and sorting 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
-    <EuiTableSortMobile>
-      <EuiTableSortMobileItem
-        isSortAscending={true}
-        isSorted={true}
-        key="_data_s_name_0"
-        onSort={[Function]}
-      >
-        Name
-      </EuiTableSortMobileItem>
-    </EuiTableSortMobile>
+    <EuiTableHeaderMobile>
+      <EuiTableSortMobile>
+        <EuiTableSortMobileItem
+          isSortAscending={true}
+          isSorted={true}
+          key="_data_s_name_0"
+          onSort={[Function]}
+        >
+          Name
+        </EuiTableSortMobileItem>
+      </EuiTableSortMobile>
+    </EuiTableHeaderMobile>
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCellCheckbox
@@ -620,16 +630,18 @@ exports[`EuiBasicTable with pagination, selection, sorting and a single record a
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
-    <EuiTableSortMobile>
-      <EuiTableSortMobileItem
-        isSortAscending={true}
-        isSorted={true}
-        key="_data_s_name_0"
-        onSort={[Function]}
-      >
-        Name
-      </EuiTableSortMobileItem>
-    </EuiTableSortMobile>
+    <EuiTableHeaderMobile>
+      <EuiTableSortMobile>
+        <EuiTableSortMobileItem
+          isSortAscending={true}
+          isSorted={true}
+          key="_data_s_name_0"
+          onSort={[Function]}
+        >
+          Name
+        </EuiTableSortMobileItem>
+      </EuiTableSortMobile>
+    </EuiTableHeaderMobile>
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCellCheckbox
@@ -852,16 +864,18 @@ exports[`EuiBasicTable with pagination, selection, sorting and column dataType 1
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
-    <EuiTableSortMobile>
-      <EuiTableSortMobileItem
-        isSortAscending={true}
-        isSorted={true}
-        key="_data_s_count_0"
-        onSort={[Function]}
-      >
-        Count
-      </EuiTableSortMobileItem>
-    </EuiTableSortMobile>
+    <EuiTableHeaderMobile>
+      <EuiTableSortMobile>
+        <EuiTableSortMobileItem
+          isSortAscending={true}
+          isSorted={true}
+          key="_data_s_count_0"
+          onSort={[Function]}
+        >
+          Count
+        </EuiTableSortMobileItem>
+      </EuiTableSortMobile>
+    </EuiTableHeaderMobile>
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCellCheckbox
@@ -993,16 +1007,18 @@ exports[`EuiBasicTable with pagination, selection, sorting and column renderer 1
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
-    <EuiTableSortMobile>
-      <EuiTableSortMobileItem
-        isSortAscending={true}
-        isSorted={true}
-        key="_data_s_name_0"
-        onSort={[Function]}
-      >
-        Name
-      </EuiTableSortMobileItem>
-    </EuiTableSortMobile>
+    <EuiTableHeaderMobile>
+      <EuiTableSortMobile>
+        <EuiTableSortMobileItem
+          isSortAscending={true}
+          isSorted={true}
+          key="_data_s_name_0"
+          onSort={[Function]}
+        >
+          Name
+        </EuiTableSortMobileItem>
+      </EuiTableSortMobile>
+    </EuiTableHeaderMobile>
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCellCheckbox
@@ -1134,16 +1150,18 @@ exports[`EuiBasicTable with pagination, selection, sorting and multiple record a
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
-    <EuiTableSortMobile>
-      <EuiTableSortMobileItem
-        isSortAscending={true}
-        isSorted={true}
-        key="_data_s_name_0"
-        onSort={[Function]}
-      >
-        Name
-      </EuiTableSortMobileItem>
-    </EuiTableSortMobile>
+    <EuiTableHeaderMobile>
+      <EuiTableSortMobile>
+        <EuiTableSortMobileItem
+          isSortAscending={true}
+          isSorted={true}
+          key="_data_s_name_0"
+          onSort={[Function]}
+        >
+          Name
+        </EuiTableSortMobileItem>
+      </EuiTableSortMobile>
+    </EuiTableHeaderMobile>
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCellCheckbox
@@ -1360,16 +1378,18 @@ exports[`EuiBasicTable with pagination, selection, sorting, column renderer and
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
-    <EuiTableSortMobile>
-      <EuiTableSortMobileItem
-        isSortAscending={true}
-        isSorted={true}
-        key="_data_s_count_0"
-        onSort={[Function]}
-      >
-        Count
-      </EuiTableSortMobileItem>
-    </EuiTableSortMobile>
+    <EuiTableHeaderMobile>
+      <EuiTableSortMobile>
+        <EuiTableSortMobileItem
+          isSortAscending={true}
+          isSorted={true}
+          key="_data_s_count_0"
+          onSort={[Function]}
+        >
+          Count
+        </EuiTableSortMobileItem>
+      </EuiTableSortMobile>
+    </EuiTableHeaderMobile>
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCellCheckbox
@@ -1501,6 +1521,7 @@ exports[`EuiBasicTable with sortable columns and sorting disabled 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
+    <EuiTableHeaderMobile />
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCell
@@ -1568,16 +1589,18 @@ exports[`EuiBasicTable with sorting 1`] = `
   className="euiBasicTable testClass1 testClass2"
 >
   <div>
-    <EuiTableSortMobile>
-      <EuiTableSortMobileItem
-        isSortAscending={true}
-        isSorted={true}
-        key="_data_s_name_0"
-        onSort={[Function]}
-      >
-        Name
-      </EuiTableSortMobileItem>
-    </EuiTableSortMobile>
+    <EuiTableHeaderMobile>
+      <EuiTableSortMobile>
+        <EuiTableSortMobileItem
+          isSortAscending={true}
+          isSorted={true}
+          key="_data_s_name_0"
+          onSort={[Function]}
+        >
+          Name
+        </EuiTableSortMobileItem>
+      </EuiTableSortMobile>
+    </EuiTableHeaderMobile>
     <EuiTable>
       <EuiTableHeader>
         <EuiTableHeaderCell
diff --git a/src/components/basic_table/basic_table.js b/src/components/basic_table/basic_table.js
index d3de4e4726b6..3a0a06ef9b15 100644
--- a/src/components/basic_table/basic_table.js
+++ b/src/components/basic_table/basic_table.js
@@ -25,8 +25,9 @@ import { EuiTableRow } from '../table/table_row';
 import { PaginationBar, PaginationType } from './pagination_bar';
 import { EuiIcon } from '../icon/icon';
 import { LoadingTableBody } from './loading_table_body';
-import { EuiTableSortMobile } from '../table/table_sort_mobile';
-import { EuiTableSortMobileItem } from '../table/table_sort_mobile_item';
+import { EuiTableHeaderMobile } from '../table/mobile/table_header_mobile';
+import { EuiTableSortMobile } from '../table/mobile/table_sort_mobile';
+import { EuiTableSortMobileItem } from '../table/mobile/table_sort_mobile_item';
 
 const dataTypesProfiles = {
   auto: {
@@ -308,7 +309,7 @@ export class EuiBasicTable extends Component {
       <div
         ref={element => { this.tableElement = element; }}
       >
-        {mobileSort}
+        <EuiTableHeaderMobile>{mobileSort}</EuiTableHeaderMobile>
         <EuiTable>{head}{body}</EuiTable>
       </div>
     );
diff --git a/src/components/index.js b/src/components/index.js
index 887de8ccab91..b6b220d74251 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -235,11 +235,12 @@ export {
   EuiTableHeaderCell,
   EuiTableHeaderCellCheckbox,
   EuiTablePagination,
-  EuiTableSortMobile,
-  EuiTableSortMobileItem,
   EuiTableRow,
   EuiTableRowCell,
   EuiTableRowCellCheckbox,
+  EuiTableHeaderMobile,
+  EuiTableSortMobile,
+  EuiTableSortMobileItem,
 } from './table';
 
 export {
diff --git a/src/components/table/__snapshots__/table_header_cell_checkbox.test.js.snap b/src/components/table/__snapshots__/table_header_cell_checkbox.test.js.snap
index 14264e0c8535..4e921b9ccd66 100644
--- a/src/components/table/__snapshots__/table_header_cell_checkbox.test.js.snap
+++ b/src/components/table/__snapshots__/table_header_cell_checkbox.test.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`EuiTableHeaderCellCheckbox is rendered 1`] = `
-<td
+<th
   aria-label="aria-label"
   class="euiTableHeaderCellCheckbox testClass1 testClass2"
   data-test-subj="test subject string"
@@ -10,5 +10,5 @@ exports[`EuiTableHeaderCellCheckbox is rendered 1`] = `
   <div
     class="euiTableCellContent"
   />
-</td>
+</th>
 `;
diff --git a/src/components/table/_index.scss b/src/components/table/_index.scss
index b390b90eddbc..4f47f5ad5bc2 100644
--- a/src/components/table/_index.scss
+++ b/src/components/table/_index.scss
@@ -12,4 +12,4 @@
 }
 
 @import "table";
-@import "responsive";
+@import "mobile/index";
diff --git a/src/components/table/_table.scss b/src/components/table/_table.scss
index 225e538c9ecd..729217cf6448 100644
--- a/src/components/table/_table.scss
+++ b/src/components/table/_table.scss
@@ -12,6 +12,11 @@
   background-color: $euiColorEmptyShade;
 }
 
+.euiTableHeaderMobile {
+  padding: $euiSizeS;
+}
+
+.euiTableHeaderMobile,
 .euiTableSortMobile {
   display: none;
 }
diff --git a/src/components/table/index.js b/src/components/table/index.js
index 5c4caaa5ed20..da56b30da2ff 100644
--- a/src/components/table/index.js
+++ b/src/components/table/index.js
@@ -5,8 +5,9 @@ export { EuiTableHeaderButton } from './table_header_button';
 export { EuiTableHeaderCell } from './table_header_cell';
 export { EuiTableHeaderCellCheckbox } from './table_header_cell_checkbox';
 export { EuiTablePagination } from './table_pagination';
-export { EuiTableSortMobile } from './table_sort_mobile';
-export { EuiTableSortMobileItem } from './table_sort_mobile_item';
+export { EuiTableHeaderMobile } from './mobile/table_header_mobile';
+export { EuiTableSortMobile } from './mobile/table_sort_mobile';
+export { EuiTableSortMobileItem } from './mobile/table_sort_mobile_item';
 export { EuiTableRow } from './table_row';
 export { EuiTableRowCell } from './table_row_cell';
 export { EuiTableRowCellCheckbox } from './table_row_cell_checkbox';
diff --git a/src/components/table/mobile/__snapshots__/table_header_mobile.test.js.snap b/src/components/table/mobile/__snapshots__/table_header_mobile.test.js.snap
new file mode 100644
index 000000000000..2aafb93781b6
--- /dev/null
+++ b/src/components/table/mobile/__snapshots__/table_header_mobile.test.js.snap
@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EuiTableHeaderMobile is rendered 1`] = `
+<div
+  aria-label="aria-label"
+  class="euiTableHeaderMobile testClass1 testClass2"
+  data-test-subj="test subject string"
+/>
+`;
diff --git a/src/components/table/__snapshots__/table_sort_mobile.test.js.snap b/src/components/table/mobile/__snapshots__/table_sort_mobile.test.js.snap
similarity index 95%
rename from src/components/table/__snapshots__/table_sort_mobile.test.js.snap
rename to src/components/table/mobile/__snapshots__/table_sort_mobile.test.js.snap
index 3e12888b9cb5..06de16355522 100644
--- a/src/components/table/__snapshots__/table_sort_mobile.test.js.snap
+++ b/src/components/table/mobile/__snapshots__/table_sort_mobile.test.js.snap
@@ -8,12 +8,11 @@ exports[`EuiTableSortMobile is rendered 1`] = `
     aria-label="aria-label"
     class="euiPopover euiPopover--anchorDownLeft"
     data-test-subj="test subject string"
-    style="min-width:200px"
   >
     <button
       aria-controls="sortPopover"
       aria-expanded="false"
-      class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--iconRight"
+      class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiButtonEmpty--flushRight"
       type="button"
     >
       <span
diff --git a/src/components/table/__snapshots__/table_sort_mobile_item.test.js.snap b/src/components/table/mobile/__snapshots__/table_sort_mobile_item.test.js.snap
similarity index 100%
rename from src/components/table/__snapshots__/table_sort_mobile_item.test.js.snap
rename to src/components/table/mobile/__snapshots__/table_sort_mobile_item.test.js.snap
diff --git a/src/components/table/_responsive.scss b/src/components/table/mobile/_index.scss
similarity index 91%
rename from src/components/table/_responsive.scss
rename to src/components/table/mobile/_index.scss
index 22341ad28e4c..c31c32c9650d 100644
--- a/src/components/table/_responsive.scss
+++ b/src/components/table/mobile/_index.scss
@@ -4,6 +4,11 @@
     thead { display: none; }
   }
 
+  .euiTableHeaderMobile {
+    display: flex;
+    justify-content: flex-end;
+  }
+
   .euiTableSortMobile {
     display: block;
 
@@ -48,7 +53,7 @@
     }
 
     &.euiTableRow-isSelectable {
-      padding-left: $euiSizeXL;
+      padding-left: $euiSizeL;
       position: relative;
 
       .euiTableRowCellCheckbox {
@@ -62,12 +67,12 @@
     }
 
     &.euiTableRow-hasActions {
-      padding-right: $euiSizeXL;
+      padding-right: $euiSizeL;
       position: relative;
 
       .euiTableRowCell--hasActions {
         min-width: 0;
-        width: $euiSizeXXL;
+        width: $euiSizeXL;
         position: absolute;
         right: 0;
         top: $euiSize;
@@ -119,14 +124,13 @@
       }
 
       .euiTableCellContent {
-        padding-top: $euiSizex;
+        padding-top: $euiSizeXS;
       }
     }
   }
 
   .euiTableRowCellCheckbox {
     border: none;
-    padding: 6px;
 
     &::before {
       content: '';
@@ -144,9 +148,11 @@
     }
 
   .euiTableCellContent--alignRight {
+    justify-content: flex-start;
   }
 
   .euiTableCellContent--alignCenter {
+    justify-content: flex-start;
   }
 
   .euiTableCellContent--truncateText {
diff --git a/src/components/table/mobile/index.js b/src/components/table/mobile/index.js
new file mode 100644
index 000000000000..75e7c70d8abb
--- /dev/null
+++ b/src/components/table/mobile/index.js
@@ -0,0 +1,3 @@
+export {
+  EuiTableHeaderMobile,
+} from './table_header_mobile';
diff --git a/src/components/table/mobile/table_header_mobile.js b/src/components/table/mobile/table_header_mobile.js
new file mode 100644
index 000000000000..ac1d855fa477
--- /dev/null
+++ b/src/components/table/mobile/table_header_mobile.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+export const EuiTableHeaderMobile = ({
+  children,
+  className,
+  ...rest,
+}) => {
+  const classes = classNames('euiTableHeaderMobile', className);
+
+  return (
+    <div
+      className={classes}
+      {...rest}
+    >
+      {children}
+    </div>
+  );
+};
+
+EuiTableHeaderMobile.propTypes = {
+  children: PropTypes.node,
+  className: PropTypes.string,
+};
diff --git a/src/components/table/mobile/table_header_mobile.test.js b/src/components/table/mobile/table_header_mobile.test.js
new file mode 100644
index 000000000000..1aa94791d962
--- /dev/null
+++ b/src/components/table/mobile/table_header_mobile.test.js
@@ -0,0 +1,16 @@
+import React from 'react';
+import { render } from 'enzyme';
+import { requiredProps } from '../../../test';
+
+import { EuiTableHeaderMobile } from './table_header_mobile';
+
+describe('EuiTableHeaderMobile', () => {
+  test('is rendered', () => {
+    const component = render(
+      <EuiTableHeaderMobile {...requiredProps} />
+    );
+
+    expect(component)
+      .toMatchSnapshot();
+  });
+});
diff --git a/src/components/table/table_sort_mobile.js b/src/components/table/mobile/table_sort_mobile.js
similarity index 81%
rename from src/components/table/table_sort_mobile.js
rename to src/components/table/mobile/table_sort_mobile.js
index 1305896ea63f..3c4ade5aa6ed 100644
--- a/src/components/table/table_sort_mobile.js
+++ b/src/components/table/mobile/table_sort_mobile.js
@@ -4,9 +4,9 @@ import React, {
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-import { EuiButtonEmpty } from '../button/button_empty';
-import { EuiPopover } from '../popover';
-import { EuiContextMenuPanel } from '../context_menu';
+import { EuiButtonEmpty } from '../../button/button_empty';
+import { EuiPopover } from '../../popover';
+import { EuiContextMenuPanel } from '../../context_menu';
 
 export class EuiTableSortMobile extends Component {
   static propTypes = {
@@ -38,6 +38,7 @@ export class EuiTableSortMobile extends Component {
     const {
       children,
       className,
+      anchorPosition,
       ...rest
     } = this.props;
 
@@ -51,6 +52,8 @@ export class EuiTableSortMobile extends Component {
         iconType="arrowDown"
         iconSide="right"
         onClick={this.onButtonClick.bind(this)}
+        flush="right"
+        size="xs"
       >
         Sorting
       </EuiButtonEmpty>
@@ -63,12 +66,12 @@ export class EuiTableSortMobile extends Component {
         button={mobileSortButton}
         isOpen={this.state.isPopoverOpen}
         closePopover={this.closePopover.bind(this)}
-        anchorPosition="downLeft"
+        anchorPosition={anchorPosition || "downLeft"}
         panelPaddingSize="none"
-        style={{ minWidth: 200 }}
         {...rest}
       >
         <EuiContextMenuPanel
+          style={{ minWidth: 200 }}
           items={children}
         />
       </EuiPopover>
diff --git a/src/components/table/table_sort_mobile.test.js b/src/components/table/mobile/table_sort_mobile.test.js
similarity index 87%
rename from src/components/table/table_sort_mobile.test.js
rename to src/components/table/mobile/table_sort_mobile.test.js
index 4008507b5072..22280f9c69dd 100644
--- a/src/components/table/table_sort_mobile.test.js
+++ b/src/components/table/mobile/table_sort_mobile.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render } from 'enzyme';
-import { requiredProps } from '../../test';
+import { requiredProps } from '../../../test';
 
 import { EuiTableSortMobile } from './table_sort_mobile';
 
diff --git a/src/components/table/table_sort_mobile_item.js b/src/components/table/mobile/table_sort_mobile_item.js
similarity index 95%
rename from src/components/table/table_sort_mobile_item.js
rename to src/components/table/mobile/table_sort_mobile_item.js
index 86a8d3885cb4..fa674440eef8 100644
--- a/src/components/table/table_sort_mobile_item.js
+++ b/src/components/table/mobile/table_sort_mobile_item.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-import { EuiContextMenuItem } from '../context_menu';
+import { EuiContextMenuItem } from '../../context_menu';
 
 export const EuiTableSortMobileItem = ({
   children,
diff --git a/src/components/table/table_sort_mobile_item.test.js b/src/components/table/mobile/table_sort_mobile_item.test.js
similarity index 88%
rename from src/components/table/table_sort_mobile_item.test.js
rename to src/components/table/mobile/table_sort_mobile_item.test.js
index be04bee8c23a..adfea7cea2c2 100644
--- a/src/components/table/table_sort_mobile_item.test.js
+++ b/src/components/table/mobile/table_sort_mobile_item.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render } from 'enzyme';
-import { requiredProps } from '../../test';
+import { requiredProps } from '../../../test';
 
 import { EuiTableSortMobileItem } from './table_sort_mobile_item';
 
diff --git a/src/components/table/table_header_cell_checkbox.js b/src/components/table/table_header_cell_checkbox.js
index 3389b9c237ed..1de6ac044a60 100644
--- a/src/components/table/table_header_cell_checkbox.js
+++ b/src/components/table/table_header_cell_checkbox.js
@@ -10,11 +10,11 @@ export const EuiTableHeaderCellCheckbox = ({
   const classes = classNames('euiTableHeaderCellCheckbox', className);
 
   return (
-    <td className={classes} {...rest} >
+    <th className={classes} {...rest} >
       <div className="euiTableCellContent">
         {children}
       </div>
-    </td>
+    </th>
   );
 };