diff --git a/src/components/MediaLibrary/MediaLibrary.css b/src/components/MediaLibrary/MediaLibrary.css
index b731c6164a5c..0a175226550c 100644
--- a/src/components/MediaLibrary/MediaLibrary.css
+++ b/src/components/MediaLibrary/MediaLibrary.css
@@ -1,3 +1,5 @@
+@import './MediaLibraryFooter.css';
+
 :root {
   --mediaLibraryCardWidth: 300px;
   --mediaLibraryCardMargin: 10px;
@@ -33,31 +35,6 @@
   margin-top: 20px;
 }
 
-.nc-mediaLibrary-buttonRight {
-  float: right;
-  margin-left: 10px;
-}
-
-.nc-mediaLibrary-buttonLeft {
-  float: left;
-  margin-right: 10px;
-}
-
-.nc-mediaLibrary-button-loader {
-  float: left;
-  margin: 8px 20px;
-}
-
-.nc-mediaLibrary-button-loaderSpinner {
-  position: static;
-}
-
-.nc-mediaLibrary-button-loaderText {
-  position: relative;
-  top: 2px;
-  margin-left: 18px;
-}
-
 .nc-mediaLibrary-searchInput {
   @apply --input;
   font-family: var(--fontFamilyPrimary);
@@ -69,14 +46,6 @@
   z-index: 1;
 }
 
-.nc-mediaLibrary-thumbnail {
-  max-height: 44px;
-  max-width: 88px;
-  margin: -10px auto;
-  display: block;
-  border-radius: 4px;
-}
-
 .nc-mediaLibrary-emptyMessage {
   height: 100%;
   width: 100%;
@@ -88,9 +57,6 @@
   align-items: center;
 }
 
