diff --git a/src/lib/kit/components/AccordeonCard/AccordeonCard.scss b/src/lib/kit/components/AccordeonCard/AccordeonCard.scss
index cf3d3ce1..73220633 100644
--- a/src/lib/kit/components/AccordeonCard/AccordeonCard.scss
+++ b/src/lib/kit/components/AccordeonCard/AccordeonCard.scss
@@ -63,18 +63,6 @@
             order: -1;
         }
 
-        &-content-title {
-            font-weight: 700;
-
-            &_size_s {
-                font-size: 13px;
-            }
-
-            &_size_m {
-                font-size: 16px;
-            }
-        }
-
         &-content-description {
             margin-top: 12px;
             color: var(--g-color-text-complementary);
diff --git a/src/lib/kit/components/AccordeonCard/AccordeonCard.tsx b/src/lib/kit/components/AccordeonCard/AccordeonCard.tsx
index 8bbccdb3..57332f32 100644
--- a/src/lib/kit/components/AccordeonCard/AccordeonCard.tsx
+++ b/src/lib/kit/components/AccordeonCard/AccordeonCard.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import {ChevronDown} from '@gravity-ui/icons';
-import {Button, Icon} from '@gravity-ui/uikit';
+import {Button, Icon, Text} from '@gravity-ui/uikit';
 import _ from 'lodash';
 
 import {block} from '../../utils';
@@ -69,6 +69,18 @@ export const AccordeonCard: React.FC<AccordeonCardProps> = ({
         }
     });
 
