diff --git a/aio/angular.json b/aio/angular.json
index 73e923a1c3..2afa8f3df7 100644
--- a/aio/angular.json
+++ b/aio/angular.json
@@ -172,7 +172,17 @@
               "src/google385281288605d160.html"
             ],
             "styles": [
-              "src/styles/main.scss"
+              "src/styles/main.scss",
+              {
+                "inject": false,
+                "input": "src/styles/custom-themes/dark-theme.scss",
+                "bundleName": "dark-theme"
+              },
+              {
+                "inject": false,
+                "input": "src/styles/custom-themes/light-theme.scss",
+                "bundleName": "light-theme"
+              }
             ],
             "scripts": []
           }
diff --git a/aio/src/app/shared/theme-picker/theme-toggle.component.spec.ts b/aio/src/app/shared/theme-picker/theme-toggle.component.spec.ts
index 0dab1fc06c..9a63fa20a8 100644
--- a/aio/src/app/shared/theme-picker/theme-toggle.component.spec.ts
+++ b/aio/src/app/shared/theme-picker/theme-toggle.component.spec.ts
@@ -1,4 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MatIconModule } from '@angular/material/icon';
 import { By } from '@angular/platform-browser';
 import { ThemeStorage, ThemeToggleComponent } from './theme-toggle.component';
 
@@ -45,7 +46,7 @@ describe('ThemeToggleComponent', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       declarations: [ ThemeToggleComponent ],
-      providers: [ { provide: ThemeStorage, useClass: FakeThemeStorage } ],
+      imports: [ MatIconModule ],
     });
 
     fixture = TestBed.createComponent(ThemeToggleComponent);