diff --git a/packages/web/src/elements/CloseSearchButton.svelte b/packages/web/src/buttons/CloseSearchButton.svelte
similarity index 100%
rename from packages/web/src/elements/CloseSearchButton.svelte
rename to packages/web/src/buttons/CloseSearchButton.svelte
diff --git a/packages/web/src/elements/DropDownButton.svelte b/packages/web/src/buttons/DropDownButton.svelte
similarity index 100%
rename from packages/web/src/elements/DropDownButton.svelte
rename to packages/web/src/buttons/DropDownButton.svelte
diff --git a/packages/web/src/elements/FormStyledButton.svelte b/packages/web/src/buttons/FormStyledButton.svelte
similarity index 100%
rename from packages/web/src/elements/FormStyledButton.svelte
rename to packages/web/src/buttons/FormStyledButton.svelte
diff --git a/packages/web/src/elements/FormStyledButtonLikeLabel.svelte b/packages/web/src/buttons/FormStyledButtonLikeLabel.svelte
similarity index 100%
rename from packages/web/src/elements/FormStyledButtonLikeLabel.svelte
rename to packages/web/src/buttons/FormStyledButtonLikeLabel.svelte
diff --git a/packages/web/src/elements/InlineButton.svelte b/packages/web/src/buttons/InlineButton.svelte
similarity index 100%
rename from packages/web/src/elements/InlineButton.svelte
rename to packages/web/src/buttons/InlineButton.svelte
diff --git a/packages/web/src/elements/LargeButton.svelte b/packages/web/src/buttons/LargeButton.svelte
similarity index 100%
rename from packages/web/src/elements/LargeButton.svelte
rename to packages/web/src/buttons/LargeButton.svelte
diff --git a/packages/web/src/widgets/ToolStripButton.svelte b/packages/web/src/buttons/ToolStripButton.svelte
similarity index 100%
rename from packages/web/src/widgets/ToolStripButton.svelte
rename to packages/web/src/buttons/ToolStripButton.svelte
diff --git a/packages/web/src/widgets/ToolStripCommandButton.svelte b/packages/web/src/buttons/ToolStripCommandButton.svelte
similarity index 100%
rename from packages/web/src/widgets/ToolStripCommandButton.svelte
rename to packages/web/src/buttons/ToolStripCommandButton.svelte
diff --git a/packages/web/src/widgets/ToolStripContainer.svelte b/packages/web/src/buttons/ToolStripContainer.svelte
similarity index 100%
rename from packages/web/src/widgets/ToolStripContainer.svelte
rename to packages/web/src/buttons/ToolStripContainer.svelte
diff --git a/packages/web/src/widgets/ToolStripDropDownButton.svelte b/packages/web/src/buttons/ToolStripDropDownButton.svelte
similarity index 100%
rename from packages/web/src/widgets/ToolStripDropDownButton.svelte
rename to packages/web/src/buttons/ToolStripDropDownButton.svelte
diff --git a/packages/web/src/widgets/ToolbarButton.svelte b/packages/web/src/buttons/ToolbarButton.svelte
similarity index 100%
rename from packages/web/src/widgets/ToolbarButton.svelte
rename to packages/web/src/buttons/ToolbarButton.svelte
diff --git a/packages/web/src/impexp/UploadButton.svelte b/packages/web/src/buttons/UploadButton.svelte
similarity index 81%
rename from packages/web/src/impexp/UploadButton.svelte
rename to packages/web/src/buttons/UploadButton.svelte
index a365b608c..0d9a18a22 100644
--- a/packages/web/src/impexp/UploadButton.svelte
+++ b/packages/web/src/buttons/UploadButton.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButtonLikeLabel from '../elements/FormStyledButtonLikeLabel.svelte';
+  import FormStyledButtonLikeLabel from '../buttons/FormStyledButtonLikeLabel.svelte';
   import uploadFiles from '../utility/uploadFiles';
 
   const handleChange = e => {
diff --git a/packages/web/src/datagrid/ColumnHeaderControl.svelte b/packages/web/src/datagrid/ColumnHeaderControl.svelte
index 1f07569d4..0160348a9 100644
--- a/packages/web/src/datagrid/ColumnHeaderControl.svelte
+++ b/packages/web/src/datagrid/ColumnHeaderControl.svelte
@@ -1,6 +1,6 @@
 <script>
   import FontIcon from '../icons/FontIcon.svelte';
-  import DropDownButton from '../elements/DropDownButton.svelte';
+  import DropDownButton from '../buttons/DropDownButton.svelte';
   import splitterDrag from '../utility/splitterDrag';
   import _ from 'lodash';
 
diff --git a/packages/web/src/datagrid/ColumnManager.svelte b/packages/web/src/datagrid/ColumnManager.svelte
index 20713a65e..397b4a89b 100644
--- a/packages/web/src/datagrid/ColumnManager.svelte
+++ b/packages/web/src/datagrid/ColumnManager.svelte
@@ -2,9 +2,9 @@
   import _, { indexOf, range } from 'lodash';
   import { GridDisplay } from 'dbgate-datalib';
   import { filterName } from 'dbgate-tools';
-  import CloseSearchButton from '../elements/CloseSearchButton.svelte';
+  import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
 
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import ManagerInnerContainer from '../elements/ManagerInnerContainer.svelte';
 
   import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
diff --git a/packages/web/src/datagrid/DataFilterControl.svelte b/packages/web/src/datagrid/DataFilterControl.svelte
index 04c40d152..1afe66422 100644
--- a/packages/web/src/datagrid/DataFilterControl.svelte
+++ b/packages/web/src/datagrid/DataFilterControl.svelte
@@ -12,8 +12,8 @@
   import SetFilterModal from '../modals/SetFilterModal.svelte';
   import keycodes from '../utility/keycodes';
 
-  import DropDownButton from '../elements/DropDownButton.svelte';
-  import InlineButton from '../elements/InlineButton.svelte';
+  import DropDownButton from '../buttons/DropDownButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import DictionaryLookupModal from '../modals/DictionaryLookupModal.svelte';
   import ValueLookupModal from '../modals/ValueLookupModal.svelte';
diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 9882fd7ad..0366d4c4f 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -274,7 +274,7 @@
   import { cellFromEvent, emptyCellArray, getCellRange, isRegularCell, nullCell, topLeftCell } from './selection';
   import VerticalScrollBar from './VerticalScrollBar.svelte';
   import LoadingInfo from '../elements/LoadingInfo.svelte';
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import DataFilterControl from './DataFilterControl.svelte';
   import createReducer from '../utility/createReducer';
@@ -292,7 +292,7 @@
   import openNewTab from '../utility/openNewTab';
   import ErrorInfo from '../elements/ErrorInfo.svelte';
   import { dataGridRowHeight } from './DataGridRowHeightMeter.svelte';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import { editJsonRowDocument } from '../jsonview/CollectionJsonRow.svelte';
   import createActivator, { getActiveComponent } from '../utility/createActivator';
   import CollapseButton from './CollapseButton.svelte';
diff --git a/packages/web/src/datagrid/DataGridRowHeightMeter.svelte b/packages/web/src/datagrid/DataGridRowHeightMeter.svelte
index 428151a96..fa5f61c7d 100644
--- a/packages/web/src/datagrid/DataGridRowHeightMeter.svelte
+++ b/packages/web/src/datagrid/DataGridRowHeightMeter.svelte
@@ -4,7 +4,7 @@
 
 <script lang="ts">
   import { writable } from 'svelte/store';
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import resizeObserver from '../utility/resizeObserver';
 
diff --git a/packages/web/src/datagrid/ReferenceHeader.svelte b/packages/web/src/datagrid/ReferenceHeader.svelte
index 7a2b69b94..f5ac57f90 100644
--- a/packages/web/src/datagrid/ReferenceHeader.svelte
+++ b/packages/web/src/datagrid/ReferenceHeader.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
   import FontIcon from '../icons/FontIcon.svelte';
-  import ToolbarButton from '../widgets/ToolbarButton.svelte';
+  import ToolbarButton from '../buttons/ToolbarButton.svelte';
 
   const dispatch = createEventDispatcher();
 
diff --git a/packages/web/src/datagrid/ReferenceManager.svelte b/packages/web/src/datagrid/ReferenceManager.svelte
index 0e14c33e9..2c9e1d54a 100644
--- a/packages/web/src/datagrid/ReferenceManager.svelte
+++ b/packages/web/src/datagrid/ReferenceManager.svelte
@@ -2,9 +2,8 @@
   import { GridDisplay } from 'dbgate-datalib';
   import { filterName } from 'dbgate-tools';
   import { createEventDispatcher } from 'svelte';
-import CloseSearchButton from '../elements/CloseSearchButton.svelte';
+  import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
 
-  import InlineButton from '../elements/InlineButton.svelte';
   import ManagerInnerContainer from '../elements/ManagerInnerContainer.svelte';
 
   import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
diff --git a/packages/web/src/elements/CheckableColumnList.svelte b/packages/web/src/elements/CheckableColumnList.svelte
index e7d6ba4ae..8c6b9f9e1 100644
--- a/packages/web/src/elements/CheckableColumnList.svelte
+++ b/packages/web/src/elements/CheckableColumnList.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButton from './FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
   export let selectedColumns;
   export let allColumns;
diff --git a/packages/web/src/elements/Pager.svelte b/packages/web/src/elements/Pager.svelte
index 4b8fae4fd..0f3af1384 100644
--- a/packages/web/src/elements/Pager.svelte
+++ b/packages/web/src/elements/Pager.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import TextField from '../forms/TextField.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import { createEventDispatcher } from 'svelte';
diff --git a/packages/web/src/elements/QueryDesignColumns.svelte b/packages/web/src/elements/QueryDesignColumns.svelte
index 1b13badf0..c643d2ec1 100644
--- a/packages/web/src/elements/QueryDesignColumns.svelte
+++ b/packages/web/src/elements/QueryDesignColumns.svelte
@@ -7,13 +7,12 @@
 </script>
 
 <script>
-  import { map } from 'lodash';
   import DataFilterControl from '../datagrid/DataFilterControl.svelte';
   import { findDesignerFilterType } from '../designer/designerTools';
   import CheckboxField from '../forms/CheckboxField.svelte';
   import SelectField from '../forms/SelectField.svelte';
   import TextField from '../forms/TextField.svelte';
-  import InlineButton from './InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
 
   import TableControl from './TableControl.svelte';
 
diff --git a/packages/web/src/elements/TabControl.svelte b/packages/web/src/elements/TabControl.svelte
index ab29a981a..38bae2213 100644
--- a/packages/web/src/elements/TabControl.svelte
+++ b/packages/web/src/elements/TabControl.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import _ from 'lodash';
-  import DropDownButton from './DropDownButton.svelte';
+  import DropDownButton from '../buttons/DropDownButton.svelte';
 
   interface TabDef {
     label: string;
diff --git a/packages/web/src/forms/FormArchiveFilesSelect.svelte b/packages/web/src/forms/FormArchiveFilesSelect.svelte
index caa9f77eb..6df97b04b 100644
--- a/packages/web/src/forms/FormArchiveFilesSelect.svelte
+++ b/packages/web/src/forms/FormArchiveFilesSelect.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import _ from 'lodash';
 
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
   import { useArchiveFiles, useArchiveFolders } from '../utility/metadataLoaders';
   import { getFormContext } from './FormProviderCore.svelte';
diff --git a/packages/web/src/forms/FormButton.svelte b/packages/web/src/forms/FormButton.svelte
index 22ddf3495..440174a91 100644
--- a/packages/web/src/forms/FormButton.svelte
+++ b/packages/web/src/forms/FormButton.svelte
@@ -1,5 +1,5 @@
 <script>
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import { getFormContext } from './FormProviderCore.svelte';
   import { createEventDispatcher } from 'svelte';
 
diff --git a/packages/web/src/forms/FormDropDownTextFieldRaw.svelte b/packages/web/src/forms/FormDropDownTextFieldRaw.svelte
index ed7216493..f55a7715c 100644
--- a/packages/web/src/forms/FormDropDownTextFieldRaw.svelte
+++ b/packages/web/src/forms/FormDropDownTextFieldRaw.svelte
@@ -1,11 +1,9 @@
 <script lang="ts">
   import FontIcon from '../icons/FontIcon.svelte';
 
-  import InlineButton from '../elements/InlineButton.svelte';
-
   import { getFormContext } from './FormProviderCore.svelte';
   import TextField from './TextField.svelte';
-  import DropDownButton from '../elements/DropDownButton.svelte';
+  import DropDownButton from '../buttons/DropDownButton.svelte';
 
   export let name;
   export let disabled = false;
diff --git a/packages/web/src/forms/FormElectronFileSelectorRaw.svelte b/packages/web/src/forms/FormElectronFileSelectorRaw.svelte
index df69ec845..9c94900ec 100644
--- a/packages/web/src/forms/FormElectronFileSelectorRaw.svelte
+++ b/packages/web/src/forms/FormElectronFileSelectorRaw.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import getElectron from '../utility/getElectron';
 
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
 
   import { getFormContext } from './FormProviderCore.svelte';
   import TextField from './TextField.svelte';
diff --git a/packages/web/src/forms/FormPasswordFieldRaw.svelte b/packages/web/src/forms/FormPasswordFieldRaw.svelte
index 9b0b6f14a..5244373f2 100644
--- a/packages/web/src/forms/FormPasswordFieldRaw.svelte
+++ b/packages/web/src/forms/FormPasswordFieldRaw.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import FontIcon from '../icons/FontIcon.svelte';
 
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
 
   import { getFormContext } from './FormProviderCore.svelte';
   import TextField from './TextField.svelte';
diff --git a/packages/web/src/forms/FormSubmit.svelte b/packages/web/src/forms/FormSubmit.svelte
index e9fcb7765..0ba7e3386 100644
--- a/packages/web/src/forms/FormSubmit.svelte
+++ b/packages/web/src/forms/FormSubmit.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import { getFormContext } from './FormProviderCore.svelte';
   import { createEventDispatcher } from 'svelte';
 
diff --git a/packages/web/src/forms/LargeFormButton.svelte b/packages/web/src/forms/LargeFormButton.svelte
index 4369b5103..ea4b97f19 100644
--- a/packages/web/src/forms/LargeFormButton.svelte
+++ b/packages/web/src/forms/LargeFormButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { getFormContext } from './FormProviderCore.svelte';
   import { createEventDispatcher } from 'svelte';
-  import LargeButton from '../elements/LargeButton.svelte';
+  import LargeButton from '../buttons/LargeButton.svelte';
 
   const dispatch = createEventDispatcher();
 
diff --git a/packages/web/src/forms/RowsFilterSwitcher.svelte b/packages/web/src/forms/RowsFilterSwitcher.svelte
index 542f6818c..eef0d302b 100644
--- a/packages/web/src/forms/RowsFilterSwitcher.svelte
+++ b/packages/web/src/forms/RowsFilterSwitcher.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
 
   export let icon;
diff --git a/packages/web/src/formview/FormViewFilterColumn.svelte b/packages/web/src/formview/FormViewFilterColumn.svelte
index dd9fc7635..a92c753ab 100644
--- a/packages/web/src/formview/FormViewFilterColumn.svelte
+++ b/packages/web/src/formview/FormViewFilterColumn.svelte
@@ -4,7 +4,7 @@
   import DataFilterControl from '../datagrid/DataFilterControl.svelte';
 
   import ColumnLabel from '../elements/ColumnLabel.svelte';
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
 
   export let column;
diff --git a/packages/web/src/formview/PrimaryKeyFilterEditor.svelte b/packages/web/src/formview/PrimaryKeyFilterEditor.svelte
index aaeb67546..b59f9d677 100644
--- a/packages/web/src/formview/PrimaryKeyFilterEditor.svelte
+++ b/packages/web/src/formview/PrimaryKeyFilterEditor.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import ColumnLabel from '../elements/ColumnLabel.svelte';
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
 
   import FontIcon from '../icons/FontIcon.svelte';
   import keycodes from '../utility/keycodes';
diff --git a/packages/web/src/freetable/MacroHeader.svelte b/packages/web/src/freetable/MacroHeader.svelte
index fcac55f3e..5a33f016f 100644
--- a/packages/web/src/freetable/MacroHeader.svelte
+++ b/packages/web/src/freetable/MacroHeader.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { getContext } from 'svelte';
   import FontIcon from '../icons/FontIcon.svelte';
-  import ToolbarButton from '../widgets/ToolbarButton.svelte';
+  import ToolbarButton from '../buttons/ToolbarButton.svelte';
 
   export let onExecute;
 
diff --git a/packages/web/src/freetable/MacroInfoTab.svelte b/packages/web/src/freetable/MacroInfoTab.svelte
index d7a12f764..8ed71e4e7 100644
--- a/packages/web/src/freetable/MacroInfoTab.svelte
+++ b/packages/web/src/freetable/MacroInfoTab.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { getContext } from 'svelte';
 
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
   import WidgetTitle from '../widgets/WidgetTitle.svelte';
   import MacroParameters from './MacroParameters.svelte';
diff --git a/packages/web/src/impexp/ElectronFilesInput.svelte b/packages/web/src/impexp/ElectronFilesInput.svelte
index 761f221d5..fd6428d8d 100644
--- a/packages/web/src/impexp/ElectronFilesInput.svelte
+++ b/packages/web/src/impexp/ElectronFilesInput.svelte
@@ -9,7 +9,7 @@
 </script>
 
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import LoadingInfo from '../elements/LoadingInfo.svelte';
   import { getFormContext } from '../forms/FormProviderCore.svelte';
   import { findFileFormat } from '../plugins/fileformats';
diff --git a/packages/web/src/impexp/FilesInput.svelte b/packages/web/src/impexp/FilesInput.svelte
index 7c0e89f24..81a4e4c60 100644
--- a/packages/web/src/impexp/FilesInput.svelte
+++ b/packages/web/src/impexp/FilesInput.svelte
@@ -13,7 +13,7 @@
 </script>
 
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import { getFormContext } from '../forms/FormProviderCore.svelte';
   import ChangeDownloadUrlModal from '../modals/ChangeDownloadUrlModal.svelte';
   import { showModal } from '../modals/modalTools';
@@ -22,7 +22,7 @@
   import getElectron from '../utility/getElectron';
   import ElectronFilesInput from './ElectronFilesInput.svelte';
   import { addFilesToSourceList } from './ImportExportConfigurator.svelte';
-  import UploadButton from './UploadButton.svelte';
+  import UploadButton from '../buttons/UploadButton.svelte';
 
   export let setPreviewSource = undefined;
 
diff --git a/packages/web/src/impexp/FormTablesSelect.svelte b/packages/web/src/impexp/FormTablesSelect.svelte
index b8e4c16a7..9f9270778 100644
--- a/packages/web/src/impexp/FormTablesSelect.svelte
+++ b/packages/web/src/impexp/FormTablesSelect.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import _ from 'lodash';
 
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
   import { getFormContext } from '../forms/FormProviderCore.svelte';
   import FormSelectField from '../forms/FormSelectField.svelte';
diff --git a/packages/web/src/impexp/SourceTargetConfig.svelte b/packages/web/src/impexp/SourceTargetConfig.svelte
index 3ba270ca3..913451db6 100644
--- a/packages/web/src/impexp/SourceTargetConfig.svelte
+++ b/packages/web/src/impexp/SourceTargetConfig.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import _ from 'lodash';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import FormArchiveFilesSelect from '../forms/FormArchiveFilesSelect.svelte';
   import moment from 'moment';
 
diff --git a/packages/web/src/jsonview/JsonViewFilterColumn.svelte b/packages/web/src/jsonview/JsonViewFilterColumn.svelte
index 930b80473..de07325c4 100644
--- a/packages/web/src/jsonview/JsonViewFilterColumn.svelte
+++ b/packages/web/src/jsonview/JsonViewFilterColumn.svelte
@@ -2,7 +2,7 @@
   import DataFilterControl from '../datagrid/DataFilterControl.svelte';
 
   import ColumnLabel from '../elements/ColumnLabel.svelte';
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import { getFilterType } from 'dbgate-filterparser';
 
diff --git a/packages/web/src/modals/AboutModal.svelte b/packages/web/src/modals/AboutModal.svelte
index 009505231..a63ea8a04 100644
--- a/packages/web/src/modals/AboutModal.svelte
+++ b/packages/web/src/modals/AboutModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import { useConfig } from '../utility/metadataLoaders';
   import moment from 'moment';
 
diff --git a/packages/web/src/modals/ChangeDownloadUrlModal.svelte b/packages/web/src/modals/ChangeDownloadUrlModal.svelte
index 469be54dd..4677f95ac 100644
--- a/packages/web/src/modals/ChangeDownloadUrlModal.svelte
+++ b/packages/web/src/modals/ChangeDownloadUrlModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
diff --git a/packages/web/src/modals/CommandModal.svelte b/packages/web/src/modals/CommandModal.svelte
index cea721d7c..96d635d29 100644
--- a/packages/web/src/modals/CommandModal.svelte
+++ b/packages/web/src/modals/CommandModal.svelte
@@ -2,14 +2,10 @@
   import _ from 'lodash';
   import { writable } from 'svelte/store';
 
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
-  import InlineButton from '../elements/InlineButton.svelte';
-
-  import FormProvider from '../forms/FormProvider.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import FormProviderCore from '../forms/FormProviderCore.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
   import FormTextField from '../forms/FormTextField.svelte';
-  import FontIcon from '../icons/FontIcon.svelte';
   import { commandsSettings } from '../stores';
   import { apiCall } from '../utility/api';
   import KeyboardModal from './KeyboardModal.svelte';
diff --git a/packages/web/src/modals/ConfirmModal.svelte b/packages/web/src/modals/ConfirmModal.svelte
index f697ac7fd..56cafc438 100644
--- a/packages/web/src/modals/ConfirmModal.svelte
+++ b/packages/web/src/modals/ConfirmModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
diff --git a/packages/web/src/modals/ConfirmNoSqlModal.svelte b/packages/web/src/modals/ConfirmNoSqlModal.svelte
index ec0acf0d6..c288200b0 100644
--- a/packages/web/src/modals/ConfirmNoSqlModal.svelte
+++ b/packages/web/src/modals/ConfirmNoSqlModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
   import JSONTree from '../jsontree/JSONTree.svelte';
diff --git a/packages/web/src/modals/ConfirmSqlModal.svelte b/packages/web/src/modals/ConfirmSqlModal.svelte
index 62fcc75e9..ac0073b75 100644
--- a/packages/web/src/modals/ConfirmSqlModal.svelte
+++ b/packages/web/src/modals/ConfirmSqlModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import _, { startsWith } from 'lodash';
   import { writable } from 'svelte/store';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import FormCheckboxField from '../forms/FormCheckboxField.svelte';
   import FormProviderCore from '../forms/FormProviderCore.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
diff --git a/packages/web/src/modals/DefineDictionaryDescriptionModal.svelte b/packages/web/src/modals/DefineDictionaryDescriptionModal.svelte
index 50b32757a..04057d340 100644
--- a/packages/web/src/modals/DefineDictionaryDescriptionModal.svelte
+++ b/packages/web/src/modals/DefineDictionaryDescriptionModal.svelte
@@ -2,7 +2,7 @@
   import FormProvider from '../forms/FormProvider.svelte';
   import _ from 'lodash';
   import FormSubmit from '../forms/FormSubmit.svelte';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal } from './modalTools';
   import { useAppFolders, useConnectionList, useTableInfo, useUsedApps } from '../utility/metadataLoaders';
diff --git a/packages/web/src/modals/DictionaryLookupModal.svelte b/packages/web/src/modals/DictionaryLookupModal.svelte
index b60d52edc..4dbe86863 100644
--- a/packages/web/src/modals/DictionaryLookupModal.svelte
+++ b/packages/web/src/modals/DictionaryLookupModal.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal, showModal } from './modalTools';
   import DefineDictionaryDescriptionModal from './DefineDictionaryDescriptionModal.svelte';
