diff --git a/package-lock.json b/package-lock.json
index 3dff40747..62e723c8f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,11 +5,11 @@
   "requires": true,
   "dependencies": {
     "@alfresco/adf-content-services": {
-      "version": "2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e.tgz",
-      "integrity": "sha512-v43EdXIwX+pzYWH4lpw3Ed2tNzktS4vO+6cusFkNQMAbO1gQdti8GHevBm5IURPixvRly5sHnMvHrfPv3HNv9w==",
+      "version": "2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66.tgz",
+      "integrity": "sha512-7tiXcRoQM3q7XAtHFYal8ZR0v/mNQ6yCD/Brw6J21vkSEro4PSIKtpyUPCdh9uqxPOzshkXQ/PsdYJiLh01EdA==",
       "requires": {
-        "@alfresco/adf-core": "2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e",
+        "@alfresco/adf-core": "2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66",
         "@angular/animations": "5.1.1",
         "@angular/cdk": "5.0.1",
         "@angular/common": "5.1.1",
@@ -61,9 +61,9 @@
       }
     },
     "@alfresco/adf-core": {
-      "version": "2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e.tgz",
-      "integrity": "sha512-Cz562GbqIMx0IDxXyVGLYKRg6AX6B9XcDV5diuCoJbFHugxgJkYWevl4Rqp4lL/tJ+zi5Q8MqPi0ZlHDvtxybg==",
+      "version": "2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66.tgz",
+      "integrity": "sha512-/38VJQX1d+C+fWyyVJIQb/M72nnDeVRbTeLfwc71+9ifdYegtYxHb97A5lQW0kVKD5lfbmub/SiUfdA6X4i1Kw==",
       "requires": {
         "@angular/animations": "5.1.1",
         "@angular/cdk": "5.0.1",
@@ -225,13 +225,13 @@
         "common-tags": "1.7.2",
         "copy-webpack-plugin": "4.4.1",
         "core-object": "3.1.5",
-        "css-loader": "0.28.9",
+        "css-loader": "0.28.10",
         "cssnano": "3.10.0",
         "denodeify": "1.2.1",
         "ember-cli-string-utils": "1.1.0",
         "exports-loader": "0.6.4",
         "extract-text-webpack-plugin": "3.0.2",
-        "file-loader": "1.1.8",
+        "file-loader": "1.1.9",
         "fs-extra": "4.0.3",
         "glob": "7.1.2",
         "html-webpack-plugin": "2.30.1",
@@ -268,7 +268,7 @@
         "webpack": "3.10.0",
         "webpack-dev-middleware": "1.12.2",
         "webpack-dev-server": "2.11.1",
-        "webpack-merge": "4.1.1",
+        "webpack-merge": "4.1.2",
         "webpack-sources": "1.1.0",
         "webpack-subresource-integrity": "1.0.4"
       },
@@ -1663,7 +1663,7 @@
       "dev": true,
       "requires": {
         "caniuse-lite": "1.0.30000810",
-        "electron-to-chromium": "1.3.33"
+        "electron-to-chromium": "1.3.34"
       }
     },
     "buffer": {
@@ -1832,7 +1832,7 @@
           "dev": true,
           "requires": {
             "caniuse-db": "1.0.30000810",
-            "electron-to-chromium": "1.3.33"
+            "electron-to-chromium": "1.3.34"
           }
         }
       }
@@ -7075,9 +7075,9 @@
       "dev": true
     },
     "css-loader": {
-      "version": "0.28.9",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.9.tgz",
-      "integrity": "sha512-r3dgelMm/mkPz5Y7m9SeiGE46i2VsEU/OYbez+1llfxtv8b2y5/b5StaeEvPK3S5tlNQI+tDW/xDIhKJoZgDtw==",
+      "version": "0.28.10",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.10.tgz",
+      "integrity": "sha512-X1IJteKnW9Llmrd+lJ0f7QZHh9Arf+11S7iRcoT2+riig3BK0QaCaOtubAulMK6Itbo08W6d3l8sW21r+Jhp5Q==",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
@@ -7269,7 +7269,7 @@
           "dev": true,
           "requires": {
             "caniuse-db": "1.0.30000810",
-            "electron-to-chromium": "1.3.33"
+            "electron-to-chromium": "1.3.34"
           }
         },
         "chalk": {
@@ -7800,9 +7800,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.33",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz",
-      "integrity": "sha1-vwBwPWKnxlI4E2V4w1LWxcBCpUU=",
+      "version": "1.3.34",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.34.tgz",
+      "integrity": "sha1-2TSY9AORuwwWpgPYJBuZUUBBV+0=",
       "dev": true
     },
     "elliptic": {
@@ -8472,9 +8472,9 @@
       }
     },
     "file-loader": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.8.tgz",
