diff --git a/aio/package.json b/aio/package.json
index 8bdc23acbb..01a1fe892a 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -71,14 +71,14 @@
   "private": true,
   "dependencies": {
     "@angular/animations": "^6.0.0-rc.3",
-    "@angular/cdk": "^5.2.4",
+    "@angular/cdk": "^6.0.0-rc.1",
     "@angular/common": "^6.0.0-rc.3",
     "@angular/compiler": "^6.0.0-rc.3",
     "@angular/core": "^6.0.0-rc.3",
     "@angular/elements": "^6.0.0-rc.3",
     "@angular/forms": "^6.0.0-rc.3",
     "@angular/http": "^6.0.0-rc.3",
-    "@angular/material": "^5.2.4",
+    "@angular/material": "^6.0.0-rc.1",
     "@angular/platform-browser": "^6.0.0-rc.3",
     "@angular/platform-browser-dynamic": "^6.0.0-rc.3",
     "@angular/platform-server": "^6.0.0-rc.3",
diff --git a/aio/scripts/_payload-limits.json b/aio/scripts/_payload-limits.json
index cbb2403e6e..e20484d13d 100755
--- a/aio/scripts/_payload-limits.json
+++ b/aio/scripts/_payload-limits.json
@@ -3,7 +3,7 @@
     "master": {
       "uncompressed": {
         "runtime": 2689,
-        "main": 562050,
+        "main": 474347,
         "polyfills": 38587,
         "prettify": 14886
       }
diff --git a/aio/src/app/shared/custom-icon-registry.ts b/aio/src/app/shared/custom-icon-registry.ts
index 3448aa7639..c3b6fa1e53 100644
--- a/aio/src/app/shared/custom-icon-registry.ts
+++ b/aio/src/app/shared/custom-icon-registry.ts
@@ -1,4 +1,5 @@
-import { InjectionToken, Inject, Injectable } from '@angular/core';
+import { InjectionToken, Inject, Injectable, Optional } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
 import { of } from 'rxjs';
 import { MatIconRegistry } from '@angular/material/icon';
 import { HttpClient } from '@angular/common/http';
@@ -35,8 +36,8 @@ interface SvgIconMap {
 export class CustomIconRegistry extends MatIconRegistry {
   private preloadedSvgElements: SvgIconMap = {};
 
-  constructor(http: HttpClient, sanitizer: DomSanitizer, @Inject(SVG_ICONS) svgIcons: SvgIconInfo[]) {
-    super(http, sanitizer);
+  constructor(http: HttpClient, sanitizer: DomSanitizer, @Optional() @Inject(DOCUMENT) document, @Inject(SVG_ICONS) svgIcons: SvgIconInfo[]) {
+    super(http, sanitizer, document);
     this.loadSvgElements(svgIcons);
   }
 
diff --git a/aio/yarn.lock b/aio/yarn.lock
index 6c8645df40..912b0641a8 100644
--- a/aio/yarn.lock
+++ b/aio/yarn.lock
@@ -98,9 +98,9 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^5.2.4":
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-5.2.4.tgz#c0a429a8710d8fedb157f546e21cb49d4335f7f7"
+"@angular/cdk@^6.0.0-rc.1":
+  version "6.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-6.0.0-rc.1.tgz#f0b71280f6ef6d069722f94fecd51649684a7cfb"
   dependencies:
     tslib "^1.7.1"
 
@@ -171,9 +171,9 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/material@^5.2.4":
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-5.2.4.tgz#9e823798324283d23ea839156fac5bcb73443d55"
+"@angular/material@^6.0.0-rc.1":
+  version "6.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-6.0.0-rc.1.tgz#4f5d76aa6c1d34907027d0d410669f92490eef09"
   dependencies:
     tslib "^1.7.1"