diff --git a/webapp/common-react/@dbeaver/ui-kit/src/Checkbox/_base.css b/webapp/common-react/@dbeaver/ui-kit/src/Checkbox/_base.css
index d56eb91acb6..ec6b46e013f 100644
--- a/webapp/common-react/@dbeaver/ui-kit/src/Checkbox/_base.css
+++ b/webapp/common-react/@dbeaver/ui-kit/src/Checkbox/_base.css
@@ -14,7 +14,7 @@
     --dbv-kit-checkbox-icon-color: var(--tw-color-white);
 
     /* Checkbox border */
-    --dbv-kit-checkbox-border-width: calc(var(--dbv-kit-control-border-width) * 2);
+    --dbv-kit-checkbox-border-width: var(--dbv-kit-control-border-width);
     --dbv-kit-checkbox-border-radius: var(--dbv-kit-control-border-radius);
     --dbv-kit-checkbox-border-style: solid;
     --dbv-kit-checkbox-border-color: var(--dbv-kit-color-control-inactive);
diff --git a/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.css b/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.css
index c951fdca2a2..11983233e91 100644
--- a/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.css
+++ b/webapp/packages/core-blocks/src/FormControls/Checkboxes/CheckboxMarkup.css
@@ -42,7 +42,6 @@
   .checkbox-markup {
     --dbv-kit-checkbox-hover-shadow-color: color-mix(in srgb, var(--theme-on-secondary), white 80%);
 
-    --dbv-kit-checkbox-border-width: 2px;
     --dbv-kit-checkbox-border-radius: 2px;
 
     --dbv-kit-checkbox-small-height: 24px;
diff --git a/webapp/packages/core-blocks/src/FormControls/Combobox.css b/webapp/packages/core-blocks/src/FormControls/Combobox.css
index 10b5462f446..cb1ff1ec290 100644
--- a/webapp/packages/core-blocks/src/FormControls/Combobox.css
+++ b/webapp/packages/core-blocks/src/FormControls/Combobox.css
@@ -1,7 +1,6 @@
 @layer components {
   .dbv-kit-combobox,
   .dbv-kit-combobox__popover {
-    --dbv-kit-combobox-border-width: 2px;
     --dbv-kit-combobox-hover-border-color: var(--theme-background);
 
     --dbv-kit-combobox-border-color: var(--theme-input-border);
diff --git a/webapp/packages/core-blocks/src/FormControls/Select.css b/webapp/packages/core-blocks/src/FormControls/Select.css
index 47a29970160..4165351a0ab 100644
--- a/webapp/packages/core-blocks/src/FormControls/Select.css
+++ b/webapp/packages/core-blocks/src/FormControls/Select.css
@@ -15,7 +15,6 @@
 @layer components {
   .dbv-kit-select,
   .dbv-kit-select__popover {
-    --dbv-kit-select-border-width: 2px;
     --dbv-kit-select-font-size: 12px;
     --dbv-kit-select-hover-border-color: var(--theme-background);
 
diff --git a/webapp/packages/core-theming/src/styles/_form-controls.scss b/webapp/packages/core-theming/src/styles/_form-controls.scss
index f0317ff8844..d3ce1285b05 100644
--- a/webapp/packages/core-theming/src/styles/_form-controls.scss
+++ b/webapp/packages/core-theming/src/styles/_form-controls.scss
@@ -51,7 +51,7 @@
     box-sizing: border-box;
     padding: 7px 12px;
     width: 100%;
-    border: 2px solid;
+    border: 1px solid;
     outline: none !important;
     border-radius: $theme-form-element-radius;