diff --git a/src/playground/with-layout/accordion/accordion.module.ts b/src/playground/with-layout/accordion/accordion.module.ts
index 2cfbbc4400..dca6975e01 100644
--- a/src/playground/with-layout/accordion/accordion.module.ts
+++ b/src/playground/with-layout/accordion/accordion.module.ts
@@ -5,7 +5,7 @@
  */
 
 import { NgModule } from '@angular/core';
-import { NbAccordionModule, NbCardModule } from '@nebular/theme';
+import { NbAccordionModule, NbButtonModule, NbCardModule } from '@nebular/theme';
 import { AccordionRoutingModule } from './accordion-routing.module';
 import { AccordionMultiComponent } from './accordion-multi.component';
 import { AccordionShowcaseComponent } from './accordion-showcase.component';
@@ -19,6 +19,11 @@ import { AccordionToggleComponent } from './accordion-toggle.component';
     AccordionTestComponent,
     AccordionToggleComponent,
   ],
-  imports: [ NbAccordionModule, NbCardModule, AccordionRoutingModule ],
+  imports: [
+    NbAccordionModule,
+    NbCardModule,
+    NbButtonModule,
+    AccordionRoutingModule,
+  ],
 })
 export class AccordionModule {}
diff --git a/src/playground/with-layout/dialog/components/name-prompt-dialog.component.ts b/src/playground/with-layout/dialog/components/name-prompt-dialog.component.ts
index 852fb19306..8f43930df6 100644
--- a/src/playground/with-layout/dialog/components/name-prompt-dialog.component.ts
+++ b/src/playground/with-layout/dialog/components/name-prompt-dialog.component.ts
@@ -10,7 +10,7 @@ import { NbDialogRef } from '@nebular/theme';
         <input #name nbInput placeholder="Name">
       </nb-card-body>
       <nb-card-footer>
-        <button nbButton hero status="danget" (click)="cancel()">Cancel</button>
+        <button nbButton hero status="danger" (click)="cancel()">Cancel</button>
         <button nbButton hero status="success" (click)="submit(name.value)">Submit</button>
       </nb-card-footer>
     </nb-card>
diff --git a/src/playground/with-layout/dialog/dialog.module.ts b/src/playground/with-layout/dialog/dialog.module.ts
index 3bd61a3ff4..36a466fc98 100644
--- a/src/playground/with-layout/dialog/dialog.module.ts
+++ b/src/playground/with-layout/dialog/dialog.module.ts
@@ -6,7 +6,7 @@
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { NbCardModule, NbDialogModule } from '@nebular/theme';
+import { NbButtonModule, NbCardModule, NbDialogModule, NbInputModule } from '@nebular/theme';
 import { DialogRoutingModule } from './dialog-routing.module';
 import { DialogAutoFocusComponent } from './dialog-auto-focus.component';
 import { DialogBackdropClickComponent } from './dialog-backdrop-click.component';
@@ -45,6 +45,8 @@ import { ShowcaseDialogComponent } from './components/showcase-dialog.component'
   imports: [
     CommonModule,
     NbDialogModule.forRoot(),
+    NbButtonModule,
+    NbInputModule,
     NbCardModule,
     DialogRoutingModule,
   ],
diff --git a/src/playground/with-layout/overlay/overlay.module.ts b/src/playground/with-layout/overlay/overlay.module.ts
index 5a72b06d20..9ffb32d821 100644
--- a/src/playground/with-layout/overlay/overlay.module.ts
+++ b/src/playground/with-layout/overlay/overlay.module.ts
@@ -5,7 +5,7 @@
  */
 
 import { NgModule } from '@angular/core';
-import { NbCardModule } from '@nebular/theme';
+import { NbButtonModule, NbCardModule } from '@nebular/theme';
 import { OverlayRoutingModule } from './overlay-routing.module';
 import { OverlayShowcaseComponent } from './overlay-showcase.component';
 
@@ -15,6 +15,7 @@ import { OverlayShowcaseComponent } from './overlay-showcase.component';
   ],
   imports: [
     NbCardModule,
+    NbButtonModule,
     OverlayRoutingModule,
   ],
 })
diff --git a/src/playground/with-layout/popover/popover-modes.component.ts b/src/playground/with-layout/popover/popover-modes.component.ts
index bce3e9b225..db11f16085 100644
--- a/src/playground/with-layout/popover/popover-modes.component.ts
+++ b/src/playground/with-layout/popover/popover-modes.component.ts
@@ -15,6 +15,10 @@ import { Component } from '@angular/core';
       display: block;
       margin: 5rem;
     }