+    const currentHeaderVariant = React.useMemo(() => {
+        if (!_.isString(header)) {
+            return 'body-1';
+        }
+
+        if (titleSize === 'm') {
+            return 'subheader-2';
+        }
+
+        return 'subheader-1';
+    }, [titleSize]);
+
     return (
         <div ref={accordeonRef} className={b({empty: Boolean(emptyBody)}, className)}>
             <div
@@ -79,15 +91,7 @@ export const AccordeonCard: React.FC<AccordeonCardProps> = ({
                 onClick={!ignoreHeaderToggle && !alwaysOpen ? handleToggle : undefined}
             >
                 <div className={b('header-content')}>
-                    <span
-                        className={
-                            _.isString(header)
-                                ? b('header-content-title', {size: titleSize})
-                                : undefined
-                        }
-                    >
-                        {header}
-                    </span>
+                    <Text variant={currentHeaderVariant}>{header}</Text>
                     {description ? (
                         <span
                             className={b('header-content-description')}
diff --git a/src/lib/kit/components/Card/Card.scss b/src/lib/kit/components/Card/Card.scss
index 8b5c069f..0d93201e 100644
--- a/src/lib/kit/components/Card/Card.scss
+++ b/src/lib/kit/components/Card/Card.scss
@@ -64,12 +64,6 @@
     }
 
     &__title {
-        font-size: var(--g-text-subheader-2-font-size);
-        font-weight: var(--g-text-subheader-font-weight);
-        line-height: var(--g-text-subheader-2-line-height);
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
         max-width: 533px;
     }
 
diff --git a/src/lib/kit/components/Card/Card.tsx b/src/lib/kit/components/Card/Card.tsx
index 1421f22d..574f77bc 100644
--- a/src/lib/kit/components/Card/Card.tsx
+++ b/src/lib/kit/components/Card/Card.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import {HelpPopover} from '@gravity-ui/components';
 import {ChevronDown} from '@gravity-ui/icons';
-import {Button, Card as CardBase, Icon, Popover} from '@gravity-ui/uikit';
+import {Button, Card as CardBase, Icon, Popover, Text} from '@gravity-ui/uikit';
 import _ from 'lodash';
 
 import {COMMON_POPOVER_PLACEMENT, COMMON_TITLE_MAX_WIDTH} from '../../constants/common';
@@ -79,9 +79,14 @@ export const Card: React.FC<CardProps> = ({
                         disabled={titlePopoverDisabled}
                         placement={COMMON_POPOVER_PLACEMENT}
                     >
-                        <div ref={titleRef} className={b('title')}>
+                        <Text
+                            className={b('title')}
+                            ellipsis={true}
+                            ref={titleRef}
+                            variant="subheader-2"
+                        >
                             {propsTitle}
-                        </div>
+                        </Text>
                     </Popover>
                     {description ? (
                         <div className={b('note')}>
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-array-spec-dark-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-array-spec-dark-chromium-linux.png
index a30ad4e0..92eaa458 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-array-spec-dark-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-array-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-array-spec-light-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-array-spec-light-chromium-linux.png
index ba2c81da..a0c70f54 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-array-spec-light-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-array-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-object-spec-dark-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-object-spec-dark-chromium-linux.png
index 00eb5cd5..d9146e8f 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-object-spec-dark-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-object-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-object-spec-light-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-object-spec-light-chromium-linux.png
index 87272499..d9cb4a29 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-object-spec-light-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Accordeon-Card-object-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-array-spec-dark-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-array-spec-dark-chromium-linux.png
index 2616caf7..d3f0a781 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-array-spec-dark-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-array-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-array-spec-light-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-array-spec-light-chromium-linux.png
index 2dea006f..74b6338c 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-array-spec-light-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-array-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-object-spec-dark-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-object-spec-dark-chromium-linux.png
index 27b323cc..9522c697 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-object-spec-dark-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-object-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-object-spec-light-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-object-spec-light-chromium-linux.png
index e796f06c..0e235d8e 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-object-spec-light-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-Section-Card-object-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-array-spec-dark-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-array-spec-dark-chromium-linux.png
index fb9aacce..ecde48e7 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-array-spec-dark-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-array-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-array-spec-light-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-array-spec-light-chromium-linux.png
index 1a2f7aab..d3ee523e 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-array-spec-light-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-array-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-object-spec-dark-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-object-spec-dark-chromium-linux.png
index 5d957aed..b6ef076c 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-object-spec-dark-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-object-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-object-spec-light-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-object-spec-light-chromium-linux.png
index f981aa38..4731b827 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-object-spec-light-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Accordeon-Card-object-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-array-spec-dark-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-array-spec-dark-chromium-linux.png
index 2af40b2d..5dfb019c 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-array-spec-dark-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-array-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-array-spec-light-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-array-spec-light-chromium-linux.png
index b30a90e9..19a2aef8 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-array-spec-light-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-array-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-object-spec-dark-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-object-spec-dark-chromium-linux.png
index 408d883f..8dc9ea12 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-object-spec-dark-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-object-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-object-spec-light-chromium-linux.png b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-object-spec-light-chromium-linux.png
index a5cfa650..ed4b6cfb 100644
Binary files a/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-object-spec-light-chromium-linux.png and b/src/lib/kit/components/Card/__snapshots__/Card.visual.test.tsx-snapshots/Card-view-Section-Card-object-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ArrayBase/__snapshots__/ArrayBase.visual.test.tsx-snapshots/Array-Base-view-default-dark-chromium-linux.png b/src/lib/kit/components/Inputs/ArrayBase/__snapshots__/ArrayBase.visual.test.tsx-snapshots/Array-Base-view-default-dark-chromium-linux.png
index 342b9144..1adb6333 100644
Binary files a/src/lib/kit/components/Inputs/ArrayBase/__snapshots__/ArrayBase.visual.test.tsx-snapshots/Array-Base-view-default-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/ArrayBase/__snapshots__/ArrayBase.visual.test.tsx-snapshots/Array-Base-view-default-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ArrayBase/__snapshots__/ArrayBase.visual.test.tsx-snapshots/Array-Base-view-default-light-chromium-linux.png b/src/lib/kit/components/Inputs/ArrayBase/__snapshots__/ArrayBase.visual.test.tsx-snapshots/Array-Base-view-default-light-chromium-linux.png
index c0f704aa..b3607023 100644
Binary files a/src/lib/kit/components/Inputs/ArrayBase/__snapshots__/ArrayBase.visual.test.tsx-snapshots/Array-Base-view-default-light-chromium-linux.png and b/src/lib/kit/components/Inputs/ArrayBase/__snapshots__/ArrayBase.visual.test.tsx-snapshots/Array-Base-view-default-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-object-dark-chromium-linux.png b/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-object-dark-chromium-linux.png
index 9a1f12f9..474abcc2 100644
Binary files a/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-object-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-object-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-object-light-chromium-linux.png b/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-object-light-chromium-linux.png
index fe7d0831..e4c72600 100644
Binary files a/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-object-light-chromium-linux.png and b/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-object-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-string-dark-chromium-linux.png b/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-string-dark-chromium-linux.png
index d303deea..f62fb204 100644
Binary files a/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-string-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-string-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-string-light-chromium-linux.png b/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-string-light-chromium-linux.png
index 94f5796d..714ac9aa 100644
Binary files a/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-string-light-chromium-linux.png and b/src/lib/kit/components/Inputs/CardOneOf/__snapshots__/CardOneOf.visual.test.tsx-snapshots/Card-OneOf-view-string-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/Checkbox/__snapshots__/Checkbox.visual.test.tsx-snapshots/Checkbox-view-default-dark-chromium-linux.png b/src/lib/kit/components/Inputs/Checkbox/__snapshots__/Checkbox.visual.test.tsx-snapshots/Checkbox-view-default-dark-chromium-linux.png
index c1b00c02..a1a604a3 100644
Binary files a/src/lib/kit/components/Inputs/Checkbox/__snapshots__/Checkbox.visual.test.tsx-snapshots/Checkbox-view-default-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/Checkbox/__snapshots__/Checkbox.visual.test.tsx-snapshots/Checkbox-view-default-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/Checkbox/__snapshots__/Checkbox.visual.test.tsx-snapshots/Checkbox-view-default-light-chromium-linux.png b/src/lib/kit/components/Inputs/Checkbox/__snapshots__/Checkbox.visual.test.tsx-snapshots/Checkbox-view-default-light-chromium-linux.png
index 3b315b4b..fa6150b7 100644
Binary files a/src/lib/kit/components/Inputs/Checkbox/__snapshots__/Checkbox.visual.test.tsx-snapshots/Checkbox-view-default-light-chromium-linux.png and b/src/lib/kit/components/Inputs/Checkbox/__snapshots__/Checkbox.visual.test.tsx-snapshots/Checkbox-view-default-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/FileInput/FileInput.scss b/src/lib/kit/components/Inputs/FileInput/FileInput.scss
index 5ad39d32..0d1a380b 100644
--- a/src/lib/kit/components/Inputs/FileInput/FileInput.scss
+++ b/src/lib/kit/components/Inputs/FileInput/FileInput.scss
@@ -11,9 +11,5 @@
         display: block;
         margin: auto 10px;
         max-width: 160px;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        color: var(--g-color-text-secondary);
     }
 }
diff --git a/src/lib/kit/components/Inputs/FileInput/FileInput.tsx b/src/lib/kit/components/Inputs/FileInput/FileInput.tsx
index 7b302bd1..4a938d83 100644
--- a/src/lib/kit/components/Inputs/FileInput/FileInput.tsx
+++ b/src/lib/kit/components/Inputs/FileInput/FileInput.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import {Xmark} from '@gravity-ui/icons';
-import {Button, Icon, Label} from '@gravity-ui/uikit';
+import {Button, Icon, Label, Text} from '@gravity-ui/uikit';
 
 import {StringInputProps} from '../../../../core';
 import i18n from '../../../../kit/i18n';
@@ -82,7 +82,9 @@ export const FileInput: React.FC<StringInputProps> = ({name, input, spec}) => {
                 tabIndex={-1}
                 accept={spec.viewSpec.fileInput?.accept}
             />
-            <span className={b('file-name')}>{fileNameContent}</span>
+            <Text className={b('file-name')} ellipsis={true} color="secondary">
+                {fileNameContent}
+            </Text>
             {value ? (
                 <Button
                     view="flat"
diff --git a/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-default-dark-chromium-linux.png b/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-default-dark-chromium-linux.png
index 94c0d341..9fed172b 100644
Binary files a/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-default-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-default-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-default-light-chromium-linux.png b/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-default-light-chromium-linux.png
index 0eac08cf..ee07dc67 100644
Binary files a/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-default-light-chromium-linux.png and b/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-default-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-ignoreText-dark-chromium-linux.png b/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-ignoreText-dark-chromium-linux.png
index 392c217a..8c75d2ab 100644
Binary files a/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-ignoreText-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-ignoreText-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-ignoreText-light-chromium-linux.png b/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-ignoreText-light-chromium-linux.png
index 44c54b40..d4b795a5 100644
Binary files a/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-ignoreText-light-chromium-linux.png and b/src/lib/kit/components/Inputs/FileInput/__snapshots__/FileInput.visual.test.tsx-snapshots/File-Input-view-ignoreText-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MonacoInput/MonacoHeader.scss b/src/lib/kit/components/Inputs/MonacoInput/MonacoHeader.scss
index 15562698..c59f077d 100644
--- a/src/lib/kit/components/Inputs/MonacoInput/MonacoHeader.scss
+++ b/src/lib/kit/components/Inputs/MonacoInput/MonacoHeader.scss
@@ -7,10 +7,4 @@
     padding: 15px;
     align-items: center;
     background-color: var(--g-color-base-float-hover);
-
-    &__language {
-        margin-top: 2px;
-        margin-left: 10px;
-        font-size: 16px;
-    }
 }
diff --git a/src/lib/kit/components/Inputs/MonacoInput/MonacoHeader.tsx b/src/lib/kit/components/Inputs/MonacoInput/MonacoHeader.tsx
index cc2d21ad..c215e4b8 100644
--- a/src/lib/kit/components/Inputs/MonacoInput/MonacoHeader.tsx
+++ b/src/lib/kit/components/Inputs/MonacoInput/MonacoHeader.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import {File} from '@gravity-ui/icons';
-import {Icon} from '@gravity-ui/uikit';
+import {Icon, Text} from '@gravity-ui/uikit';
 
 import {block} from '../../../utils';
 
@@ -18,7 +18,7 @@ export const MonacoHeader: React.FC<MonacoHeaderProps> = ({language, editButton}
     <div className={b()}>
         <div>
             <Icon data={File} size={18} />
-            <span className={b('language')}>{language}</span>
+            <Text variant="body-3">{language}</Text>
         </div>
         {editButton ?? null}
     </div>
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-full-dark-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-full-dark-chromium-linux.png
index 0aaf53ea..22206a7f 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-full-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-full-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-full-light-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-full-light-chromium-linux.png
index b2859363..a30433d2 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-full-light-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-full-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-row-verbose-dark-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-row-verbose-dark-chromium-linux.png
index 8a8c2eef..fb0a30ce 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-row-verbose-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-row-verbose-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-row-verbose-light-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-row-verbose-light-chromium-linux.png
index a00bafe0..eb72913d 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-row-verbose-light-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-row-verbose-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-transparent-dark-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-transparent-dark-chromium-linux.png
index 1a32eb8d..2c500182 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-transparent-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-transparent-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-transparent-light-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-transparent-light-chromium-linux.png
index 2aaa1d01..6a837dde 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-transparent-light-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-layouts-transparent-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-person-dark-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-person-dark-chromium-linux.png
index 8a8c2eef..fb0a30ce 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-person-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-person-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-person-light-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-person-light-chromium-linux.png
index a00bafe0..eb72913d 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-person-light-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-Flat-view-person-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-full-dark-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-full-dark-chromium-linux.png
index 92e6f6e7..732de829 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-full-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-full-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-full-light-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-full-light-chromium-linux.png
index ffeea3f0..4f876298 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-full-light-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-full-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-row-verbose-dark-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-row-verbose-dark-chromium-linux.png
index 0017667f..fe933ed6 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-row-verbose-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-row-verbose-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-row-verbose-light-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-row-verbose-light-chromium-linux.png
index 100ae12b..c1aaf95e 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-row-verbose-light-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-row-verbose-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-transparent-dark-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-transparent-dark-chromium-linux.png
index 436c4012..d519c84b 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-transparent-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-transparent-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-transparent-light-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-transparent-light-chromium-linux.png
index a9b7622a..fdbaf8ed 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-transparent-light-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-layouts-transparent-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-person-dark-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-person-dark-chromium-linux.png
index 0017667f..fe933ed6 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-person-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-person-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-person-light-chromium-linux.png b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-person-light-chromium-linux.png
index 100ae12b..c1aaf95e 100644
Binary files a/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-person-light-chromium-linux.png and b/src/lib/kit/components/Inputs/MultiOneOf/__snapshots__/MultiOneOf.visual.test.tsx-snapshots/Multi-OneOf-view-person-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-accordeon-dark-chromium-linux.png b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-accordeon-dark-chromium-linux.png
index 932a84c8..20c9b10e 100644
Binary files a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-accordeon-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-accordeon-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-accordeon-light-chromium-linux.png b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-accordeon-light-chromium-linux.png
index c1dbe185..ed6f4f8d 100644
Binary files a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-accordeon-light-chromium-linux.png and b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-accordeon-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-section-dark-chromium-linux.png b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-section-dark-chromium-linux.png
index ff9294be..8623e5c5 100644
Binary files a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-section-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-section-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-section-light-chromium-linux.png b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-section-light-chromium-linux.png
index f99ea5c0..acd329db 100644
Binary files a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-section-light-chromium-linux.png and b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-layouts-card-section-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-view-dark-chromium-linux.png b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-view-dark-chromium-linux.png
index 88326371..374acc6c 100644
Binary files a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-view-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-view-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-view-light-chromium-linux.png b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-view-light-chromium-linux.png
index 7ac1d822..3b064e85 100644
Binary files a/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-view-light-chromium-linux.png and b/src/lib/kit/components/Inputs/ObjectBase/__snapshots__/ObjectBase.visual.test.tsx-snapshots/Object-Base-view-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-boolean-dark-chromium-linux.png b/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-boolean-dark-chromium-linux.png
index fef06a03..7b9debd3 100644
Binary files a/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-boolean-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-boolean-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-boolean-light-chromium-linux.png b/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-boolean-light-chromium-linux.png
index 46a2ff9d..3f9631d9 100644
Binary files a/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-boolean-light-chromium-linux.png and b/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-boolean-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-string-dark-chromium-linux.png b/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-string-dark-chromium-linux.png
index b151b507..0aa881bd 100644
Binary files a/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-string-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-string-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-string-light-chromium-linux.png b/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-string-light-chromium-linux.png
index 5616dce0..25b57c1f 100644
Binary files a/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-string-light-chromium-linux.png and b/src/lib/kit/components/Inputs/ObjectValueInput/__snapshots__/ObjectValueInput.visual.test.tsx-snapshots/Object-value-input-view-string-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-row-verbose-dark-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-row-verbose-dark-chromium-linux.png
index f94008b6..3c3a7922 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-row-verbose-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-row-verbose-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-row-verbose-light-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-row-verbose-light-chromium-linux.png
index edb6c652..1c5ea851 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-row-verbose-light-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-row-verbose-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-transparent-dark-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-transparent-dark-chromium-linux.png
index 0bc80249..3811315b 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-transparent-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-transparent-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-transparent-light-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-transparent-light-chromium-linux.png
index ad8684be..b7125455 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-transparent-light-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-layouts-transparent-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-object-dark-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-object-dark-chromium-linux.png
index f94008b6..3c3a7922 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-object-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-object-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-object-light-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-object-light-chromium-linux.png
index edb6c652..1c5ea851 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-object-light-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-object-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-string-dark-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-string-dark-chromium-linux.png
index e6f0aadb..77fbf260 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-string-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-string-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-string-light-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-string-light-chromium-linux.png
index f7add2eb..976d70b0 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-string-light-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-Flat-view-string-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-row-verbose-dark-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-row-verbose-dark-chromium-linux.png
index b3b3d4ba..c8bd55d2 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-row-verbose-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-row-verbose-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-row-verbose-light-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-row-verbose-light-chromium-linux.png
index 29b54b6c..7f76e1c6 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-row-verbose-light-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-row-verbose-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-transparent-dark-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-transparent-dark-chromium-linux.png
index 32831398..f50e15e2 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-transparent-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-transparent-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-transparent-light-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-transparent-light-chromium-linux.png
index ceee5d54..fc10ef24 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-transparent-light-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-layouts-transparent-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-object-dark-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-object-dark-chromium-linux.png
index b3b3d4ba..c8bd55d2 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-object-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-object-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-object-light-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-object-light-chromium-linux.png
index 29b54b6c..7f76e1c6 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-object-light-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-object-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-string-dark-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-string-dark-chromium-linux.png
index 70ceac3c..b08362dd 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-string-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-string-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-string-light-chromium-linux.png b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-string-light-chromium-linux.png
index 26218146..ff09bd08 100644
Binary files a/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-string-light-chromium-linux.png and b/src/lib/kit/components/Inputs/OneOf/__snapshots__/OneOf.visual.test.tsx-snapshots/OneOf-view-string-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/Select/__snapshots__/Select.visual.test.tsx-snapshots/Select-View-dark-chromium-linux.png b/src/lib/kit/components/Inputs/Select/__snapshots__/Select.visual.test.tsx-snapshots/Select-View-dark-chromium-linux.png
index e397aa4b..de472e5a 100644
Binary files a/src/lib/kit/components/Inputs/Select/__snapshots__/Select.visual.test.tsx-snapshots/Select-View-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/Select/__snapshots__/Select.visual.test.tsx-snapshots/Select-View-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/Select/__snapshots__/Select.visual.test.tsx-snapshots/Select-View-light-chromium-linux.png b/src/lib/kit/components/Inputs/Select/__snapshots__/Select.visual.test.tsx-snapshots/Select-View-light-chromium-linux.png
index 6d728826..4234b745 100644
Binary files a/src/lib/kit/components/Inputs/Select/__snapshots__/Select.visual.test.tsx-snapshots/Select-View-light-chromium-linux.png and b/src/lib/kit/components/Inputs/Select/__snapshots__/Select.visual.test.tsx-snapshots/Select-View-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/Switch/__snapshots__/Switch.visual.test.tsx-snapshots/Switch-view-default-dark-chromium-linux.png b/src/lib/kit/components/Inputs/Switch/__snapshots__/Switch.visual.test.tsx-snapshots/Switch-view-default-dark-chromium-linux.png
index c1b00c02..a1a604a3 100644
Binary files a/src/lib/kit/components/Inputs/Switch/__snapshots__/Switch.visual.test.tsx-snapshots/Switch-view-default-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/Switch/__snapshots__/Switch.visual.test.tsx-snapshots/Switch-view-default-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/Switch/__snapshots__/Switch.visual.test.tsx-snapshots/Switch-view-default-light-chromium-linux.png b/src/lib/kit/components/Inputs/Switch/__snapshots__/Switch.visual.test.tsx-snapshots/Switch-view-default-light-chromium-linux.png
index 3b315b4b..fa6150b7 100644
Binary files a/src/lib/kit/components/Inputs/Switch/__snapshots__/Switch.visual.test.tsx-snapshots/Switch-view-default-light-chromium-linux.png and b/src/lib/kit/components/Inputs/Switch/__snapshots__/Switch.visual.test.tsx-snapshots/Switch-view-default-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-dark-chromium-linux.png b/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-dark-chromium-linux.png
index 5287c8fe..5fd33f5a 100644
Binary files a/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-dark-chromium-linux.png and b/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-dark-webkit-linux.png b/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-dark-webkit-linux.png
index efdfcbc9..ebf0eab7 100644
Binary files a/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-dark-webkit-linux.png and b/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-dark-webkit-linux.png differ
diff --git a/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-light-chromium-linux.png b/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-light-chromium-linux.png
index 1efeb1f9..8217b59d 100644
Binary files a/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-light-chromium-linux.png and b/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-light-webkit-linux.png b/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-light-webkit-linux.png
index 6a7aa77e..b53377bb 100644
Binary files a/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-light-webkit-linux.png and b/src/lib/kit/components/Inputs/TableArrayInput/__snapshots__/TableArrayInput.visual.test.tsx-snapshots/Table-Array-Input-view-default-light-webkit-linux.png differ
diff --git a/src/lib/kit/components/Inputs/TextContent/TextContent.tsx b/src/lib/kit/components/Inputs/TextContent/TextContent.tsx
index 439bb678..42854188 100644
--- a/src/lib/kit/components/Inputs/TextContent/TextContent.tsx
+++ b/src/lib/kit/components/Inputs/TextContent/TextContent.tsx
@@ -59,7 +59,7 @@ export const TextContent: React.FC<StringIndependentInputProps> = ({
                 {content}
                 {input.value ? (
                     <React.Fragment>
-                        <span className={b('separator')}>:</span>
+                        <Text className={b('separator')}>:</Text>
                         <Text color="secondary">{input.value}</Text>
                     </React.Fragment>
                 ) : null}
diff --git a/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-array-spec-dark-chromium-linux.png b/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-array-spec-dark-chromium-linux.png
index 8a676f3e..6d7617d2 100644
Binary files a/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-array-spec-dark-chromium-linux.png and b/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-array-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-array-spec-light-chromium-linux.png b/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-array-spec-light-chromium-linux.png
index eb124587..7d941eb6 100644
Binary files a/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-array-spec-light-chromium-linux.png and b/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-array-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-object-spec-dark-chromium-linux.png b/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-object-spec-dark-chromium-linux.png
index c34d12e0..324e3554 100644
Binary files a/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-object-spec-dark-chromium-linux.png and b/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-object-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-object-spec-light-chromium-linux.png b/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-object-spec-light-chromium-linux.png
index 7b648a80..d7ddcec2 100644
Binary files a/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-object-spec-light-chromium-linux.png and b/src/lib/kit/components/Layouts/Accordeon/__snapshots__/Accordeon.visual.test.tsx-snapshots/Accordeon-View-object-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Row/Row.tsx b/src/lib/kit/components/Layouts/Row/Row.tsx
index 603a051c..dcade9ad 100644
--- a/src/lib/kit/components/Layouts/Row/Row.tsx
+++ b/src/lib/kit/components/Layouts/Row/Row.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import {HelpPopover} from '@gravity-ui/components';
 import {TrashBin} from '@gravity-ui/icons';
-import {Button, Icon} from '@gravity-ui/uikit';
+import {Button, Icon, Text} from '@gravity-ui/uikit';
 import _ from 'lodash';
 
 import {
@@ -41,17 +41,17 @@ const RowBase = <T extends FieldValue, S extends Spec>({
         <div className={b()}>
             <div className={b('left')}>
                 <div className={b('left-inner')}>
-                    <span className={b('title', {required: spec.required})}>
+                    <Text className={b('title', {required: spec.required})}>
                         {spec.viewSpec.layoutTitle}
-                    </span>
+                    </Text>
                     {!verboseDescription && spec.viewSpec.layoutDescription ? (
                         <span className={b('note')}>
-                            <span className={b('note-inner')}>
+                            <Text className={b('note-inner')}>
                                 <HelpPopover
                                     htmlContent={spec.viewSpec.layoutDescription}
                                     placement={['bottom', 'top']}
                                 />
-                            </span>
+                            </Text>
                         </span>
                     ) : null}
                 </div>
diff --git a/src/lib/kit/components/Layouts/Section/Section.tsx b/src/lib/kit/components/Layouts/Section/Section.tsx
index 090ffe13..1c595a28 100644
--- a/src/lib/kit/components/Layouts/Section/Section.tsx
+++ b/src/lib/kit/components/Layouts/Section/Section.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import {HelpPopover} from '@gravity-ui/components';
-import {Popover} from '@gravity-ui/uikit';
+import {Popover, Text} from '@gravity-ui/uikit';
 
 import {GroupIndent} from '../../';
 import {COMMON_POPOVER_PLACEMENT, COMMON_TITLE_MAX_WIDTH, ErrorWrapper} from '../../../';
@@ -68,12 +68,12 @@ const SectionBase = <D extends FieldValue, T extends FormValue, S extends Spec>(
             );
         } else {
             description = (
-                <div className={b('note')}>
+                <Text className={b('note')}>
                     <HelpPopover
                         htmlContent={spec.viewSpec.layoutDescription}
                         placement={['bottom', 'top']}
                     />
-                </div>
+                </Text>
             );
         }
     }
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-array-spec-dark-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-array-spec-dark-chromium-linux.png
index 62795db1..c2a7020c 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-array-spec-dark-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-array-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-array-spec-light-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-array-spec-light-chromium-linux.png
index 75be8a45..7ffb16f1 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-array-spec-light-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-array-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-object-spec-dark-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-object-spec-dark-chromium-linux.png
index c0f8fef0..308286dd 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-object-spec-dark-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-object-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-object-spec-light-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-object-spec-light-chromium-linux.png
index b766ebc8..cbe43318 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-object-spec-light-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group-object-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-array-spec-dark-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-array-spec-dark-chromium-linux.png
index 564bbc34..22f2d7da 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-array-spec-dark-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-array-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-array-spec-light-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-array-spec-light-chromium-linux.png
index 74f8db91..e0044121 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-array-spec-light-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-array-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-object-spec-dark-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-object-spec-dark-chromium-linux.png
index 5fa3c2e1..3dbe3894 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-object-spec-dark-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-object-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-object-spec-light-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-object-spec-light-chromium-linux.png
index 93f02d86..749f9b9b 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-object-spec-light-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-group2-object-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-array-spec-dark-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-array-spec-dark-chromium-linux.png
index fd2e62ef..215eae10 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-array-spec-dark-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-array-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-array-spec-light-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-array-spec-light-chromium-linux.png
index 3a2a932e..6edc7a96 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-array-spec-light-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-array-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-object-spec-dark-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-object-spec-dark-chromium-linux.png
index 988c7843..7c673cb1 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-object-spec-dark-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-object-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-object-spec-light-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-object-spec-light-chromium-linux.png
index d15fc71f..a53c2c0e 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-object-spec-light-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section-object-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-array-spec-dark-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-array-spec-dark-chromium-linux.png
index 3b28fe0f..149ddd9a 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-array-spec-dark-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-array-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-array-spec-light-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-array-spec-light-chromium-linux.png
index 9433113f..2e5f7db3 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-array-spec-light-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-array-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-object-spec-dark-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-object-spec-dark-chromium-linux.png
index 528ae3b1..d22dfcb3 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-object-spec-dark-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-object-spec-dark-chromium-linux.png differ
diff --git a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-object-spec-light-chromium-linux.png b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-object-spec-light-chromium-linux.png
index adb21e63..97f27b42 100644
Binary files a/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-object-spec-light-chromium-linux.png and b/src/lib/kit/components/Layouts/Section/__snapshots__/Section.visual.test.tsx-snapshots/Section-View-section2-object-spec-light-chromium-linux.png differ
diff --git a/src/lib/kit/components/LongValue/LongValue.scss b/src/lib/kit/components/LongValue/LongValue.scss
index 14a090ed..0dcbfeb0 100644
--- a/src/lib/kit/components/LongValue/LongValue.scss
+++ b/src/lib/kit/components/LongValue/LongValue.scss
@@ -2,14 +2,6 @@
 
 .#{$ns}long-value {
     max-width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    &_open {
-        white-space: pre-wrap;
-        word-wrap: break-word;
-    }
-
     &_long {
         cursor: pointer;
 
diff --git a/src/lib/kit/components/LongValue/LongValue.tsx b/src/lib/kit/components/LongValue/LongValue.tsx
index e7e2f36f..390a91ac 100644
--- a/src/lib/kit/components/LongValue/LongValue.tsx
+++ b/src/lib/kit/components/LongValue/LongValue.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
 
+import {Text} from '@gravity-ui/uikit';
+
 import {block} from '../../utils';
 
 import './LongValue.scss';
@@ -19,6 +21,18 @@ export const LongValue: React.FC<LongValueProps> = ({value, className}) => {
 
     const handleClick = React.useCallback(() => setOpen((f) => !f), [setOpen]);
 
+    const currentTextProperies = React.useMemo(() => {
+        let wordBreak: 'break-all' | undefined;
+        let whiteSpace: 'break-spaces' | undefined;
+
+        if (open) {
+            wordBreak = 'break-all';
+            whiteSpace = 'break-spaces';
+        }
+
+        return {wordBreak, whiteSpace};
+    }, [open]);
+
     React.useEffect(() => {
         if (ref.current) {
             if (value !== prevValue.current) {
@@ -44,12 +58,10 @@ export const LongValue: React.FC<LongValueProps> = ({value, className}) => {
     });
 
     return (
-        <div
-            ref={ref}
-            className={b({open, long}, className)}
-            onClick={long ? handleClick : undefined}
-        >
-            {value}
+        <div ref={ref} onClick={long ? handleClick : undefined}>
+            <Text className={b({long}, className)} ellipsis={true} {...currentTextProperies}>
+                {value}
+            </Text>
         </div>
     );
 };
diff --git a/src/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.scss b/src/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.scss
index 63654544..2952e184 100644
--- a/src/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.scss
+++ b/src/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.scss
@@ -25,28 +25,6 @@ $animationDuration: 0.3s;
         }
     }
 
-    &__title {
-        font-weight: 500;
-
-        &_size_s {
-            margin-bottom: 0;
-
-            font-size: var(--g-text-body-1-font-size);
-        }
-
-        &_size_m {
-            margin-bottom: 1px;
-
-            font-size: var(--g-text-body2-font-size);
-        }
-
-        &_size_l {
-            margin-bottom: 2px;
-
-            font-size: var(--g-text-body3-font-size);
-        }
-    }
-
     &__tooltip {
         margin: 0px 5px;
 
diff --git a/src/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.tsx b/src/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.tsx
index 46c85cc2..60e0dade 100644
--- a/src/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.tsx
+++ b/src/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import {HelpPopover} from '@gravity-ui/components';
 import {ChevronDown} from '@gravity-ui/icons';
-import {Button, Icon, Popover} from '@gravity-ui/uikit';
+import {Button, Icon, Popover, Text} from '@gravity-ui/uikit';
 
 import {COMMON_POPOVER_PLACEMENT} from '../../constants/common';
 import {block} from '../../utils';
@@ -72,7 +72,6 @@ export class SimpleVerticalAccordeon extends React.Component<
 
     render() {
         const {
-            titleSize,
             children,
             headerActionsTemplate,
             className,
@@ -105,6 +104,8 @@ export class SimpleVerticalAccordeon extends React.Component<
         const titlePopoverDisabled =
             (this.titleRef.current?.offsetWidth || 0) <= TITLE_TEXT_MAX_WIDTH;
 
+        const currentTitleVariant = this.getCurrentTitleVariant();
+
         return (
             Boolean(React.Children.count(children)) && (
                 <div className={b({branch: withBranchView, view: viewLayout}, className)}>
@@ -121,9 +122,7 @@ export class SimpleVerticalAccordeon extends React.Component<
                                 qa={`${name}-accordeon-toggler`}
                                 width="auto"
                             >
-                                <b ref={this.titleRef} className={b('title', {size: titleSize})}>
-                                    {title}
-                                </b>
+                                <Text variant={currentTitleVariant}>{title}</Text>
                                 <Icon
                                     data={ChevronDown}
                                     className={b('chevron', {open})}
@@ -179,13 +178,27 @@ export class SimpleVerticalAccordeon extends React.Component<
         return this.state.open ? openTitle : title;
     }
 
+    private getCurrentTitleVariant() {
+        const {titleSize} = this.props;
+
+        if (titleSize === 'm') {
+            return 'body-2';
+        }
+
+        if (titleSize === 'l') {
+            return 'body-3';
+        }
+
+        return 'body-1';
+    }
+
     private getTooltip() {
         const {note} = this.props;
 
         return note ? (
-            <span className={b('tooltip')}>
+            <Text className={b('tooltip')}>
                 <HelpPopover htmlContent={note} placement={['bottom', 'top']} />
-            </span>
+            </Text>
         ) : null;
     }
 }
diff --git a/src/lib/kit/components/ViewLayouts/ViewRow/ViewRow.scss b/src/lib/kit/components/ViewLayouts/ViewRow/ViewRow.scss
index 085f1f99..14678a05 100644
--- a/src/lib/kit/components/ViewLayouts/ViewRow/ViewRow.scss
+++ b/src/lib/kit/components/ViewLayouts/ViewRow/ViewRow.scss
@@ -19,13 +19,6 @@
         overflow: hidden;
     }
 
-    &__title {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        color: var(--g-color-text-secondary);
-    }
-
     &__dots {
         min-width: 40px;
         flex-grow: 1;
diff --git a/src/lib/kit/components/ViewLayouts/ViewRow/ViewRow.tsx b/src/lib/kit/components/ViewLayouts/ViewRow/ViewRow.tsx
index d9c79d3d..d6ca85f4 100644
--- a/src/lib/kit/components/ViewLayouts/ViewRow/ViewRow.tsx
+++ b/src/lib/kit/components/ViewLayouts/ViewRow/ViewRow.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
 
+import {Text} from '@gravity-ui/uikit';
+
 import {FormValue, Spec, ViewLayoutProps} from '../../../../core';
 import {CopyButton} from '../../../../kit';
 import {block, isNotEmptyValue} from '../../../utils';
@@ -20,9 +22,9 @@ export const ViewRow = <T extends FormValue, S extends Spec>({
     return (
         <div className={b()}>
             <div className={b('left')}>
-                <div className={b('title')} title={spec.viewSpec.layoutTitle}>
+                <Text whiteSpace="nowrap" color="secondary" ellipsis={true}>
                     {spec.viewSpec.layoutTitle}
-                </div>
+                </Text>
                 <div className={b('dots')} />
             </div>
             <div className={b('right')}>{children}</div>
diff --git a/src/lib/kit/components/Views/NumberWithScaleView/NumberWithScaleView.tsx b/src/lib/kit/components/Views/NumberWithScaleView/NumberWithScaleView.tsx
index 74bbd0fc..44da88c3 100644
--- a/src/lib/kit/components/Views/NumberWithScaleView/NumberWithScaleView.tsx
+++ b/src/lib/kit/components/Views/NumberWithScaleView/NumberWithScaleView.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {Popover} from '@gravity-ui/uikit';
+import {Popover, Text} from '@gravity-ui/uikit';
 
 import {StringViewProps} from '../../../../core';
 import {block, isCorrectSizeParams} from '../../../utils';
@@ -25,7 +25,7 @@ const NumberWithScaleViewBase: React.FC<StringViewProps> = ({spec, value}) => {
             >
                 {initialValue}
             </Popover>
-            <span className={b('size')}> {scale[initialType].title}</span>
+            <Text className={b('size')}>{scale[initialType].title}</Text>
         </div>
     );
 };
diff --git a/src/lib/kit/components/Views/TextAreaView/TextAreaView.scss b/src/lib/kit/components/Views/TextAreaView/TextAreaView.scss
index 639ee954..f18e7019 100644
--- a/src/lib/kit/components/Views/TextAreaView/TextAreaView.scss
+++ b/src/lib/kit/components/Views/TextAreaView/TextAreaView.scss
@@ -7,16 +7,6 @@
         cursor: pointer;
     }
 
-    &__text-view {
-        overflow: hidden;
-        text-overflow: ellipsis;
-
-        &_open {
-            white-space: pre-wrap;
-            overflow-wrap: break-word;
-        }
-    }
-
     &__chevron {
         margin: 3px;
 
diff --git a/src/lib/kit/components/Views/TextAreaView/TextAreaView.tsx b/src/lib/kit/components/Views/TextAreaView/TextAreaView.tsx
index f64fcd59..aa22264a 100644
--- a/src/lib/kit/components/Views/TextAreaView/TextAreaView.tsx
+++ b/src/lib/kit/components/Views/TextAreaView/TextAreaView.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import {ChevronDown} from '@gravity-ui/icons';
-import {Icon} from '@gravity-ui/uikit';
+import {Icon, Text} from '@gravity-ui/uikit';
 
 import {StringView} from '../../../../core';
 import {block} from '../../../utils';
@@ -21,7 +21,9 @@ export const TextAreaView: StringView = ({value = ''}) => {
 
     return (
         <div className={b({active: isValueLong})} onClick={isValueLong ? handleClick : undefined}>
-            <div className={b('text-view', {open: isOpen})}>{value}</div>
+            <Text ellipsis={true} whiteSpace={isOpen ? 'break-spaces' : undefined}>
+                {value}
+            </Text>
             {isValueLong ? (
                 <div>
                     <Icon data={ChevronDown} className={b('chevron', {open: isOpen})} size={16} />