diff --git a/src/lib/buttons/buttons.module.ts b/src/lib/buttons/buttons.module.ts
deleted file mode 100644
index 3ab1d6f..0000000
--- a/src/lib/buttons/buttons.module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { TranslateModule } from '@ngx-translate/core';
-import { ChevronButtonComponent } from './chevron-button/chevron-button.component';
-import { CircleButtonComponent } from './circle-button/circle-button.component';
-import { IconButtonComponent } from './icon-button/icon-button.component';
-import { IqserIconsModule } from '../icons';
-
-const matModules = [MatButtonModule, MatTooltipModule];
-const deleteThisWhenAllComponentsAreStandalone = [CircleButtonComponent, IconButtonComponent, ChevronButtonComponent];
-
-@NgModule({
-    imports: [CommonModule, IqserIconsModule, TranslateModule, ...deleteThisWhenAllComponentsAreStandalone, ...matModules],
-    exports: [...deleteThisWhenAllComponentsAreStandalone],
-})
-export class IqserButtonsModule {}
diff --git a/src/lib/buttons/index.ts b/src/lib/buttons/index.ts
index 3bdc3e4..30ba65f 100644
--- a/src/lib/buttons/index.ts
+++ b/src/lib/buttons/index.ts
@@ -1,5 +1,3 @@
-export * from './buttons.module';
-
 export * from './types/icon-button.type';
 export * from './types/circle-button.type';
 
diff --git a/src/lib/common-ui.module.ts b/src/lib/common-ui.module.ts
index e247f31..ff49106 100644
--- a/src/lib/common-ui.module.ts
+++ b/src/lib/common-ui.module.ts
@@ -11,7 +11,6 @@ import { IqserListingModule } from './listing';
 import { IqserFiltersModule } from './filtering';
 import { IqserInputsModule } from './inputs';
 import { IqserIconsModule } from './icons';
-import { IqserButtonsModule } from './buttons';
 import { IqserScrollbarModule } from './scrollbar';
 import { IqserEmptyStatesModule } from './empty-states';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -24,6 +23,7 @@ import { ApiPathInterceptor, DefaultUserPreferenceService, IqserConfigService, I
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import { IqserSkeletonModule } from './skeleton/skeleton.module';
 import { MatDialogModule } from '@angular/material/dialog';
+import { CircleButtonComponent, IconButtonComponent } from './buttons';
 
 const matModules = [
     MatIconModule,
@@ -36,7 +36,6 @@ const matModules = [
 ];
 const modules = [
     IqserIconsModule,
-    IqserButtonsModule,
     IqserListingModule,
     IqserFiltersModule,
     IqserInputsModule,
@@ -51,7 +50,16 @@ const pipes = [SortByPipe];
 
 @NgModule({
     declarations: [...components, ...pipes],
-    imports: [CommonModule, ...matModules, ...modules, FormsModule, ReactiveFormsModule, TranslateModule],
+    imports: [
+        CommonModule,
+        ...matModules,
+        ...modules,
+        FormsModule,
+        ReactiveFormsModule,
+        TranslateModule,
+        IconButtonComponent,
+        CircleButtonComponent,
+    ],
     exports: [...components, ...pipes, ...modules],
     providers: [
         {