diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx
index 5b0453b990..6df66c05b1 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.tsx
@@ -39,8 +39,6 @@ const checkboxStyles = composes(
     checkbox-container {
       display: flex;
       align-items: center;
-      margin-right: -10px;
-      margin-left: -10px;
     }
   `
 );
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
index 50729011eb..3403c3c5cd 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/FieldCheckbox.tsx
@@ -30,7 +30,7 @@ export const FieldCheckbox: CheckboxType = function FieldCheckbox({
 }: CheckboxControlledProps | CheckboxObjectProps<any, any>) {
 
   return styled(useStyles(baseFormControlStyles))(
-    <field as="div" className={className} {...use({ long })}>
+    <field as="div" {...use({ long })}>
       <field-label as="div">{children}</field-label>
       <Checkbox
         {...rest}
diff --git a/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx b/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
index a6f161407a..92d3069841 100644
--- a/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
+++ b/webapp/packages/core-blocks/src/Table/TableItemSelect.tsx
@@ -9,6 +9,7 @@
 import { observer } from 'mobx-react';
 import { useContext, useCallback } from 'react';
 import styled from 'reshadow';
+import { css } from 'reshadow';
 
 import { useStyles } from '@cloudbeaver/core-theming';
 
@@ -22,6 +23,13 @@ type Props = {
   className?: string;
 }
 
+const checkboxStyles = css `
+  Checkbox {
+    margin-left: -10px;
+    margin-right: -10px;
+  }
+`
+
 export const TableItemSelect = observer(function TableItemSelect({ checked, disabled, className }: Props) {
   const tableContext = useContext(TableContext);
   const context = useContext(TableItemContext);
@@ -38,7 +46,7 @@ export const TableItemSelect = observer(function TableItemSelect({ checked, disa
     return null;
   }
 
-  return styled(styles)(
+  return styled(styles, checkboxStyles)(
     <Checkbox
       className={className}
       disabled={context.selectDisabled || disabled}
diff --git a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx
index 1f7cc19029..7d93220968 100644
--- a/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx
+++ b/webapp/packages/core-connections/src/Administration/Connections/ConnectionForm/Options/Options.tsx
@@ -59,6 +59,10 @@ const styles = css`
   TabPanel {
     flex-direction: column;
   }
+  FieldCheckbox {
+    margin-left: -10px;
+    margin-right: -10px;
+  }
 `;
 
 export const Options = observer(function Options({
diff --git a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyCheckbox.tsx b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyCheckbox.tsx
index bec54a1cbb..5591ff423e 100644
--- a/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyCheckbox.tsx
+++ b/webapp/packages/plugin-object-viewer/src/ObjectPropertiesPage/formControls/ObjectPropertyCheckbox.tsx
@@ -40,8 +40,7 @@ const styles = css`
     line-height: 26px;
   }
   Checkbox {
-    margin-top: -10px;
-    margin-bottom: -10px;
+    margin: -10px;
   }
 `;