-.nc-mediaLibrary-paginatingMessage {
-}
-
 .nc-mediaLibrary-cardGrid-container {
   height: calc(100% - 150px);
   margin: 20px auto 0;
@@ -109,6 +75,7 @@
   border: var(--textFieldBorder);
   border-radius: var(--borderRadius);
   cursor: pointer;
+  overflow: hidden;
 }
 
 .nc-mediaLibrary-card-selected {
diff --git a/src/components/MediaLibrary/MediaLibraryFooter.css b/src/components/MediaLibrary/MediaLibraryFooter.css
new file mode 100644
index 000000000000..4133dd6279c3
--- /dev/null
+++ b/src/components/MediaLibrary/MediaLibraryFooter.css
@@ -0,0 +1,25 @@
+.nc-mediaLibrary-footer-buttonRight {
+  float: right;
+  margin-left: 10px;
+}
+
+.nc-mediaLibrary-footer-buttonLeft {
+  float: left;
+  margin-right: 10px;
+}
+
+.nc-mediaLibrary-footer-button-loader {
+  float: left;
+  margin: 8px 20px;
+}
+
+.nc-mediaLibrary-footer-button-loaderSpinner {
+  position: static;
+}
+
+.nc-mediaLibrary-footer-button-loaderText {
+  position: relative;
+  top: 2px;
+  margin-left: 18px;
+}
+
diff --git a/src/components/MediaLibrary/MediaLibraryFooter.js b/src/components/MediaLibrary/MediaLibraryFooter.js
index a93bfc433398..47b728bef016 100644
--- a/src/components/MediaLibrary/MediaLibraryFooter.js
+++ b/src/components/MediaLibrary/MediaLibraryFooter.js
@@ -16,9 +16,9 @@ const MediaLibraryFooter = ({
   const shouldShowLoader = isPersisting || isDeleting;
   const loaderText = isPersisting ? 'Uploading...' : 'Deleting...';
   const loader = (
-    <div className="nc-mediaLibrary-button-loader">
-      <Loader className="nc-mediaLibrary-button-loaderSpinner" active/>
-      <strong className="nc-mediaLibrary-button-loaderText">{loaderText}</strong>
+    <div className="nc-mediaLibrary-footer-button-loader">
+      <Loader className="nc-mediaLibrary-footer-button-loaderSpinner" active/>
+      <strong className="nc-mediaLibrary-footer-button-loaderText">{loaderText}</strong>
     </div>
   );
   return (
@@ -26,7 +26,7 @@ const MediaLibraryFooter = ({
       <Button
         label="Delete"
         onClick={onDelete}
-        className="nc-mediaLibrary-buttonLeft"
+        className="nc-mediaLibrary-footer-buttonLeft"
         disabled={shouldShowLoader || !hasSelection}
         accent
         raised
@@ -35,7 +35,7 @@ const MediaLibraryFooter = ({
         label="Upload"
         accept={forImage}
         onChange={onPersist}
-        className="nc-mediaLibrary-buttonLeft"
+        className="nc-mediaLibrary-footer-buttonLeft"
         disabled={shouldShowLoader}
         primary
         raised
@@ -44,14 +44,14 @@ const MediaLibraryFooter = ({
       <Button
         label="Close"
         onClick={onClose}
-        className="nc-mediaLibrary-buttonRight"
+        className="nc-mediaLibrary-footer-buttonRight"
         raised
       />
       { !canInsert ? null :
         <Button
           label="Insert"
           onClick={onInsert}
-          className="nc-mediaLibrary-buttonRight"
+          className="nc-mediaLibrary-footer-buttonRight"
           disabled={!hasSelection}
           primary
           raised
diff --git a/src/components/MediaLibrary/MediaLibraryTable.js b/src/components/MediaLibrary/MediaLibraryTable.js
deleted file mode 100644
index 3329a80c6aa8..000000000000
--- a/src/components/MediaLibrary/MediaLibraryTable.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import React from 'react';
-import bytes from 'bytes';
-import { Table, TableHead, TableRow, TableCell } from 'react-toolbox/lib/table';
-
-export default class MediaLibraryTable extends React.Component {
-  /**
-   * We would generally use an HOC to preload props into the TableCell
-   * component, but React Toolbox won't process the component properly if it's
-   * wrapped in an HOC. Instead, we use this prop getter on each TableCell
-   * instance to avoid repetition.
-   */
-  getHeadCellProps(name, opts = {}) {
-    const { sort = true, style = {} } = opts;
-    const { hasMedia, getSortDirection, onSortClick } = this.props;
-    const canSort = hasMedia && sort;
-    const cursor = canSort ? 'pointer' : 'auto';
-    return {
-      sorted: canSort ? getSortDirection(name) : null,
-      onClick: () => canSort && onSortClick(name),
-      style: { ...style, cursor },
-      theme: {
-        headCell: 'nc-mediaLibrary-headCell',
-        sortIcon: 'nc-mediaLibrary-sortIcon',
-      },
-    };
-  }
-
-  render () {
-    const {
-      data,
-      selectedFile,
-      onRowSelect,
-      onRowFocus,
-      onRowBlur,
-      getSortDirection,
-      onSortClick,
-    } = this.props;
-
-    return (
-      <Table>
-        <TableHead>
-          <TableCell { ...this.getHeadCellProps('image', { sort: false, style: { width: '92px' } }) }>
-            Image
-          </TableCell>
-          <TableCell { ...this.getHeadCellProps('name') }>Name</TableCell>
-          <TableCell { ...this.getHeadCellProps('type') }>Type</TableCell>
-          <TableCell { ...this.getHeadCellProps('size') }>Size</TableCell>
-        </TableHead>
-        {
-          data.map((file, idx) =>
-            <TableRow
-              key={idx}
-              selected={selectedFile.id === file.id }
-              onFocus={onRowFocus}
-              onBlur={onRowBlur}
-              onSelect={() => onRowSelect(data[idx])}
-              onClick={e => {
-                e.preventDefault();
-                e.stopPropagation();
-                onRowSelect(data[idx]);
-              }}
-            >
-              <TableCell>
-                {
-                  !file.isImage ? null :
-                    <a href={file.url} target="_blank" tabIndex="-1">
-                      <img src={file.url} className="nc-mediaLibrary-thumbnail"/>
-                    </a>
-                }
-              </TableCell>
-              <TableCell>{file.name}</TableCell>
-              <TableCell>{file.type}</TableCell>
-              <TableCell>{bytes(file.size, { decimalPlaces: 0 })}</TableCell>
-            </TableRow>
-          )
-        }
-      </Table>
-    );
-  }
-}