diff --git a/packages/web/src/modals/EditJsonModal.svelte b/packages/web/src/modals/EditJsonModal.svelte
index 6dc7d8442..0491d9500 100644
--- a/packages/web/src/modals/EditJsonModal.svelte
+++ b/packages/web/src/modals/EditJsonModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onMount } from 'svelte';
 
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
   import AceEditor from '../query/AceEditor.svelte';
diff --git a/packages/web/src/modals/ErrorMessageModal.svelte b/packages/web/src/modals/ErrorMessageModal.svelte
index fbc7dfc8b..9a69b4fc1 100644
--- a/packages/web/src/modals/ErrorMessageModal.svelte
+++ b/packages/web/src/modals/ErrorMessageModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
diff --git a/packages/web/src/modals/FilterMultipleValuesModal.svelte b/packages/web/src/modals/FilterMultipleValuesModal.svelte
index 769031248..96ca5306b 100644
--- a/packages/web/src/modals/FilterMultipleValuesModal.svelte
+++ b/packages/web/src/modals/FilterMultipleValuesModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import TextAreaField from '../forms/TextAreaField.svelte';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal } from './modalTools';
 
diff --git a/packages/web/src/modals/GenerateSqlFromDataModal.svelte b/packages/web/src/modals/GenerateSqlFromDataModal.svelte
index 2408fbf55..4760a3605 100644
--- a/packages/web/src/modals/GenerateSqlFromDataModal.svelte
+++ b/packages/web/src/modals/GenerateSqlFromDataModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import CheckableColumnList from '../elements/CheckableColumnList.svelte';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import TableControl from '../elements/TableControl.svelte';
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
diff --git a/packages/web/src/modals/ImportExportModal.svelte b/packages/web/src/modals/ImportExportModal.svelte
index 6d4b2071c..b6a763e39 100644
--- a/packages/web/src/modals/ImportExportModal.svelte
+++ b/packages/web/src/modals/ImportExportModal.svelte
@@ -2,7 +2,7 @@
   import moment from 'moment';
   import { writable } from 'svelte/store';
   import HorizontalSplitter from '../elements/HorizontalSplitter.svelte';