+
+    button {
+      margin: 0.5rem;
+    }
   `],
 })
 export class PopoverModesComponent {
diff --git a/src/playground/with-layout/spinner/spinner.module.ts b/src/playground/with-layout/spinner/spinner.module.ts
index ed3a968546..5b5764a2a2 100644
--- a/src/playground/with-layout/spinner/spinner.module.ts
+++ b/src/playground/with-layout/spinner/spinner.module.ts
@@ -5,7 +5,7 @@
  */
 
 import { NgModule } from '@angular/core';
-import { NbCardModule, NbSpinnerModule, NbTabsetModule } from '@nebular/theme';
+import { NbButtonModule, NbCardModule, NbSpinnerModule, NbTabsetModule } from '@nebular/theme';
 import { SpinnerRoutingModule } from './spinner-routing.module';
 import { SpinnerButtonComponent } from './spinner-button.component';
 import { SpinnerCardComponent } from './spinner-card.component';
@@ -25,6 +25,7 @@ import { SpinnerTabsComponent } from './spinner-tabs.component';
     NbSpinnerModule,
     NbCardModule,
     NbTabsetModule,
+    NbButtonModule,
     SpinnerRoutingModule,
   ],
 })
diff --git a/src/playground/with-layout/tabset/route-tabset-showcase.component.ts b/src/playground/with-layout/tabset/route-tabset-showcase.component.ts
index 935e1efcdb..ca9e464a60 100644
--- a/src/playground/with-layout/tabset/route-tabset-showcase.component.ts
+++ b/src/playground/with-layout/tabset/route-tabset-showcase.component.ts
@@ -25,13 +25,13 @@ export class RouteTabsetShowcaseComponent {
     },
     {
       title: 'Orders',
-      icon: 'notifications',
+      icon: 'paper-plane-outline',
       responsive: true,
       route: [ './tab2' ],
     },
     {
       title: 'Transaction',
-      icon: 'notifications',
+      icon: 'flash-outline',
       responsive: true,
       disabled: true,
     },
diff --git a/src/playground/with-layout/tooltip/tooltip.module.ts b/src/playground/with-layout/tooltip/tooltip.module.ts
index 70f4bd20af..008be5ebc9 100644
--- a/src/playground/with-layout/tooltip/tooltip.module.ts
+++ b/src/playground/with-layout/tooltip/tooltip.module.ts
@@ -5,7 +5,7 @@
  */
 
 import { NgModule } from '@angular/core';
-import { NbTooltipModule } from '@nebular/theme';
+import { NbButtonModule, NbTooltipModule } from '@nebular/theme';
 import { TooltipRoutingModule } from './tooltip-routing.module';
 import { TooltipColorsComponent } from './tooltip-colors.component';
 import { TooltipPlacementsComponent } from './tooltip-placements.component';
@@ -19,6 +19,6 @@ import { TooltipWithIconComponent } from './tooltip-with-icon.component';
     TooltipShowcaseComponent,
     TooltipWithIconComponent,
   ],
-  imports: [ NbTooltipModule, TooltipRoutingModule ],
+  imports: [ NbButtonModule, NbTooltipModule, TooltipRoutingModule ],
 })
 export class TooltipModule {}
diff --git a/src/playground/without-layout/sidebar/sidebar.module.ts b/src/playground/without-layout/sidebar/sidebar.module.ts
index 0a4135fa76..6fba2888c0 100644
--- a/src/playground/without-layout/sidebar/sidebar.module.ts
+++ b/src/playground/without-layout/sidebar/sidebar.module.ts
@@ -5,7 +5,7 @@
  */
 
 import { NgModule } from '@angular/core';
-import { NbLayoutModule, NbSidebarModule } from '@nebular/theme';
+import { NbButtonModule, NbLayoutModule, NbSidebarModule } from '@nebular/theme';
 import { SidebarRoutingModule } from './sidebar-routing.module';
 import { SidebarCompactedComponent } from './sidebar-compacted.component';
 import { SidebarFixedComponent } from './sidebar-fixed.component';
@@ -32,6 +32,7 @@ import { SidebarTwoTestComponent } from './sidebar-two-test.component';
   imports: [
     NbSidebarModule.forRoot(),
     NbLayoutModule,
+    NbButtonModule,
     SidebarRoutingModule,
   ],
 })