-      "integrity": "sha512-gVsHTw9n5Sp6U5vm5MmwMyKx4uOnlmDMwtWhXMdUmQJ7w3FgGaIjqPF2k4c8KZYhRd0Ltlt6mofRTv/NfqCLuA==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.9.tgz",
+      "integrity": "sha512-6ql03hOSoJHBkTB+3De/f7NJse+JXkUwvAf3y4Q5rIcTD0kqJiE3btvLnDcZT+P4t1QYLb9dJ9EI4auzfo3wFA==",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
@@ -8742,7 +8742,7 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "nan": "2.8.0",
+        "nan": "2.9.2",
         "node-pre-gyp": "0.6.39"
       },
       "dependencies": {
@@ -10230,7 +10230,7 @@
         "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.3.11"
+        "uglify-js": "3.3.12"
       }
     },
     "html-webpack-plugin": {
@@ -12447,9 +12447,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.9.2.tgz",
+      "integrity": "sha512-ltW65co7f3PQWBDbqVvaU1WtFJUsNW7sWWm4HINhbMQIyVyzIeyZ8toX5TC5eeooE6piZoaEh4cZkueSKG3KYw==",
       "dev": true,
       "optional": true
     },
@@ -12656,7 +12656,7 @@
         "lodash.mergewith": "4.6.1",
         "meow": "3.7.0",
         "mkdirp": "0.5.1",
-        "nan": "2.8.0",
+        "nan": "2.9.2",
         "node-gyp": "3.6.2",
         "npmlog": "4.1.2",
         "request": "2.79.0",