-  import LargeButton from '../elements/LargeButton.svelte';
+  import LargeButton from '../buttons/LargeButton.svelte';
   import LoadingInfo from '../elements/LoadingInfo.svelte';
   import VerticalSplitter from '../elements/VerticalSplitter.svelte';
 
diff --git a/packages/web/src/modals/InputTextModal.svelte b/packages/web/src/modals/InputTextModal.svelte
index c4a5ba0b7..b965fdc0e 100644
--- a/packages/web/src/modals/InputTextModal.svelte
+++ b/packages/web/src/modals/InputTextModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
diff --git a/packages/web/src/modals/InsertJoinModal.svelte b/packages/web/src/modals/InsertJoinModal.svelte
index 737629982..ed19eb7bf 100644
--- a/packages/web/src/modals/InsertJoinModal.svelte
+++ b/packages/web/src/modals/InsertJoinModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import TableControl from '../elements/TableControl.svelte';
   import TextField from '../forms/TextField.svelte';
   import analyseQuerySources from '../query/analyseQuerySources';
diff --git a/packages/web/src/modals/SaveFileModal.svelte b/packages/web/src/modals/SaveFileModal.svelte
index 161c58560..76d1eafdc 100644
--- a/packages/web/src/modals/SaveFileModal.svelte
+++ b/packages/web/src/modals/SaveFileModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
diff --git a/packages/web/src/modals/SqlGeneratorModal.svelte b/packages/web/src/modals/SqlGeneratorModal.svelte
index 79753ea10..908796f9a 100644
--- a/packages/web/src/modals/SqlGeneratorModal.svelte
+++ b/packages/web/src/modals/SqlGeneratorModal.svelte
@@ -7,7 +7,7 @@
 
   import HorizontalSplitter from '../elements/HorizontalSplitter.svelte';
 
