diff --git a/lib/src/widgets/raw_editor/raw_editor_actions.dart b/lib/src/widgets/raw_editor/raw_editor_actions.dart
index caed0f7ce..40580d70e 100644
--- a/lib/src/widgets/raw_editor/raw_editor_actions.dart
+++ b/lib/src/widgets/raw_editor/raw_editor_actions.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 import '../../models/documents/attribute.dart';
 import '../editor/editor.dart';
-import '../toolbar/buttons/link_style2.dart';
+import '../toolbar/buttons/link_style2_button.dart';
 import '../toolbar/buttons/search/search_dialog.dart';
 import 'raw_editor_state.dart';
 import 'raw_editor_text_boundaries.dart';
diff --git a/lib/src/widgets/toolbar/base_toolbar.dart b/lib/src/widgets/toolbar/base_toolbar.dart
index 5767f0f2f..ba629f2c0 100644
--- a/lib/src/widgets/toolbar/base_toolbar.dart
+++ b/lib/src/widgets/toolbar/base_toolbar.dart
@@ -4,25 +4,25 @@ import '../../../flutter_quill.dart'
     show QuillBaseToolbarProvider, defaultToolbarSize;
 import '../../l10n/widgets/localizations.dart';
 import '../../models/config/toolbar/base_toolbar_configurations.dart';
-import 'buttons/arrow_indicated_list.dart';
+import 'buttons/arrow_indicated_list_button.dart';
 
 export '../../models/config/toolbar/buttons/base.dart';
 export '../../models/config/toolbar/toolbar_configurations.dart';
-export 'buttons/clear_format.dart';
-export 'buttons/color/color.dart';
-export 'buttons/custom_button.dart';
-export 'buttons/font_family.dart';
-export 'buttons/font_size.dart';
-export 'buttons/history.dart';
-export 'buttons/indent.dart';
-export 'buttons/link_style.dart';
-export 'buttons/link_style2.dart';
-export 'buttons/quill_icon.dart';
-export 'buttons/search/search.dart';
-export 'buttons/select_alignment.dart';
-export 'buttons/select_header_style.dart';
-export 'buttons/toggle_check_list.dart';
-export 'buttons/toggle_style.dart';
+export 'buttons/clear_format_button.dart';
+export 'buttons/color/color_button.dart';
+export 'buttons/custom_button_button.dart';
+export 'buttons/font_family_button.dart';
+export 'buttons/font_size_button.dart';
+export 'buttons/history_button.dart';
+export 'buttons/indent_button.dart';
+export 'buttons/link_style2_button.dart';
+export 'buttons/link_style_button.dart';
+export 'buttons/quill_icon_button.dart';
+export 'buttons/search/search_button.dart';
+export 'buttons/select_alignment_button.dart';
+export 'buttons/select_header_style_button.dart';
+export 'buttons/toggle_check_list_button.dart';
+export 'buttons/toggle_style_button.dart';
 
 typedef QuillBaseToolbarChildrenBuilder = List<Widget> Function(
   BuildContext context,
diff --git a/lib/src/widgets/toolbar/buttons/arrow_indicated_list.dart b/lib/src/widgets/toolbar/buttons/arrow_indicated_list_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/arrow_indicated_list.dart
rename to lib/src/widgets/toolbar/buttons/arrow_indicated_list_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/clear_format.dart b/lib/src/widgets/toolbar/buttons/clear_format_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/clear_format.dart
rename to lib/src/widgets/toolbar/buttons/clear_format_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/color/color.dart b/lib/src/widgets/toolbar/buttons/color/color_button.dart
similarity index 99%
rename from lib/src/widgets/toolbar/buttons/color/color.dart
rename to lib/src/widgets/toolbar/buttons/color/color_button.dart
index 9f939f1d6..8454290a5 100644
--- a/lib/src/widgets/toolbar/buttons/color/color.dart
+++ b/lib/src/widgets/toolbar/buttons/color/color_button.dart
@@ -9,7 +9,7 @@ import '../../../../models/themes/quill_icon_theme.dart';
 import '../../../../utils/color.dart';
 import '../../../controller.dart';
 import '../../base_toolbar.dart';
-import 'dialog.dart';
+import 'color_dialog.dart';
 
 /// Controls color styles.
 ///
diff --git a/lib/src/widgets/toolbar/buttons/color/dialog.dart b/lib/src/widgets/toolbar/buttons/color/color_dialog.dart
similarity index 99%
rename from lib/src/widgets/toolbar/buttons/color/dialog.dart
rename to lib/src/widgets/toolbar/buttons/color/color_dialog.dart
index a9806f51c..3ce6bf814 100644
--- a/lib/src/widgets/toolbar/buttons/color/dialog.dart
+++ b/lib/src/widgets/toolbar/buttons/color/color_dialog.dart
@@ -4,7 +4,7 @@ import 'package:flutter_colorpicker/flutter_colorpicker.dart'
 
 import '../../../../../translations.dart';
 import '../../../../models/documents/style.dart';
-import 'color.dart' show hexToColor;
+import 'color_button.dart' show hexToColor;
 
 class ColorPickerDialog extends StatefulWidget {
   const ColorPickerDialog({
diff --git a/lib/src/widgets/toolbar/buttons/custom_button.dart b/lib/src/widgets/toolbar/buttons/custom_button_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/custom_button.dart
rename to lib/src/widgets/toolbar/buttons/custom_button_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/font_family.dart b/lib/src/widgets/toolbar/buttons/font_family_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/font_family.dart
rename to lib/src/widgets/toolbar/buttons/font_family_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/font_size.dart b/lib/src/widgets/toolbar/buttons/font_size_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/font_size.dart
rename to lib/src/widgets/toolbar/buttons/font_size_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/history.dart b/lib/src/widgets/toolbar/buttons/history_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/history.dart
rename to lib/src/widgets/toolbar/buttons/history_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/indent.dart b/lib/src/widgets/toolbar/buttons/indent_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/indent.dart
rename to lib/src/widgets/toolbar/buttons/indent_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/link_style2.dart b/lib/src/widgets/toolbar/buttons/link_style2_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/link_style2.dart
rename to lib/src/widgets/toolbar/buttons/link_style2_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/link_style.dart b/lib/src/widgets/toolbar/buttons/link_style_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/link_style.dart
rename to lib/src/widgets/toolbar/buttons/link_style_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/quill_icon.dart b/lib/src/widgets/toolbar/buttons/quill_icon_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/quill_icon.dart
rename to lib/src/widgets/toolbar/buttons/quill_icon_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/search/search.dart b/lib/src/widgets/toolbar/buttons/search/search_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/search/search.dart
rename to lib/src/widgets/toolbar/buttons/search/search_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/select_alignment.dart b/lib/src/widgets/toolbar/buttons/select_alignment_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/select_alignment.dart
rename to lib/src/widgets/toolbar/buttons/select_alignment_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/select_header_style.dart b/lib/src/widgets/toolbar/buttons/select_header_style_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/select_header_style.dart
rename to lib/src/widgets/toolbar/buttons/select_header_style_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/toggle_check_list.dart b/lib/src/widgets/toolbar/buttons/toggle_check_list_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/toggle_check_list.dart
rename to lib/src/widgets/toolbar/buttons/toggle_check_list_button.dart
diff --git a/lib/src/widgets/toolbar/buttons/toggle_style.dart b/lib/src/widgets/toolbar/buttons/toggle_style_button.dart
similarity index 100%
rename from lib/src/widgets/toolbar/buttons/toggle_style.dart
rename to lib/src/widgets/toolbar/buttons/toggle_style_button.dart