diff --git a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-blue-orange.css b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-blue-orange.css
index 525f783358..bc65d9b241 100644
--- a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-blue-orange.css
+++ b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-blue-orange.css
@@ -1337,12 +1337,12 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
   display: flex;
   border-top: 1px solid rgba(0, 0, 0, 0.07);
   height: 48px;
-  line-height: 48px;
-  color: white; }
+  line-height: 20px;
+  color: rgba(0, 0, 0, 0.87); }
   .adf-pagination__block {
     display: flex;
     align-items: center;
-    padding: 0 12px;
+    padding: 0 8px;
     border-right: 1px solid rgba(0, 0, 0, 0.07); }
     .adf-pagination__block:first-child {
       flex: 1 1 auto;
@@ -1494,8 +1494,6 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
 .adf-hyperlink-widget {
   padding: 0.4375em 0;
   border-top: 0.84375em solid transparent; }
-  .adf-hyperlink-widget .focus {
-    color: #2196f3; }
   .adf-hyperlink-widget a {
     color: #2196f3; }
 
@@ -2002,23 +2000,22 @@ adf-people-list /deep/ adf-datatable /deep/ .people-pic {
 adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric.non-selectable.data-cell {
   padding: 10px; }
 
-.mdl-list__item {
-  cursor: pointer; }
-
 .adf-filters__entry {
-  cursor: pointer; }
+  cursor: pointer;
+  font-size: 14px !important;
+  font-weight: bold;
+  opacity: .54;
+  padding-left: 30px; }
+  .adf-filters__entry .mat-list-item-content {
+    height: 34px; }
 
 .adf-filters__entry-icon {
-  margin-right: 12px !important; }
+  padding-right: 12px !important;
+  padding-left: 0px !important; }
 
-.adf-filters__entry.active {
-  color: #2196f3; }
-
-.adf-filters__entry:hover {
-  opacity: 0.8; }
-
-.adf-filters__entry.active .adf-filters__entry-icon {
-  color: #2196f3; }
+.adf-filters__entry.active, .adf-filters__entry:hover {
+  color: #2196f3;
+  opacity: 1; }
 
 .adf-controls {
   display: flex;
@@ -2049,7 +2046,10 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
   border-collapse: unset;
   border-spacing: 0;
   /* Empty folder */
-  /* Loading folder */ }
+  /* Loading folder */
+  /* [Accessibility] For screen reader only */
+  /* Utils */
+  /* mobile phone */ }
   .adf-data-table thead {
     padding-bottom: 3px; }
   .adf-data-table tbody tr {
@@ -2076,6 +2076,11 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       padding-left: 24px; }
     .adf-data-table td:last-of-type, .adf-data-table th:last-of-type {
       padding-right: 24px; }
+    .adf-data-table td:focus, .adf-data-table th:focus {
+      outline-offset: -1px;
+      outline-width: 1px;
+      outline-color: #448aff;
+      outline-style: solid; }
   .adf-data-table td {
     color: rgba(0, 0, 0, 0.87);
     position: relative;
@@ -2108,7 +2113,7 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
     letter-spacing: 0;
     height: 56px;
     font-size: 12px;
-    color: white;
+    color: rgba(0, 0, 0, 0.87);
     padding-bottom: 8px;
     box-sizing: border-box; }
     .adf-data-table th.sortable {
@@ -2188,30 +2193,23 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       overflow: hidden;
       height: 0;
       display: block; }
-
-/* Utils */
-/* [Accessibility] For screen reader only */
-:host .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
-
-.hidden {
-  display: none; }
-
-/* mobile phone */
-@media all and (max-width: 768px) {
-  .desktop-only {
-    display: none; } }
-
-@media (max-device-width: 768px) {
-  .desktop-only {
-    display: none; } }
+  .adf-data-table .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0; }
+  .adf-data-table .hidden {
+    display: none; }
+  @media all and (max-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
+  @media (max-device-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
 
 .adf-upload__dragging > td {
   border-top: 1px dashed #448aff;
diff --git a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-blue-purple.css b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-blue-purple.css
index cfcd0e4c4b..b2c8a258ed 100644
--- a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-blue-purple.css
+++ b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-blue-purple.css
@@ -1337,12 +1337,12 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
   display: flex;
   border-top: 1px solid rgba(0, 0, 0, 0.07);
   height: 48px;
-  line-height: 48px;
-  color: white; }
+  line-height: 20px;
+  color: rgba(0, 0, 0, 0.87); }
   .adf-pagination__block {
     display: flex;
     align-items: center;
-    padding: 0 12px;
+    padding: 0 8px;
     border-right: 1px solid rgba(0, 0, 0, 0.07); }
     .adf-pagination__block:first-child {
       flex: 1 1 auto;
@@ -1494,8 +1494,6 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
 .adf-hyperlink-widget {
   padding: 0.4375em 0;
   border-top: 0.84375em solid transparent; }
-  .adf-hyperlink-widget .focus {
-    color: #2196f3; }
   .adf-hyperlink-widget a {
     color: #2196f3; }
 
@@ -2002,23 +2000,22 @@ adf-people-list /deep/ adf-datatable /deep/ .people-pic {
 adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric.non-selectable.data-cell {
   padding: 10px; }
 
-.mdl-list__item {
-  cursor: pointer; }
-
 .adf-filters__entry {
-  cursor: pointer; }
+  cursor: pointer;
+  font-size: 14px !important;
+  font-weight: bold;
+  opacity: .54;
+  padding-left: 30px; }
+  .adf-filters__entry .mat-list-item-content {
+    height: 34px; }
 
 .adf-filters__entry-icon {
-  margin-right: 12px !important; }
+  padding-right: 12px !important;
+  padding-left: 0px !important; }
 
-.adf-filters__entry.active {
-  color: #2196f3; }
-
-.adf-filters__entry:hover {
-  opacity: 0.8; }
-
-.adf-filters__entry.active .adf-filters__entry-icon {
-  color: #2196f3; }
+.adf-filters__entry.active, .adf-filters__entry:hover {
+  color: #2196f3;
+  opacity: 1; }
 
 .adf-controls {
   display: flex;
@@ -2049,7 +2046,10 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
   border-collapse: unset;
   border-spacing: 0;
   /* Empty folder */
-  /* Loading folder */ }
+  /* Loading folder */
+  /* [Accessibility] For screen reader only */
+  /* Utils */
+  /* mobile phone */ }
   .adf-data-table thead {
     padding-bottom: 3px; }
   .adf-data-table tbody tr {
@@ -2076,6 +2076,11 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       padding-left: 24px; }
     .adf-data-table td:last-of-type, .adf-data-table th:last-of-type {
       padding-right: 24px; }
+    .adf-data-table td:focus, .adf-data-table th:focus {
+      outline-offset: -1px;
+      outline-width: 1px;
+      outline-color: #448aff;
+      outline-style: solid; }
   .adf-data-table td {
     color: rgba(0, 0, 0, 0.87);
     position: relative;
@@ -2108,7 +2113,7 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
     letter-spacing: 0;
     height: 56px;
     font-size: 12px;
-    color: white;
+    color: rgba(0, 0, 0, 0.87);
     padding-bottom: 8px;
     box-sizing: border-box; }
     .adf-data-table th.sortable {
@@ -2188,30 +2193,23 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       overflow: hidden;
       height: 0;
       display: block; }
-
-/* Utils */
-/* [Accessibility] For screen reader only */
-:host .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
-
-.hidden {
-  display: none; }
-
-/* mobile phone */
-@media all and (max-width: 768px) {
-  .desktop-only {
-    display: none; } }
-
-@media (max-device-width: 768px) {
-  .desktop-only {
-    display: none; } }
+  .adf-data-table .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0; }
+  .adf-data-table .hidden {
+    display: none; }
+  @media all and (max-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
+  @media (max-device-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
 
 .adf-upload__dragging > td {
   border-top: 1px dashed #448aff;
diff --git a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-cyan-orange.css b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-cyan-orange.css
index 4db3e4d6a5..094ac15574 100644
--- a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-cyan-orange.css
+++ b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-cyan-orange.css
@@ -1337,12 +1337,12 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
   display: flex;
   border-top: 1px solid rgba(0, 0, 0, 0.07);
   height: 48px;
-  line-height: 48px;
-  color: white; }
+  line-height: 20px;
+  color: rgba(0, 0, 0, 0.87); }
   .adf-pagination__block {
     display: flex;
     align-items: center;
-    padding: 0 12px;
+    padding: 0 8px;
     border-right: 1px solid rgba(0, 0, 0, 0.07); }
     .adf-pagination__block:first-child {
       flex: 1 1 auto;
@@ -1494,8 +1494,6 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
 .adf-hyperlink-widget {
   padding: 0.4375em 0;
   border-top: 0.84375em solid transparent; }
-  .adf-hyperlink-widget .focus {
-    color: #00bcd4; }
   .adf-hyperlink-widget a {
     color: #00bcd4; }
 
@@ -2002,23 +2000,22 @@ adf-people-list /deep/ adf-datatable /deep/ .people-pic {
 adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric.non-selectable.data-cell {
   padding: 10px; }
 
-.mdl-list__item {
-  cursor: pointer; }
-
 .adf-filters__entry {
-  cursor: pointer; }
+  cursor: pointer;
+  font-size: 14px !important;
+  font-weight: bold;
+  opacity: .54;
+  padding-left: 30px; }
+  .adf-filters__entry .mat-list-item-content {
+    height: 34px; }
 
 .adf-filters__entry-icon {
-  margin-right: 12px !important; }
+  padding-right: 12px !important;
+  padding-left: 0px !important; }
 
-.adf-filters__entry.active {
-  color: #00bcd4; }
-
-.adf-filters__entry:hover {
-  opacity: 0.8; }
-
-.adf-filters__entry.active .adf-filters__entry-icon {
-  color: #00bcd4; }
+.adf-filters__entry.active, .adf-filters__entry:hover {
+  color: #00bcd4;
+  opacity: 1; }
 
 .adf-controls {
   display: flex;
@@ -2049,7 +2046,10 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
   border-collapse: unset;
   border-spacing: 0;
   /* Empty folder */
-  /* Loading folder */ }
+  /* Loading folder */
+  /* [Accessibility] For screen reader only */
+  /* Utils */
+  /* mobile phone */ }
   .adf-data-table thead {
     padding-bottom: 3px; }
   .adf-data-table tbody tr {
@@ -2076,6 +2076,11 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       padding-left: 24px; }
     .adf-data-table td:last-of-type, .adf-data-table th:last-of-type {
       padding-right: 24px; }
+    .adf-data-table td:focus, .adf-data-table th:focus {
+      outline-offset: -1px;
+      outline-width: 1px;
+      outline-color: #448aff;
+      outline-style: solid; }
   .adf-data-table td {
     color: rgba(0, 0, 0, 0.87);
     position: relative;
@@ -2108,7 +2113,7 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
     letter-spacing: 0;
     height: 56px;
     font-size: 12px;
-    color: white;
+    color: rgba(0, 0, 0, 0.87);
     padding-bottom: 8px;
     box-sizing: border-box; }
     .adf-data-table th.sortable {
@@ -2188,30 +2193,23 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       overflow: hidden;
       height: 0;
       display: block; }
-
-/* Utils */
-/* [Accessibility] For screen reader only */
-:host .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
-
-.hidden {
-  display: none; }
-
-/* mobile phone */
-@media all and (max-width: 768px) {
-  .desktop-only {
-    display: none; } }
-
-@media (max-device-width: 768px) {
-  .desktop-only {
-    display: none; } }
+  .adf-data-table .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0; }
+  .adf-data-table .hidden {
+    display: none; }
+  @media all and (max-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
+  @media (max-device-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
 
 .adf-upload__dragging > td {
   border-top: 1px dashed #448aff;
diff --git a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-cyan-purple.css b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-cyan-purple.css
index d3499fe1d6..55996e678a 100644
--- a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-cyan-purple.css
+++ b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-cyan-purple.css
@@ -1337,12 +1337,12 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
   display: flex;
   border-top: 1px solid rgba(0, 0, 0, 0.07);
   height: 48px;
-  line-height: 48px;
-  color: white; }
+  line-height: 20px;
+  color: rgba(0, 0, 0, 0.87); }
   .adf-pagination__block {
     display: flex;
     align-items: center;
-    padding: 0 12px;
+    padding: 0 8px;
     border-right: 1px solid rgba(0, 0, 0, 0.07); }
     .adf-pagination__block:first-child {
       flex: 1 1 auto;
@@ -1494,8 +1494,6 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
 .adf-hyperlink-widget {
   padding: 0.4375em 0;
   border-top: 0.84375em solid transparent; }
-  .adf-hyperlink-widget .focus {
-    color: #00bcd4; }
   .adf-hyperlink-widget a {
     color: #00bcd4; }
 
@@ -2002,23 +2000,22 @@ adf-people-list /deep/ adf-datatable /deep/ .people-pic {
 adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric.non-selectable.data-cell {
   padding: 10px; }
 
-.mdl-list__item {
-  cursor: pointer; }
-
 .adf-filters__entry {
-  cursor: pointer; }
+  cursor: pointer;
+  font-size: 14px !important;
+  font-weight: bold;
+  opacity: .54;
+  padding-left: 30px; }
+  .adf-filters__entry .mat-list-item-content {
+    height: 34px; }
 
 .adf-filters__entry-icon {
-  margin-right: 12px !important; }
+  padding-right: 12px !important;
+  padding-left: 0px !important; }
 
-.adf-filters__entry.active {
-  color: #00bcd4; }
-
-.adf-filters__entry:hover {
-  opacity: 0.8; }
-
-.adf-filters__entry.active .adf-filters__entry-icon {
-  color: #00bcd4; }
+.adf-filters__entry.active, .adf-filters__entry:hover {
+  color: #00bcd4;
+  opacity: 1; }
 
 .adf-controls {
   display: flex;
@@ -2049,7 +2046,10 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
   border-collapse: unset;
   border-spacing: 0;
   /* Empty folder */
-  /* Loading folder */ }
+  /* Loading folder */
+  /* [Accessibility] For screen reader only */
+  /* Utils */
+  /* mobile phone */ }
   .adf-data-table thead {
     padding-bottom: 3px; }
   .adf-data-table tbody tr {
@@ -2076,6 +2076,11 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       padding-left: 24px; }
     .adf-data-table td:last-of-type, .adf-data-table th:last-of-type {
       padding-right: 24px; }
+    .adf-data-table td:focus, .adf-data-table th:focus {
+      outline-offset: -1px;
+      outline-width: 1px;
+      outline-color: #448aff;
+      outline-style: solid; }
   .adf-data-table td {
     color: rgba(0, 0, 0, 0.87);
     position: relative;
@@ -2108,7 +2113,7 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
     letter-spacing: 0;
     height: 56px;
     font-size: 12px;
-    color: white;
+    color: rgba(0, 0, 0, 0.87);
     padding-bottom: 8px;
     box-sizing: border-box; }
     .adf-data-table th.sortable {
@@ -2188,30 +2193,23 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       overflow: hidden;
       height: 0;
       display: block; }
-
-/* Utils */
-/* [Accessibility] For screen reader only */
-:host .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
-
-.hidden {
-  display: none; }
-
-/* mobile phone */
-@media all and (max-width: 768px) {
-  .desktop-only {
-    display: none; } }
-
-@media (max-device-width: 768px) {
-  .desktop-only {
-    display: none; } }
+  .adf-data-table .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0; }
+  .adf-data-table .hidden {
+    display: none; }
+  @media all and (max-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
+  @media (max-device-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
 
 .adf-upload__dragging > td {
   border-top: 1px dashed #448aff;
diff --git a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-green-orange.css b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-green-orange.css
index 2371adaab2..6140d6fdd6 100644
--- a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-green-orange.css
+++ b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-green-orange.css
@@ -1337,12 +1337,12 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
   display: flex;
   border-top: 1px solid rgba(0, 0, 0, 0.07);
   height: 48px;
-  line-height: 48px;
+  line-height: 20px;
   color: rgba(0, 0, 0, 0.87); }
   .adf-pagination__block {
     display: flex;
     align-items: center;
-    padding: 0 12px;
+    padding: 0 8px;
     border-right: 1px solid rgba(0, 0, 0, 0.07); }
     .adf-pagination__block:first-child {
       flex: 1 1 auto;
@@ -1494,8 +1494,6 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
 .adf-hyperlink-widget {
   padding: 0.4375em 0;
   border-top: 0.84375em solid transparent; }
-  .adf-hyperlink-widget .focus {
-    color: #8bc34a; }
   .adf-hyperlink-widget a {
     color: #8bc34a; }
 
@@ -2002,23 +2000,22 @@ adf-people-list /deep/ adf-datatable /deep/ .people-pic {
 adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric.non-selectable.data-cell {
   padding: 10px; }
 
-.mdl-list__item {
-  cursor: pointer; }
-
 .adf-filters__entry {
-  cursor: pointer; }
+  cursor: pointer;
+  font-size: 14px !important;
+  font-weight: bold;
+  opacity: .54;
+  padding-left: 30px; }
+  .adf-filters__entry .mat-list-item-content {
+    height: 34px; }
 
 .adf-filters__entry-icon {
-  margin-right: 12px !important; }
+  padding-right: 12px !important;
+  padding-left: 0px !important; }
 
-.adf-filters__entry.active {
-  color: #8bc34a; }
-
-.adf-filters__entry:hover {
-  opacity: 0.8; }
-
-.adf-filters__entry.active .adf-filters__entry-icon {
-  color: #8bc34a; }
+.adf-filters__entry.active, .adf-filters__entry:hover {
+  color: #8bc34a;
+  opacity: 1; }
 
 .adf-controls {
   display: flex;
@@ -2049,7 +2046,10 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
   border-collapse: unset;
   border-spacing: 0;
   /* Empty folder */
-  /* Loading folder */ }
+  /* Loading folder */
+  /* [Accessibility] For screen reader only */
+  /* Utils */
+  /* mobile phone */ }
   .adf-data-table thead {
     padding-bottom: 3px; }
   .adf-data-table tbody tr {
@@ -2076,6 +2076,11 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       padding-left: 24px; }
     .adf-data-table td:last-of-type, .adf-data-table th:last-of-type {
       padding-right: 24px; }
+    .adf-data-table td:focus, .adf-data-table th:focus {
+      outline-offset: -1px;
+      outline-width: 1px;
+      outline-color: #448aff;
+      outline-style: solid; }
   .adf-data-table td {
     color: rgba(0, 0, 0, 0.87);
     position: relative;
@@ -2188,30 +2193,23 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       overflow: hidden;
       height: 0;
       display: block; }
-
-/* Utils */
-/* [Accessibility] For screen reader only */
-:host .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
-
-.hidden {
-  display: none; }
-
-/* mobile phone */
-@media all and (max-width: 768px) {
-  .desktop-only {
-    display: none; } }
-
-@media (max-device-width: 768px) {
-  .desktop-only {
-    display: none; } }
+  .adf-data-table .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0; }
+  .adf-data-table .hidden {
+    display: none; }
+  @media all and (max-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
+  @media (max-device-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
 
 .adf-upload__dragging > td {
   border-top: 1px dashed #448aff;
diff --git a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-green-purple.css b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-green-purple.css
index 42d7ae6539..0f46173f43 100644
--- a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-green-purple.css
+++ b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-green-purple.css
@@ -1337,12 +1337,12 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
   display: flex;
   border-top: 1px solid rgba(0, 0, 0, 0.07);
   height: 48px;
-  line-height: 48px;
+  line-height: 20px;
   color: rgba(0, 0, 0, 0.87); }
   .adf-pagination__block {
     display: flex;
     align-items: center;
-    padding: 0 12px;
+    padding: 0 8px;
     border-right: 1px solid rgba(0, 0, 0, 0.07); }
     .adf-pagination__block:first-child {
       flex: 1 1 auto;
@@ -1494,8 +1494,6 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
 .adf-hyperlink-widget {
   padding: 0.4375em 0;
   border-top: 0.84375em solid transparent; }
-  .adf-hyperlink-widget .focus {
-    color: #8bc34a; }
   .adf-hyperlink-widget a {
     color: #8bc34a; }
 
@@ -2002,23 +2000,22 @@ adf-people-list /deep/ adf-datatable /deep/ .people-pic {
 adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric.non-selectable.data-cell {
   padding: 10px; }
 
-.mdl-list__item {
-  cursor: pointer; }
-
 .adf-filters__entry {
-  cursor: pointer; }
+  cursor: pointer;
+  font-size: 14px !important;
+  font-weight: bold;
+  opacity: .54;
+  padding-left: 30px; }
+  .adf-filters__entry .mat-list-item-content {
+    height: 34px; }
 
 .adf-filters__entry-icon {
-  margin-right: 12px !important; }
+  padding-right: 12px !important;
+  padding-left: 0px !important; }
 
-.adf-filters__entry.active {
-  color: #8bc34a; }
-
-.adf-filters__entry:hover {
-  opacity: 0.8; }
-
-.adf-filters__entry.active .adf-filters__entry-icon {
-  color: #8bc34a; }
+.adf-filters__entry.active, .adf-filters__entry:hover {
+  color: #8bc34a;
+  opacity: 1; }
 
 .adf-controls {
   display: flex;
@@ -2049,7 +2046,10 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
   border-collapse: unset;
   border-spacing: 0;
   /* Empty folder */
-  /* Loading folder */ }
+  /* Loading folder */
+  /* [Accessibility] For screen reader only */
+  /* Utils */
+  /* mobile phone */ }
   .adf-data-table thead {
     padding-bottom: 3px; }
   .adf-data-table tbody tr {
@@ -2076,6 +2076,11 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       padding-left: 24px; }
     .adf-data-table td:last-of-type, .adf-data-table th:last-of-type {
       padding-right: 24px; }
+    .adf-data-table td:focus, .adf-data-table th:focus {
+      outline-offset: -1px;
+      outline-width: 1px;
+      outline-color: #448aff;
+      outline-style: solid; }
   .adf-data-table td {
     color: rgba(0, 0, 0, 0.87);
     position: relative;
@@ -2188,30 +2193,23 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       overflow: hidden;
       height: 0;
       display: block; }
-
-/* Utils */
-/* [Accessibility] For screen reader only */
-:host .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
-
-.hidden {
-  display: none; }
-
-/* mobile phone */
-@media all and (max-width: 768px) {
-  .desktop-only {
-    display: none; } }
-
-@media (max-device-width: 768px) {
-  .desktop-only {
-    display: none; } }
+  .adf-data-table .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0; }
+  .adf-data-table .hidden {
+    display: none; }
+  @media all and (max-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
+  @media (max-device-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
 
 .adf-upload__dragging > td {
   border-top: 1px dashed #448aff;
diff --git a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-indigo-pink.css b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-indigo-pink.css
index 82f8df0afc..8712190d24 100644
--- a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-indigo-pink.css
+++ b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-indigo-pink.css
@@ -1337,12 +1337,12 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
   display: flex;
   border-top: 1px solid rgba(0, 0, 0, 0.07);
   height: 48px;
-  line-height: 48px;
-  color: rgba(255, 255, 255, 0.87); }
+  line-height: 20px;
+  color: rgba(0, 0, 0, 0.87); }
   .adf-pagination__block {
     display: flex;
     align-items: center;
-    padding: 0 12px;
+    padding: 0 8px;
     border-right: 1px solid rgba(0, 0, 0, 0.07); }
     .adf-pagination__block:first-child {
       flex: 1 1 auto;
@@ -1494,8 +1494,6 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
 .adf-hyperlink-widget {
   padding: 0.4375em 0;
   border-top: 0.84375em solid transparent; }
-  .adf-hyperlink-widget .focus {
-    color: #3f51b5; }
   .adf-hyperlink-widget a {
     color: #3f51b5; }
 
@@ -2002,23 +2000,22 @@ adf-people-list /deep/ adf-datatable /deep/ .people-pic {
 adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric.non-selectable.data-cell {
   padding: 10px; }
 
-.mdl-list__item {
-  cursor: pointer; }
-
 .adf-filters__entry {
-  cursor: pointer; }
+  cursor: pointer;
+  font-size: 14px !important;
+  font-weight: bold;
+  opacity: .54;
+  padding-left: 30px; }
+  .adf-filters__entry .mat-list-item-content {
+    height: 34px; }
 
 .adf-filters__entry-icon {
-  margin-right: 12px !important; }
+  padding-right: 12px !important;
+  padding-left: 0px !important; }
 
-.adf-filters__entry.active {
-  color: #3f51b5; }
-
-.adf-filters__entry:hover {
-  opacity: 0.8; }
-
-.adf-filters__entry.active .adf-filters__entry-icon {
-  color: #3f51b5; }
+.adf-filters__entry.active, .adf-filters__entry:hover {
+  color: #3f51b5;
+  opacity: 1; }
 
 .adf-controls {
   display: flex;
@@ -2049,7 +2046,10 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
   border-collapse: unset;
   border-spacing: 0;
   /* Empty folder */
-  /* Loading folder */ }
+  /* Loading folder */
+  /* [Accessibility] For screen reader only */
+  /* Utils */
+  /* mobile phone */ }
   .adf-data-table thead {
     padding-bottom: 3px; }
   .adf-data-table tbody tr {
@@ -2076,6 +2076,11 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       padding-left: 24px; }
     .adf-data-table td:last-of-type, .adf-data-table th:last-of-type {
       padding-right: 24px; }
+    .adf-data-table td:focus, .adf-data-table th:focus {
+      outline-offset: -1px;
+      outline-width: 1px;
+      outline-color: #448aff;
+      outline-style: solid; }
   .adf-data-table td {
     color: rgba(0, 0, 0, 0.87);
     position: relative;
@@ -2108,7 +2113,7 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
     letter-spacing: 0;
     height: 56px;
     font-size: 12px;
-    color: rgba(255, 255, 255, 0.87);
+    color: rgba(0, 0, 0, 0.87);
     padding-bottom: 8px;
     box-sizing: border-box; }
     .adf-data-table th.sortable {
@@ -2188,30 +2193,23 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       overflow: hidden;
       height: 0;
       display: block; }
-
-/* Utils */
-/* [Accessibility] For screen reader only */
-:host .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
-
-.hidden {
-  display: none; }
-
-/* mobile phone */
-@media all and (max-width: 768px) {
-  .desktop-only {
-    display: none; } }
-
-@media (max-device-width: 768px) {
-  .desktop-only {
-    display: none; } }
+  .adf-data-table .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0; }
+  .adf-data-table .hidden {
+    display: none; }
+  @media all and (max-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
+  @media (max-device-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
 
 .adf-upload__dragging > td {
   border-top: 1px dashed #448aff;
diff --git a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-pink-bluegrey.css b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-pink-bluegrey.css
index d4cc1f40e3..88e4bc7a8f 100644
--- a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-pink-bluegrey.css
+++ b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-pink-bluegrey.css
@@ -1337,12 +1337,12 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
   display: flex;
   border-top: 1px solid rgba(255, 255, 255, 0.07);
   height: 48px;
-  line-height: 48px;
-  color: rgba(255, 255, 255, 0.87); }
+  line-height: 20px;
+  color: white; }
   .adf-pagination__block {
     display: flex;
     align-items: center;
-    padding: 0 12px;
+    padding: 0 8px;
     border-right: 1px solid rgba(255, 255, 255, 0.07); }
     .adf-pagination__block:first-child {
       flex: 1 1 auto;
@@ -1494,8 +1494,6 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
 .adf-hyperlink-widget {
   padding: 0.4375em 0;
   border-top: 0.84375em solid transparent; }
-  .adf-hyperlink-widget .focus {
-    color: #c2185b; }
   .adf-hyperlink-widget a {
     color: #c2185b; }
 
@@ -2002,23 +2000,22 @@ adf-people-list /deep/ adf-datatable /deep/ .people-pic {
 adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric.non-selectable.data-cell {
   padding: 10px; }
 
-.mdl-list__item {
-  cursor: pointer; }
-
 .adf-filters__entry {
-  cursor: pointer; }
+  cursor: pointer;
+  font-size: 14px !important;
+  font-weight: bold;
+  opacity: .54;
+  padding-left: 30px; }
+  .adf-filters__entry .mat-list-item-content {
+    height: 34px; }
 
 .adf-filters__entry-icon {
-  margin-right: 12px !important; }
+  padding-right: 12px !important;
+  padding-left: 0px !important; }
 
-.adf-filters__entry.active {
-  color: #c2185b; }
-
-.adf-filters__entry:hover {
-  opacity: 0.8; }
-
-.adf-filters__entry.active .adf-filters__entry-icon {
-  color: #c2185b; }
+.adf-filters__entry.active, .adf-filters__entry:hover {
+  color: #c2185b;
+  opacity: 1; }
 
 .adf-controls {
   display: flex;
@@ -2049,7 +2046,10 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
   border-collapse: unset;
   border-spacing: 0;
   /* Empty folder */
-  /* Loading folder */ }
+  /* Loading folder */
+  /* [Accessibility] For screen reader only */
+  /* Utils */
+  /* mobile phone */ }
   .adf-data-table thead {
     padding-bottom: 3px; }
   .adf-data-table tbody tr {
@@ -2076,6 +2076,11 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       padding-left: 24px; }
     .adf-data-table td:last-of-type, .adf-data-table th:last-of-type {
       padding-right: 24px; }
+    .adf-data-table td:focus, .adf-data-table th:focus {
+      outline-offset: -1px;
+      outline-width: 1px;
+      outline-color: #448aff;
+      outline-style: solid; }
   .adf-data-table td {
     color: white;
     position: relative;
@@ -2108,7 +2113,7 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
     letter-spacing: 0;
     height: 56px;
     font-size: 12px;
-    color: rgba(255, 255, 255, 0.87);
+    color: white;
     padding-bottom: 8px;
     box-sizing: border-box; }
     .adf-data-table th.sortable {
@@ -2188,30 +2193,23 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       overflow: hidden;
       height: 0;
       display: block; }
-
-/* Utils */
-/* [Accessibility] For screen reader only */
-:host .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
-
-.hidden {
-  display: none; }
-
-/* mobile phone */
-@media all and (max-width: 768px) {
-  .desktop-only {
-    display: none; } }
-
-@media (max-device-width: 768px) {
-  .desktop-only {
-    display: none; } }
+  .adf-data-table .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0; }
+  .adf-data-table .hidden {
+    display: none; }
+  @media all and (max-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
+  @media (max-device-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
 
 .adf-upload__dragging > td {
   border-top: 1px dashed #448aff;
diff --git a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-purple-green.css b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-purple-green.css
index 01bfbddc64..79dbca06e7 100644
--- a/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-purple-green.css
+++ b/ng2-components/ng2-alfresco-core/prebuilt-themes/adf-purple-green.css
@@ -1337,12 +1337,12 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
   display: flex;
   border-top: 1px solid rgba(255, 255, 255, 0.07);
   height: 48px;
-  line-height: 48px;
-  color: rgba(255, 255, 255, 0.87); }
+  line-height: 20px;
+  color: white; }
   .adf-pagination__block {
     display: flex;
     align-items: center;
-    padding: 0 12px;
+    padding: 0 8px;
     border-right: 1px solid rgba(255, 255, 255, 0.07); }
     .adf-pagination__block:first-child {
       flex: 1 1 auto;
@@ -1494,8 +1494,6 @@ input.mat-input-element:-webkit-autofill + .mat-input-placeholder .mat-placehold
 .adf-hyperlink-widget {
   padding: 0.4375em 0;
   border-top: 0.84375em solid transparent; }
-  .adf-hyperlink-widget .focus {
-    color: #7b1fa2; }
   .adf-hyperlink-widget a {
     color: #7b1fa2; }
 
@@ -2002,23 +2000,22 @@ adf-people-list /deep/ adf-datatable /deep/ .people-pic {
 adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric.non-selectable.data-cell {
   padding: 10px; }
 
-.mdl-list__item {
-  cursor: pointer; }
-
 .adf-filters__entry {
-  cursor: pointer; }
+  cursor: pointer;
+  font-size: 14px !important;
+  font-weight: bold;
+  opacity: .54;
+  padding-left: 30px; }
+  .adf-filters__entry .mat-list-item-content {
+    height: 34px; }
 
 .adf-filters__entry-icon {
-  margin-right: 12px !important; }
+  padding-right: 12px !important;
+  padding-left: 0px !important; }
 
-.adf-filters__entry.active {
-  color: #7b1fa2; }
-
-.adf-filters__entry:hover {
-  opacity: 0.8; }
-
-.adf-filters__entry.active .adf-filters__entry-icon {
-  color: #7b1fa2; }
+.adf-filters__entry.active, .adf-filters__entry:hover {
+  color: #7b1fa2;
+  opacity: 1; }
 
 .adf-controls {
   display: flex;
@@ -2049,7 +2046,10 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
   border-collapse: unset;
   border-spacing: 0;
   /* Empty folder */
-  /* Loading folder */ }
+  /* Loading folder */
+  /* [Accessibility] For screen reader only */
+  /* Utils */
+  /* mobile phone */ }
   .adf-data-table thead {
     padding-bottom: 3px; }
   .adf-data-table tbody tr {
@@ -2076,6 +2076,11 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       padding-left: 24px; }
     .adf-data-table td:last-of-type, .adf-data-table th:last-of-type {
       padding-right: 24px; }
+    .adf-data-table td:focus, .adf-data-table th:focus {
+      outline-offset: -1px;
+      outline-width: 1px;
+      outline-color: #448aff;
+      outline-style: solid; }
   .adf-data-table td {
     color: white;
     position: relative;
@@ -2108,7 +2113,7 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
     letter-spacing: 0;
     height: 56px;
     font-size: 12px;
-    color: rgba(255, 255, 255, 0.87);
+    color: white;
     padding-bottom: 8px;
     box-sizing: border-box; }
     .adf-data-table th.sortable {
@@ -2188,30 +2193,23 @@ adf-people-list /deep/ adf-datatable /deep/ td.mdl-data-table__cell--non-numeric
       overflow: hidden;
       height: 0;
       display: block; }
-
-/* Utils */
-/* [Accessibility] For screen reader only */
-:host .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0; }
-
-.hidden {
-  display: none; }
-
-/* mobile phone */
-@media all and (max-width: 768px) {
-  .desktop-only {
-    display: none; } }
-
-@media (max-device-width: 768px) {
-  .desktop-only {
-    display: none; } }
+  .adf-data-table .sr-only {
+    position: absolute;
+    width: 1px;
+    height: 1px;
+    padding: 0;
+    margin: -1px;
+    overflow: hidden;
+    clip: rect(0, 0, 0, 0);
+    border: 0; }
+  .adf-data-table .hidden {
+    display: none; }
+  @media all and (max-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
+  @media (max-device-width: 768px) {
+    .adf-data-table .desktop-only {
+      display: none; } }
 
 .adf-upload__dragging > td {
   border-top: 1px dashed #448aff;
diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss
index 35971ae5c8..4570fb4fec 100644
--- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss
+++ b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss
@@ -16,7 +16,7 @@
         &__block {
             display: flex;
             align-items: center;
-            padding: 0 12px;
+            padding: 0 8px;
             border-right: $adf-pagination--border;
 
             &:first-child {