-  import LargeButton from '../elements/LargeButton.svelte';
+  import LargeButton from '../buttons/LargeButton.svelte';
   import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
   import FormCheckboxField from '../forms/FormCheckboxField.svelte';
diff --git a/packages/web/src/modals/ValueLookupModal.svelte b/packages/web/src/modals/ValueLookupModal.svelte
index 55431c6a3..9ea61f59f 100644
--- a/packages/web/src/modals/ValueLookupModal.svelte
+++ b/packages/web/src/modals/ValueLookupModal.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal, showModal } from './modalTools';
   import DefineDictionaryDescriptionModal from './DefineDictionaryDescriptionModal.svelte';
diff --git a/packages/web/src/tableeditor/ColumnEditorModal.svelte b/packages/web/src/tableeditor/ColumnEditorModal.svelte
index 91c120756..4b62a32e2 100644
--- a/packages/web/src/tableeditor/ColumnEditorModal.svelte
+++ b/packages/web/src/tableeditor/ColumnEditorModal.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
-  import uuidv1 from 'uuid/v1';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
-  import FormSelectField from '../forms/FormSelectField.svelte';
   import FormTextField from '../forms/FormTextField.svelte';
   import FormCheckboxField from '../forms/FormCheckboxField.svelte';
 
@@ -11,8 +9,6 @@
   import FormButton from '../forms/FormButton.svelte';
   import ModalBase from '../modals/ModalBase.svelte';
   import { closeCurrentModal } from '../modals/modalTools';
