diff --git a/src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.html b/src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.html
index 0996f840..4c2447d7 100644
--- a/src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.html
+++ b/src/app/pages/extra-components/spinner/spinner-color/spinner-color.component.html
@@ -1,22 +1,4 @@
-<nb-card [nbSpinner]="true" nbSpinnerStatus="active">
-  <nb-card-body>
-    Some card content.
-  </nb-card-body>
-</nb-card>
-
-<nb-card [nbSpinner]="true" nbSpinnerStatus="disabled">
-  <nb-card-body>
-    Some card content.
-  </nb-card-body>
-</nb-card>
-
-<nb-card [nbSpinner]="true" nbSpinnerStatus="warning">
-  <nb-card-body>
-    Some card content.
-  </nb-card-body>
-</nb-card>
-
-<nb-card [nbSpinner]="true" nbSpinnerStatus="danger">
+<nb-card [nbSpinner]="true" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
@@ -34,7 +16,13 @@
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerStatus="primary">
+<nb-card [nbSpinner]="true" nbSpinnerStatus="warning">
+  <nb-card-body>
+    Some card content.
+  </nb-card-body>
+</nb-card>
+
+<nb-card [nbSpinner]="true" nbSpinnerStatus="danger">
   <nb-card-body>
     Some card content.
   </nb-card-body>
diff --git a/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
index 58d137ce..bc2ff55c 100644
--- a/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
+++ b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.html
@@ -30,7 +30,7 @@
         </button>
 
         <button nbButton status="primary" size="medium" (click)="toggleLoadingMediumGroupAnimation()"
-                [nbSpinner]="loadingMediumGroup" nbSpinnerStatus="primary" nbSpinnerSize="xsmall" nbSpinnerMessage="">
+                [nbSpinner]="loadingMediumGroup" nbSpinnerStatus="primary" nbSpinnerSize="tiny" nbSpinnerMessage="">
           Download
         </button>
       </div>
diff --git a/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.scss b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
index f43d9b81..a3c1c461 100644
--- a/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
+++ b/src/app/pages/extra-components/spinner/spinner-in-buttons/spinner-in-buttons.component.scss
@@ -4,9 +4,9 @@
   button {
     margin: 1rem;
   }
-  
+
   .size-medium-group {
     margin-top: 2rem;
-    border-top: 1px solid nb-theme(separator);
+    border-top: 1px solid nb-theme(divider-color);
   }
 }
diff --git a/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.html b/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.html
index bb9a73c7..6816e6ce 100644
--- a/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.html
+++ b/src/app/pages/extra-components/spinner/spinner-in-tabs/spinner-in-tabs.component.html
@@ -1,14 +1,14 @@
 <nb-card size="xsmall">
   <nb-card-body>
     <nb-tabset fullWidth (changeTab)="toggleLoadingAnimation()">
-      <nb-tab tabTitle="Tab 1" [nbSpinner]="loading" nbSpinnerStatus="success" nbSpinnerSize="xxlarge">
+      <nb-tab tabTitle="Tab 1" [nbSpinner]="loading" nbSpinnerStatus="success" nbSpinnerSize="giant">
         <p>
           A nebula is an interstellar cloud of dust, hydrogen, helium and other ionized gases.
           Originally, nebula was a name for any diffuse astronomical object.
         </p>
       </nb-tab>
 
-      <nb-tab tabTitle="Tab 2" [nbSpinner]="loading" nbSpinnerStatus="info" nbSpinnerSize="xxlarge">
+      <nb-tab tabTitle="Tab 2" [nbSpinner]="loading" nbSpinnerStatus="info" nbSpinnerSize="giant">
         <p>
           Nebular's primary goal is to assemble together and connect the most awesome features and libraries
           creating an efficient ecosystem to speed up and simplify the development.
diff --git a/src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.html b/src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.html
index ad2099fc..2269b444 100644
--- a/src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.html
+++ b/src/app/pages/extra-components/spinner/spinner-sizes/spinner-sizes.component.html
@@ -1,40 +1,28 @@
-<nb-card [nbSpinner]="true" nbSpinnerSize="xxsmall">
+<nb-card [nbSpinner]="true" nbSpinnerSize="tiny" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerSize="xsmall">
+<nb-card [nbSpinner]="true" nbSpinnerSize="small" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerSize="small">
+<nb-card [nbSpinner]="true" nbSpinnerSize="medium" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerSize="medium">
+<nb-card [nbSpinner]="true" nbSpinnerSize="large" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>
 </nb-card>
 
-<nb-card [nbSpinner]="true" nbSpinnerSize="large">
-  <nb-card-body>
-    Some card content.
-  </nb-card-body>
-</nb-card>
-
-<nb-card [nbSpinner]="true" nbSpinnerSize="xlarge">
-  <nb-card-body>
-    Some card content.
-  </nb-card-body>
-</nb-card>
-
-<nb-card [nbSpinner]="true" nbSpinnerSize="xxlarge">
+<nb-card [nbSpinner]="true" nbSpinnerSize="giant" nbSpinnerStatus="primary">
   <nb-card-body>
     Some card content.
   </nb-card-body>