diff --git a/webapp/common-react/@dbeaver/ui-kit/src/Combobox/Combobox.css b/webapp/common-react/@dbeaver/ui-kit/src/Combobox/Combobox.css
index 29a36c61c5..bc0fa9a3d0 100644
--- a/webapp/common-react/@dbeaver/ui-kit/src/Combobox/Combobox.css
+++ b/webapp/common-react/@dbeaver/ui-kit/src/Combobox/Combobox.css
@@ -21,7 +21,7 @@
     font-weight: var(--dbv-kit-combobox-font-weight);
     font-size: var(--dbv-kit-combobox-font-size);
 
-    &:not(:disabled):hover {
+    &:not(:disabled):not(:focus-visible):not([data-focus-visible]):hover {
       border-color: var(--dbv-kit-combobox-hover-border-color);
     }
 
diff --git a/webapp/common-react/@dbeaver/ui-kit/src/Input/Input.css b/webapp/common-react/@dbeaver/ui-kit/src/Input/Input.css
index c4bab07b8d..d4a6d755f6 100644
--- a/webapp/common-react/@dbeaver/ui-kit/src/Input/Input.css
+++ b/webapp/common-react/@dbeaver/ui-kit/src/Input/Input.css
@@ -20,7 +20,7 @@
     font-size: var(--dbv-kit-input-font-size);
     height: var(--dbv-kit-input-height);
 
-    &:not(:disabled):hover {
+    &:not(:disabled):not(:focus-visible):not([data-focus-visible]):hover {
       border-color: var(--dbv-kit-color-control-hover);
     }
 
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField/InputField.module.css b/webapp/packages/core-blocks/src/FormControls/InputField/InputField.module.css
index 9e759deb71..fef87b3146 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputField/InputField.module.css
+++ b/webapp/packages/core-blocks/src/FormControls/InputField/InputField.module.css
@@ -1,10 +1,3 @@
-/*
- * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0.
- * you may not use this file except in compliance with the License.
- */
 .fieldLabel {
   display: block;
   composes: theme-typography--body1 from global;
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField/InputField.tsx b/webapp/packages/core-blocks/src/FormControls/InputField/InputField.tsx
index 14a6979368..1c2e3a0067 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputField/InputField.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputField/InputField.tsx
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField/InputFieldState.tsx b/webapp/packages/core-blocks/src/FormControls/InputField/InputFieldState.tsx
index 11ef1d62e8..fe5550b296 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputField/InputFieldState.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputField/InputFieldState.tsx
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
index d80123db1e..2de4dfaf01 100644
--- a/webapp/packages/core-blocks/src/index.ts
+++ b/webapp/packages/core-blocks/src/index.ts
@@ -185,7 +185,6 @@ export * from './FormControls/ComboboxLoader.js';
 export * from './FormControls/FormContext.js';
 export * from './FormControls/FormFieldDescription.js';
 export * from './FormControls/InputField/InputField.js';
-export { default as InputFieldStyles } from './FormControls/InputField/InputField.module.css';
 export * from './FormControls/InputFiles.js';
 export * from './FormControls/InputFileTextContent.js';
 export * from './FormControls/Radio.js';
diff --git a/webapp/packages/core-theming/src/styles/_form-controls.scss b/webapp/packages/core-theming/src/styles/_form-controls.scss
index c05590f338..f0317ff884 100644
--- a/webapp/packages/core-theming/src/styles/_form-controls.scss
+++ b/webapp/packages/core-theming/src/styles/_form-controls.scss
@@ -52,7 +52,7 @@
     padding: 7px 12px;
     width: 100%;
     border: 2px solid;
-    outline: none;
+    outline: none !important;
     border-radius: $theme-form-element-radius;
 
     @include mdc-theme-prop(color, input-color, false);
diff --git a/webapp/packages/core-ui/package.json b/webapp/packages/core-ui/package.json
index d1363fe5c1..ed3e567df9 100644
--- a/webapp/packages/core-ui/package.json
+++ b/webapp/packages/core-ui/package.json
@@ -35,6 +35,7 @@
     "@cloudbeaver/core-view": "workspace:*",
     "@dbeaver/js-helpers": "workspace:*",
     "@dbeaver/react-dnd": "workspace:^",
+    "@dbeaver/ui-kit": "workspace:*",
     "mobx": "^6",
     "mobx-react-lite": "^4",
     "react": "^19",
diff --git a/webapp/packages/core-ui/src/InlineEditor/InlineEditor.module.css b/webapp/packages/core-ui/src/InlineEditor/InlineEditor.module.css
index d246fa629b..8dbcce6626 100644
--- a/webapp/packages/core-ui/src/InlineEditor/InlineEditor.module.css
+++ b/webapp/packages/core-ui/src/InlineEditor/InlineEditor.module.css
@@ -50,9 +50,9 @@
       border: none !important;
       border-radius: unset;
       width: 100%;
-      height: 100%;
+      height: 22px;
       min-height: unset !important;
-      padding: 0 8px;
+      padding: calc(2 * var(--tw-spacing));
     }
   }
 
diff --git a/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx b/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx
index 9a80484dfa..e4cb70a809 100644
--- a/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx
+++ b/webapp/packages/core-ui/src/InlineEditor/InlineEditor.tsx
@@ -14,6 +14,7 @@ import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dial
 
 import { EditorDialog } from './EditorDialog.js';
 import styles from './InlineEditor.module.css';
+import { Input } from '@dbeaver/ui-kit';
 
 export type InlineEditorControls = 'right' | 'top' | 'bottom' | 'inside';
 
@@ -114,7 +115,7 @@ export const InlineEditor = observer<InlineEditorProps, HTMLInputElement>(
     return (
       <div className={s(style, { editor: true, specific: true, editorActive: active }, className)} onClick={onClick} onDoubleClick={onDoubleClick}>
         <div className={s(style, { editorContainer: true })}>
-          <input
+          <Input
             ref={inputRef}
             className={s(style, { input: true })}
             lang="en"
@@ -124,6 +125,7 @@ export const InlineEditor = observer<InlineEditorProps, HTMLInputElement>(
             onChange={handleChange}
             onKeyDown={handleKeyDown}
             {...rest}
+            size="small"
           />
         </div>
         <div
diff --git a/webapp/packages/core-ui/tsconfig.json b/webapp/packages/core-ui/tsconfig.json
index a3dd231061..fd2a1bb583 100644
--- a/webapp/packages/core-ui/tsconfig.json
+++ b/webapp/packages/core-ui/tsconfig.json
@@ -13,6 +13,9 @@
     {
       "path": "../../common-react/@dbeaver/react-tests"
     },
+    {
+      "path": "../../common-react/@dbeaver/ui-kit"
+    },
     {
       "path": "../../common-typescript/@dbeaver/cli"
     },
diff --git a/webapp/packages/plugin-data-viewer/package.json b/webapp/packages/plugin-data-viewer/package.json
index 50f9482074..55f2a3c45a 100644
--- a/webapp/packages/plugin-data-viewer/package.json
+++ b/webapp/packages/plugin-data-viewer/package.json
@@ -46,6 +46,7 @@
     "@cloudbeaver/plugin-object-viewer": "workspace:*",
     "@dbeaver/js-helpers": "workspace:*",
     "@dbeaver/result-set-api": "workspace:*",
+    "@dbeaver/ui-kit": "workspace:*",
     "mobx": "^6",
     "mobx-react-lite": "^4",
     "react": "^19",
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/FetchSizeAction/FetchSizeAction.module.css b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/FetchSizeAction/FetchSizeAction.module.css
index 52b16f197c..e656359fa8 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/FetchSizeAction/FetchSizeAction.module.css
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/FetchSizeAction/FetchSizeAction.module.css
@@ -13,8 +13,6 @@
     height: 26px;
     width: 80px;
     box-sizing: border-box;
-    padding: 4px 7px;
-    font-size: 13px;
-    line-height: 24px;
+    padding: calc(2 * var(--tw-spacing));
   }
 }
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/FetchSizeAction/FetchSizeAction.tsx b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/FetchSizeAction/FetchSizeAction.tsx
index dcd50c12a7..873da1b52b 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/FetchSizeAction/FetchSizeAction.tsx
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableFooter/TableFooterMenu/FetchSizeAction/FetchSizeAction.tsx
@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2024 DBeaver Corp and others
+ * Copyright (C) 2020-2025 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@ import { type ICustomMenuItemComponent } from '@cloudbeaver/core-view';
 import { DATA_CONTEXT_DV_DDM } from '../../../../DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM.js';
 import { DataViewerSettingsService } from '../../../../DataViewerSettingsService.js';
 import styles from './FetchSizeAction.module.css';
+import { Input } from '@dbeaver/ui-kit';
 
 export const FetchSizeAction: ICustomMenuItemComponent = observer(function FetchSizeAction({ context }) {
   const model = context.get(DATA_CONTEXT_DV_DDM)!;
@@ -47,7 +48,7 @@ export const FetchSizeAction: ICustomMenuItemComponent = observer(function Fetch
   return (
     <Container className={s(style, { count: true })} keepSize noGrow center>
       <Form contents onSubmit={handleChange}>
-        <input
+        <Input
           ref={ref}
           className={s(style, { input: true })}
           type="number"
@@ -55,7 +56,8 @@ export const FetchSizeAction: ICustomMenuItemComponent = observer(function Fetch
           disabled={disabled}
           min={dataViewerSettingsService.minFetchSize}
           max={dataViewerSettingsService.maxFetchSize}
-          onChange={e => setLimit(e.target.value)}
+          size="small"
+          onChange={event => setLimit(event.target.value)}
           onBlur={handleChange}
         />
       </Form>
diff --git a/webapp/packages/plugin-data-viewer/tsconfig.json b/webapp/packages/plugin-data-viewer/tsconfig.json
index fd3d25fdc7..0321ea3cb0 100644
--- a/webapp/packages/plugin-data-viewer/tsconfig.json
+++ b/webapp/packages/plugin-data-viewer/tsconfig.json
@@ -10,6 +10,9 @@
     {
       "path": "../../common-react/@dbeaver/react-tests"
     },
+    {
+      "path": "../../common-react/@dbeaver/ui-kit"
+    },
     {
       "path": "../../common-typescript/@dbeaver/cli"
     },
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 0de3f6bc2b..ec87810050 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2222,6 +2222,7 @@ __metadata:
     "@dbeaver/js-helpers": "workspace:*"
     "@dbeaver/react-dnd": "workspace:^"
     "@dbeaver/react-tests": "workspace:^"
+    "@dbeaver/ui-kit": "workspace:*"
     "@testing-library/react": "npm:^16"
     "@types/react": "npm:^19"
     mobx: "npm:^6"
@@ -3055,6 +3056,7 @@ __metadata:
     "@dbeaver/js-helpers": "workspace:*"
     "@dbeaver/react-tests": "workspace:*"
     "@dbeaver/result-set-api": "workspace:*"
+    "@dbeaver/ui-kit": "workspace:*"
     "@types/react": "npm:^19"
     mobx: "npm:^6"
     mobx-react-lite: "npm:^4"