-  import ElectronFilesInput from '../impexp/ElectronFilesInput.svelte';
-  import DropDownButton from '../elements/DropDownButton.svelte';
   import DataTypeEditor from './DataTypeEditor.svelte';
   import { editorAddColumn, editorDeleteColumn, editorModifyColumn, fillEditorColumnInfo } from 'dbgate-tools';
 
diff --git a/packages/web/src/tableeditor/ColumnsConstraintEditorModal.svelte b/packages/web/src/tableeditor/ColumnsConstraintEditorModal.svelte
index bd7426434..2c97c1f27 100644
--- a/packages/web/src/tableeditor/ColumnsConstraintEditorModal.svelte
+++ b/packages/web/src/tableeditor/ColumnsConstraintEditorModal.svelte
@@ -1,18 +1,11 @@
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import uuidv1 from 'uuid/v1';
 
-  import FormSelectField from '../forms/FormSelectField.svelte';
-  import FormTextField from '../forms/FormTextField.svelte';
-  import FormCheckboxField from '../forms/FormCheckboxField.svelte';
-
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
   import ModalBase from '../modals/ModalBase.svelte';
   import { closeCurrentModal } from '../modals/modalTools';
-  import ElectronFilesInput from '../impexp/ElectronFilesInput.svelte';
-  import DropDownButton from '../elements/DropDownButton.svelte';
-  import DataTypeEditor from './DataTypeEditor.svelte';
   import { editorAddConstraint, editorDeleteConstraint, editorModifyConstraint } from 'dbgate-tools';
   import TextField from '../forms/TextField.svelte';
   import SelectField from '../forms/SelectField.svelte';