@@ -14462,7 +14462,7 @@
           "dev": true,
           "requires": {
             "caniuse-db": "1.0.30000810",
-            "electron-to-chromium": "1.3.33"
+            "electron-to-chromium": "1.3.34"
           }
         },
         "chalk": {
@@ -18048,7 +18048,7 @@
         "resolve": "1.5.0",
         "semver": "5.5.0",
         "tslib": "1.9.0",
-        "tsutils": "2.21.1"
+        "tsutils": "2.21.2"
       },
       "dependencies": {
         "chalk": {
@@ -18087,9 +18087,9 @@
       "optional": true
     },
     "tsutils": {
-      "version": "2.21.1",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.21.1.tgz",
-      "integrity": "sha512-heMkdeQ9iUc90ynfiNo5Y+GXrEEGy86KMvnSTfHO+Q40AuNQ1lZGXcv58fuU9XTUxI0V7YIN9xPN+CO9b1Gn3w==",
+      "version": "2.21.2",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.21.2.tgz",
+      "integrity": "sha512-iaIuyjIUeFLdD39MYdzqBuY7Zv6+uGxSwRH4mf+HuzsnznjFz0R2tGrAe0/JvtNh91WrN8UN/DZRFTZNDuVekA==",
       "dev": true,
       "requires": {
         "tslib": "1.9.0"
@@ -18149,9 +18149,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.11.tgz",
-      "integrity": "sha512-AKLsYcdV+sS5eAE4NtVXF6f2u/DCQynQm0jTGxF261+Vltu1dYNuHzjqDmk11gInj+H/zJIM2EAwXG3MzPb3VA==",
+      "version": "3.3.12",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.12.tgz",
+      "integrity": "sha512-4jxrTXlV0HaXTsNILfXW0eey7Qo8qHYM6ih5ZNh45erDWU2GHmKDmekwBTskDb12h+kdd2DBvdzqVb47YzNmTA==",
       "dev": true,
       "requires": {
         "commander": "2.14.1",
@@ -19508,9 +19508,9 @@
       }
     },
     "webpack-merge": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.1.tgz",
-      "integrity": "sha512-geQsZ86YkXOVOjvPC5yv3JSNnL6/X3Kzh935AQ/gJNEYXEfJDQFu/sdFuktS9OW2JcH/SJec8TGfRdrpHshH7A==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz",
+      "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==",
       "dev": true,
       "requires": {
         "lodash": "4.17.5"
diff --git a/package.json b/package.json
index c519bd575..1f0c480e1 100644
--- a/package.json
+++ b/package.json
@@ -16,8 +16,8 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e",
-    "@alfresco/adf-core": "2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e",
+    "@alfresco/adf-content-services": "2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66",
+    "@alfresco/adf-core": "2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66",
     "@angular/animations": "5.1.1",
     "@angular/cdk": "5.0.1",
     "@angular/common": "5.1.1",
diff --git a/src/app/ui/overrides/_alfresco-document-list.scss b/src/app/ui/overrides/_alfresco-document-list.scss
index 07d6fe29e..7b9042a8c 100644
--- a/src/app/ui/overrides/_alfresco-document-list.scss
+++ b/src/app/ui/overrides/_alfresco-document-list.scss
@@ -22,6 +22,10 @@ adf-document-list {
         }
     }
 
+    .adf-datatable-table-cell-header:focus {
+        outline: none !important;
+    }
+
     .adf-datatable-body .adf-datatable-row {
         &:hover, &:focus {
             background-color: $alfresco-app-color--hue-1;
@@ -37,15 +41,6 @@ adf-document-list {
         text-align: left;
     }
 
-    .adf-data-table__header--sorted-asc,
-    .adf-data-table__header--sorted-desc {
-        &:hover {
-            &:before {
-                color: inherit !important;
-            }
-        }
-    }
-
     .app-location-link,
     .adf-location-cell {
         a {
diff --git a/yarn.lock b/yarn.lock
index 25fe4f4fc..afb2b317a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,11 +2,11 @@
 # yarn lockfile v1
 
 
-"@alfresco/adf-content-services@2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e":
-  version "2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e"
-  resolved "https://registry.yarnpkg.com/@alfresco/adf-content-services/-/adf-content-services-2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e.tgz#18619e3d1b4552c9229fc36c7e467ef004c71d0c"
+"@alfresco/adf-content-services@2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66":
+  version "2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66"
+  resolved "https://registry.yarnpkg.com/@alfresco/adf-content-services/-/adf-content-services-2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66.tgz#df3f2c96d50993fb1b001e8579ff152949ff248e"
   dependencies:
-    "@alfresco/adf-core" "2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e"
+    "@alfresco/adf-core" "2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66"
     "@angular/animations" "5.1.1"
     "@angular/cdk" "5.0.1"
     "@angular/common" "5.1.1"
@@ -36,9 +36,9 @@
     tslib "^1.7.1"
     zone.js "0.8.14"
 
-"@alfresco/adf-core@2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e":
-  version "2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e"
-  resolved "https://registry.yarnpkg.com/@alfresco/adf-core/-/adf-core-2.2.0-ec3b208b846713143f0ce2786ace108bd37a752e.tgz#6beed6b05d485d50b25e92ad477a263ec747a464"
+"@alfresco/adf-core@2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66":
+  version "2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66"
+  resolved "https://registry.yarnpkg.com/@alfresco/adf-core/-/adf-core-2.2.0-ad3dbd4d0b52ff814b90dc5e13136e2ae893fe66.tgz#580f75587cf103c784507ee84e28a17072184f6f"
   dependencies:
     "@angular/animations" "5.1.1"
     "@angular/cdk" "5.0.1"
@@ -1789,8 +1789,8 @@ css-color-names@0.0.4:
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
 css-loader@^0.28.1:
-  version "0.28.9"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.9.tgz#68064b85f4e271d7ce4c48a58300928e535d1c95"
+  version "0.28.10"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.10.tgz#40282e79230f7bcb4e483efa631d670b735ebf42"
   dependencies:
     babel-code-frame "^6.26.0"
     css-selector-tokenizer "^0.7.0"
@@ -2231,8 +2231,8 @@ ejs@^2.5.7:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
-  version "1.3.33"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz#bf00703d62a7c65238136578c352d6c5c042a545"
+  version "1.3.34"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.34.tgz#d93498f40391bb0c16a603d8241b9951404157ed"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -2679,8 +2679,8 @@ faye-websocket@~0.11.0:
     websocket-driver ">=0.5.1"
 
 file-loader@^1.1.5:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.8.tgz#a62592ed732667d7482dc3268c381c7f0c913086"
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.9.tgz#cf152aedbcfb3d67038d0845efb7cf11a96e53de"
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^0.4.5"
@@ -4351,7 +4351,7 @@ lodash@^3.10.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.5.0, lodash@~4.17.4:
+lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.5.0, lodash@~4.17.4:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
@@ -4719,8 +4719,8 @@ multicast-dns@^6.0.1:
     thunky "^1.0.2"
 
 nan@^2.3.0, nan@^2.3.2:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
 
 nanomatch@^1.2.9:
   version "1.2.9"
@@ -7300,8 +7300,8 @@ tsscmp@~1.0.0:
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.5.tgz#7dc4a33af71581ab4337da91d85ca5427ebd9a97"
 
 tsutils@^2.12.1:
-  version "2.21.1"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.21.1.tgz#5b23c263233300ed7442b4217855cbc7547c296a"
+  version "2.21.2"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.21.2.tgz#902aa5987e1440c47673543d96752df8d44ab9c7"
   dependencies:
     tslib "^1.8.1"
 
@@ -7360,8 +7360,8 @@ uglify-es@^3.3.4:
     source-map "~0.6.1"
 
 uglify-js@3.3.x:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.11.tgz#e9d058b20715138bb4e8e5cae2ea581686bdaae3"
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.12.tgz#efd87c16a1f4c674a8a5ede571001ef634dcc883"
   dependencies:
     commander "~2.14.1"
     source-map "~0.6.1"
@@ -7695,10 +7695,10 @@ webpack-dev-server@~2.11.0:
     yargs "6.6.0"
 
 webpack-merge@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.1.tgz#f1197a0a973e69c6fbeeb6d658219aa8c0c13555"
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.2.tgz#5d372dddd3e1e5f8874f5bf5a8e929db09feb216"
   dependencies:
-    lodash "^4.17.4"
+    lodash "^4.17.5"
 
 webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0:
   version "1.1.0"