diff --git a/libs/mix-ui/src/button/button.component.html b/libs/mix-ui/src/button/button.component.html
index ec834606..e5d5aaf2 100644
--- a/libs/mix-ui/src/button/button.component.html
+++ b/libs/mix-ui/src/button/button.component.html
@@ -1,36 +1,31 @@
-<!-- <button *ngIf="!iconBtn"
-        class="mix-button"
-        type="button"
-        [appearance]="typeMaps[type]"
-        [disabled]="loading || disabled"
-        [showLoader]="loading"
-        [size]="size"
-        [type]="nativeType"
-        tuiButton>
-  <ng-container *ngTemplateOutlet="content"> </ng-container>
-</button>
-
-<ng-container *ngIf="iconBtn">
-  <button class="mix-button"
-          [appearance]="typeMaps[type]"
-          [disabled]="loading || disabled"
-          [showLoader]="loading"
-          [size]="size"
-          [type]="nativeType"
-          tuiIconButton>
-    <ng-container *ngTemplateOutlet="content"> </ng-container>
-  </button>
-</ng-container>
-
-<ng-template #content>
-  <ng-content></ng-content>
-</ng-template> -->
-
-
-<button class="btn {{typeMaps[type]}} w-full flex items-center gap-2"
+<button class="btn {{typeMaps[type]}} w-full flex items-center gap-1"
         [class.--disabled]="loading || disabled"
         [class.--icon-btn]="isIcon"
         [type]="nativeType">
+  <svg *ngIf="loading"
+       class="inline mr-1 dot w-4 h-4 animate-spin"
+       role="status"
+       aria-hidden="true"
+       viewBox="0 0 100 101"
+       fill="none"
+       xmlns="http://www.w3.org/2000/svg">
+    <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+          fill="#E5E7EB"></path>
+    <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+          fill="currentColor"></path>
+  </svg>
+  <!-- <svg class="inline w-4 h-4 text-white animate-spin"
+       role="status"
+       aria-hidden="true"
+       viewBox="0 0 100 101"
+       fill="none"
+       xmlns="http://www.w3.org/2000/svg">
+    <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+          fill="#E5E7EB"></path>
+    <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+          fill="currentColor"></path>
+  </svg> -->
+
   <ng-container *ngTemplateOutlet="content"> </ng-container>
 </button>
 
diff --git a/libs/mix-ui/src/button/button.component.scss b/libs/mix-ui/src/button/button.component.scss
index 18cce3fe..b67f18c4 100644
--- a/libs/mix-ui/src/button/button.component.scss
+++ b/libs/mix-ui/src/button/button.component.scss
@@ -12,7 +12,7 @@ mix-button {
     @apply text-sm;
     @apply px-3.5 py-2;
     @apply text-center whitespace-nowrap;
-    @apply inline-flex justify-center items-center space-x-2;
+    @apply inline-flex justify-center items-center;
     @apply hover:brightness-[1.15];
     @apply transition-all;
     @apply focus:outline-none;
@@ -26,14 +26,26 @@ mix-button {
 
   .btn.primary {
     @apply text-white bg-primary focus:outline-none focus:ring-primary;
+
+    .dot {
+      @apply text-white;
+    }
   }
 
   .btn.secondary {
     @apply text-gray-900 focus:outline-none bg-white border border-gray-200 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700;
+
+    .dot {
+      @apply text-gray-900;
+    }
   }
 
   .btn.danger {
     @apply text-white bg-red-700 hover:bg-red-800 focus:ring-4 focus:ring-red-300;
+
+    .dot {
+      @apply text-white;
+    }
   }
 
   .btn {