diff --git a/packages/web/src/tableeditor/ForeignKeyEditorModal.svelte b/packages/web/src/tableeditor/ForeignKeyEditorModal.svelte
index 4c8a8f1d5..35e40e873 100644
--- a/packages/web/src/tableeditor/ForeignKeyEditorModal.svelte
+++ b/packages/web/src/tableeditor/ForeignKeyEditorModal.svelte
@@ -1,18 +1,11 @@
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import uuidv1 from 'uuid/v1';
 
-  import FormSelectField from '../forms/FormSelectField.svelte';
-  import FormTextField from '../forms/FormTextField.svelte';
-  import FormCheckboxField from '../forms/FormCheckboxField.svelte';
-
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
   import ModalBase from '../modals/ModalBase.svelte';
   import { closeCurrentModal } from '../modals/modalTools';
-  import ElectronFilesInput from '../impexp/ElectronFilesInput.svelte';
-  import DropDownButton from '../elements/DropDownButton.svelte';
-  import DataTypeEditor from './DataTypeEditor.svelte';
   import {
     editorAddConstraint,
     editorDeleteConstraint,
diff --git a/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte b/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte
index 8124ba50d..b39d556a3 100644
--- a/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte
+++ b/packages/web/src/tableeditor/VirtualForeignKeyEditorModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
 
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
diff --git a/packages/web/src/tabs/CompareModelTab.svelte b/packages/web/src/tabs/CompareModelTab.svelte
index e0c6cfcbd..a6c61e2c4 100644
--- a/packages/web/src/tabs/CompareModelTab.svelte
+++ b/packages/web/src/tabs/CompareModelTab.svelte
@@ -135,7 +135,7 @@
   import { derived, writable } from 'svelte/store';
   import registerCommand from '../commands/registerCommand';
   import DiffView from '../elements/DiffView.svelte';
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import ScrollableTableControl from '../elements/ScrollableTableControl.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
   import TabControl from '../elements/TabControl.svelte';
diff --git a/packages/web/src/tabs/PluginTab.svelte b/packages/web/src/tabs/PluginTab.svelte
index ccb0a71d2..ac14890c2 100644
--- a/packages/web/src/tabs/PluginTab.svelte
+++ b/packages/web/src/tabs/PluginTab.svelte
@@ -4,7 +4,7 @@
 
 <script lang="ts">
   import compareVersions from 'compare-versions';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import Markdown from '../elements/Markdown.svelte';
   import { extractPluginAuthor, extractPluginIcon } from '../plugins/manifestExtractors';
   import { apiCall, useApiCall } from '../utility/api';
diff --git a/packages/web/src/tabs/TableDataTab.svelte b/packages/web/src/tabs/TableDataTab.svelte
index 8349bcd37..91f69aa08 100644
--- a/packages/web/src/tabs/TableDataTab.svelte
+++ b/packages/web/src/tabs/TableDataTab.svelte
@@ -54,8 +54,8 @@
   import { setContext } from 'svelte';
   import { apiCall } from '../utility/api';
   import { getLocalStorage, setLocalStorage } from '../utility/storageCache';
-  import ToolStripContainer from '../widgets/ToolStripContainer.svelte';
-  import ToolbarCommandButton from '../widgets/ToolStripCommandButton.svelte';
+  import ToolStripContainer from '../buttons/ToolStripContainer.svelte';
+  import ToolStripCommandButton from '../buttons/ToolStripCommandButton.svelte';
 
   export let tabid;
   export let conid;
@@ -132,9 +132,9 @@
   />
 
   <svelte:fragment slot="toolstrip">
-    <ToolbarCommandButton command="dataGrid.refresh" />
-    <ToolbarCommandButton command="tableData.save" />
-    <ToolbarCommandButton command="dataGrid.insertNewRow" />
+    <ToolStripCommandButton command="dataGrid.refresh" />
+    <ToolStripCommandButton command="tableData.save" />
+    <ToolStripCommandButton command="dataGrid.insertNewRow" />
   </svelte:fragment>
 </ToolStripContainer>
 
diff --git a/packages/web/src/widgets/AppFilesList.svelte b/packages/web/src/widgets/AppFilesList.svelte
index f010027fe..c4f34cbe8 100644
--- a/packages/web/src/widgets/AppFilesList.svelte
+++ b/packages/web/src/widgets/AppFilesList.svelte
@@ -20,10 +20,10 @@
 
   import AppObjectList from '../appobj/AppObjectList.svelte';
   import * as appFileAppObject from '../appobj/AppFileAppObject.svelte';
-  import CloseSearchButton from '../elements/CloseSearchButton.svelte';
-  import DropDownButton from '../elements/DropDownButton.svelte';
+  import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
+  import DropDownButton from '../buttons/DropDownButton.svelte';
 
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
 
   import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
diff --git a/packages/web/src/widgets/AppFolderList.svelte b/packages/web/src/widgets/AppFolderList.svelte
index 84aa0871c..4db2d38c5 100644
--- a/packages/web/src/widgets/AppFolderList.svelte
+++ b/packages/web/src/widgets/AppFolderList.svelte
@@ -4,9 +4,9 @@
   import AppObjectList from '../appobj/AppObjectList.svelte';
   import * as appFolderAppObject from '../appobj/AppFolderAppObject.svelte';
   import runCommand from '../commands/runCommand';
-  import CloseSearchButton from '../elements/CloseSearchButton.svelte';
+  import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
 
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
 
   import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
diff --git a/packages/web/src/widgets/ArchiveFilesList.svelte b/packages/web/src/widgets/ArchiveFilesList.svelte
index 9f62707ee..53ebbcc61 100644
--- a/packages/web/src/widgets/ArchiveFilesList.svelte
+++ b/packages/web/src/widgets/ArchiveFilesList.svelte
@@ -17,10 +17,10 @@
 
   import AppObjectList from '../appobj/AppObjectList.svelte';
   import * as archiveFileAppObject from '../appobj/ArchiveFileAppObject.svelte';
-  import CloseSearchButton from '../elements/CloseSearchButton.svelte';
-  import DropDownButton from '../elements/DropDownButton.svelte';
+  import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
+  import DropDownButton from '../buttons/DropDownButton.svelte';
 
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
 
   import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
diff --git a/packages/web/src/widgets/ArchiveFolderList.svelte b/packages/web/src/widgets/ArchiveFolderList.svelte
index 38d291944..1b4b11d13 100644
--- a/packages/web/src/widgets/ArchiveFolderList.svelte
+++ b/packages/web/src/widgets/ArchiveFolderList.svelte
@@ -4,9 +4,9 @@
   import AppObjectList from '../appobj/AppObjectList.svelte';
   import * as archiveFolderAppObject from '../appobj/ArchiveFolderAppObject.svelte';
   import runCommand from '../commands/runCommand';
-  import CloseSearchButton from '../elements/CloseSearchButton.svelte';
+  import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
 
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
 
   import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte
index 973545be0..fb4cc3cf9 100644
--- a/packages/web/src/widgets/ConnectionList.svelte
+++ b/packages/web/src/widgets/ConnectionList.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import _ from 'lodash';
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
   import WidgetsInnerContainer from './WidgetsInnerContainer.svelte';
   import { useConnectionList, useServerStatus } from '../utility/metadataLoaders';
@@ -9,12 +9,12 @@
   import * as connectionAppObject from '../appobj/ConnectionAppObject.svelte';
   import SubDatabaseList from '../appobj/SubDatabaseList.svelte';
   import { commands, commandsCustomized, openedConnections } from '../stores';
-  import ToolbarButton from './ToolbarButton.svelte';
+  import ToolbarButton from '../buttons/ToolbarButton.svelte';
   import runCommand from '../commands/runCommand';
   import getConnectionLabel from '../utility/getConnectionLabel';
   import { useConnectionColorFactory } from '../utility/useConnectionColor';
   import FontIcon from '../icons/FontIcon.svelte';
-  import CloseSearchButton from '../elements/CloseSearchButton.svelte';
+  import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
   import { apiCall } from '../utility/api';
 
   const connections = useConnectionList();
diff --git a/packages/web/src/widgets/QueryHistoryList.svelte b/packages/web/src/widgets/QueryHistoryList.svelte
index e9cc00105..992172959 100644
--- a/packages/web/src/widgets/QueryHistoryList.svelte
+++ b/packages/web/src/widgets/QueryHistoryList.svelte
@@ -7,7 +7,7 @@
   import FontIcon from '../icons/FontIcon.svelte';
   import { onMount } from 'svelte';
   import openNewTab from '../utility/openNewTab';
-  import CloseSearchButton from '../elements/CloseSearchButton.svelte';
+  import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
   import { apiCall, apiOff, apiOn } from '../utility/api';
 
   let filter = '';
diff --git a/packages/web/src/widgets/Snackbar.svelte b/packages/web/src/widgets/Snackbar.svelte
index 0315b7393..51f7e003d 100644
--- a/packages/web/src/widgets/Snackbar.svelte
+++ b/packages/web/src/widgets/Snackbar.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import FontIcon from '../icons/FontIcon.svelte';
   import { onMount } from 'svelte';
-  import FormStyledButton from '../elements/FormStyledButton.svelte';
+  import FormStyledButton from '../buttons/FormStyledButton.svelte';
   import { openedSnackbars } from '../stores';
 
   export let message;
diff --git a/packages/web/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte
index df83c95dc..79903cd89 100644
--- a/packages/web/src/widgets/SqlObjectList.svelte
+++ b/packages/web/src/widgets/SqlObjectList.svelte
@@ -13,7 +13,7 @@
 </script>
 
 <script lang="ts">
-  import InlineButton from '../elements/InlineButton.svelte';
+  import InlineButton from '../buttons/InlineButton.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
   import WidgetsInnerContainer from './WidgetsInnerContainer.svelte';
   import { useConnectionInfo, useDatabaseInfo, useDatabaseStatus } from '../utility/metadataLoaders';
@@ -26,9 +26,9 @@
   import ErrorInfo from '../elements/ErrorInfo.svelte';
   import LoadingInfo from '../elements/LoadingInfo.svelte';
   import { getObjectTypeFieldLabel } from '../utility/common';
-  import DropDownButton from '../elements/DropDownButton.svelte';
+  import DropDownButton from '../buttons/DropDownButton.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
-  import CloseSearchButton from '../elements/CloseSearchButton.svelte';
+  import CloseSearchButton from '../buttons/CloseSearchButton.svelte';
   import { findEngineDriver } from 'dbgate-tools';
   import { extensions } from '../stores';
   import newQuery from '../query/newQuery';
diff --git a/packages/web/src/widgets/Toolbar.svelte b/packages/web/src/widgets/Toolbar.svelte
index b2396ec50..3ecdc4ccd 100644
--- a/packages/web/src/widgets/Toolbar.svelte
+++ b/packages/web/src/widgets/Toolbar.svelte
@@ -14,7 +14,7 @@
   import { activeTab, commands, commandsCustomized } from '../stores';
   import getElectron from '../utility/getElectron';
   import { useFavorites } from '../utility/metadataLoaders';
-  import ToolbarButton from './ToolbarButton.svelte';
+  import ToolbarButton from '../buttons/ToolbarButton.svelte';
 
   const electron = getElectron();