diff --git a/uui/components/pickers/__tests__/__snapshots__/PickerInput.test.tsx.snap b/uui/components/pickers/__tests__/__snapshots__/PickerInput.test.tsx.snap
index c51aceb4de..3a0f9af412 100644
--- a/uui/components/pickers/__tests__/__snapshots__/PickerInput.test.tsx.snap
+++ b/uui/components/pickers/__tests__/__snapshots__/PickerInput.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`PickerInput should open body 1`] = `
 <body>
   <div>
     <div
-      class="container uui-input-box -clickable uui-focus root size-36 mode-form"
+      class="container uui-input-box -clickable uui-focus uui-picker-toggler root uui-size-36 mode-form"
       tabindex="-1"
     >
       <div
@@ -21,7 +21,7 @@ exports[`PickerInput should open body 1`] = `
         />
       </div>
       <div
-        class="actions"
+        class="uui-actions"
       >
         <div
           class="container uui-icon uui-enabled uui-icon-dropdown"
@@ -234,7 +234,7 @@ exports[`PickerInput should open body 1`] = `
 
 exports[`PickerInput should render icon at specific position 1`] = `
 <div
-  className="container uui-input-box -clickable root size-36 mode-form"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-36 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -242,7 +242,7 @@ exports[`PickerInput should render icon at specific position 1`] = `
   tabIndex={0}
 >
   <div
-    className="body multiline"
+    className="body uui-multiline"
   >
     <div
       className="container uui-icon uui-enabled"
@@ -265,7 +265,7 @@ exports[`PickerInput should render icon at specific position 1`] = `
     />
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       className="container uui-icon uui-enabled uui-icon-dropdown"
@@ -281,7 +281,7 @@ exports[`PickerInput should render icon at specific position 1`] = `
 
 exports[`PickerInput should render icon at specific position 2`] = `
 <div
-  className="container uui-input-box -clickable root size-36 mode-form"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-36 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -289,7 +289,7 @@ exports[`PickerInput should render icon at specific position 2`] = `
   tabIndex={0}
 >
   <div
-    className="body multiline"
+    className="body uui-multiline"
   >
     <div
       className="container uui-icon uui-enabled"
@@ -312,7 +312,7 @@ exports[`PickerInput should render icon at specific position 2`] = `
     />
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       className="container uui-icon uui-enabled uui-icon-dropdown"
@@ -328,7 +328,7 @@ exports[`PickerInput should render icon at specific position 2`] = `
 
 exports[`PickerInput should render icon at specific position 3`] = `
 <div
-  className="container uui-input-box -clickable root size-36 mode-form"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-36 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -336,7 +336,7 @@ exports[`PickerInput should render icon at specific position 3`] = `
   tabIndex={0}
 >
   <div
-    className="body multiline"
+    className="body uui-multiline"
   >
     <input
       aria-haspopup={true}
@@ -359,7 +359,7 @@ exports[`PickerInput should render icon at specific position 3`] = `
     </div>
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       className="container uui-icon uui-enabled uui-icon-dropdown"
@@ -375,7 +375,7 @@ exports[`PickerInput should render icon at specific position 3`] = `
 
 exports[`PickerInput should render input as invalid 1`] = `
 <div
-  className="container uui-input-box uui-invalid -clickable root size-36 mode-form"
+  className="container uui-input-box uui-invalid -clickable uui-picker-toggler root uui-size-36 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -398,7 +398,7 @@ exports[`PickerInput should render input as invalid 1`] = `
     />
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       className="container uui-icon uui-enabled uui-icon-dropdown"
@@ -414,7 +414,7 @@ exports[`PickerInput should render input as invalid 1`] = `
 
 exports[`PickerInput should render with maximum props 1`] = `
 <div
-  className="container uui-input-box -clickable root size-48 mode-form"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-48 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -422,10 +422,10 @@ exports[`PickerInput should render with maximum props 1`] = `
   tabIndex={0}
 >
   <div
-    className="body multiline"
+    className="body uui-multiline"
   >
     <span
-      className="uui-button-box uui-enabled size-42 root uui-color-neutral uui-fill-solid uui-tag"
+      className="uui-button-box uui-enabled root uui-size-inherit uui-color-neutral uui-fill-solid uui-tag"
       tabIndex={-1}
     >
       <div
@@ -444,7 +444,7 @@ exports[`PickerInput should render with maximum props 1`] = `
       </div>
     </span>
     <span
-      className="uui-button-box uui-enabled size-42 root uui-color-neutral uui-fill-solid uui-tag"
+      className="uui-button-box uui-enabled root uui-size-inherit uui-color-neutral uui-fill-solid uui-tag"
       tabIndex={-1}
     >
       <div
@@ -464,7 +464,7 @@ exports[`PickerInput should render with maximum props 1`] = `
     </span>
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       aria-label="Clear"
@@ -484,7 +484,7 @@ exports[`PickerInput should render with maximum props 1`] = `
 
 exports[`PickerInput should render with minimum props 1`] = `
 <div
-  className="container uui-input-box -clickable root size-36 mode-form"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-36 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -507,7 +507,7 @@ exports[`PickerInput should render with minimum props 1`] = `
     />
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       className="container uui-icon uui-enabled uui-icon-dropdown"
@@ -523,7 +523,7 @@ exports[`PickerInput should render with minimum props 1`] = `
 
 exports[`PickerInput should render with mode = cell 1`] = `
 <div
-  className="container uui-input-box -clickable root size-36 mode-cell"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-36 mode-cell"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -531,7 +531,7 @@ exports[`PickerInput should render with mode = cell 1`] = `
   tabIndex={0}
 >
   <div
-    className="body multiline"
+    className="body uui-multiline"
   >
     <input
       aria-haspopup={true}
@@ -546,7 +546,7 @@ exports[`PickerInput should render with mode = cell 1`] = `
     />
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       className="container uui-icon uui-enabled uui-icon-dropdown"
@@ -562,7 +562,7 @@ exports[`PickerInput should render with mode = cell 1`] = `
 
 exports[`PickerInput should render with mode = form 1`] = `
 <div
-  className="container uui-input-box -clickable root size-36 mode-form"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-36 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -570,7 +570,7 @@ exports[`PickerInput should render with mode = form 1`] = `
   tabIndex={0}
 >
   <div
-    className="body multiline"
+    className="body uui-multiline"
   >
     <input
       aria-haspopup={true}
@@ -585,7 +585,7 @@ exports[`PickerInput should render with mode = form 1`] = `
     />
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       className="container uui-icon uui-enabled uui-icon-dropdown"
@@ -601,7 +601,7 @@ exports[`PickerInput should render with mode = form 1`] = `
 
 exports[`PickerInput should render with mode = inline 1`] = `
 <div
-  className="container uui-input-box -clickable root size-36 mode-inline"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-36 mode-inline"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -609,7 +609,7 @@ exports[`PickerInput should render with mode = inline 1`] = `
   tabIndex={0}
 >
   <div
-    className="body multiline"
+    className="body uui-multiline"
   >
     <input
       aria-haspopup={true}
@@ -624,7 +624,7 @@ exports[`PickerInput should render with mode = inline 1`] = `
     />
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       className="container uui-icon uui-enabled uui-icon-dropdown"
@@ -640,7 +640,7 @@ exports[`PickerInput should render with mode = inline 1`] = `
 
 exports[`PickerInput should render with mode = undefined 1`] = `
 <div
-  className="container uui-input-box -clickable root size-36 mode-form"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-36 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -648,7 +648,7 @@ exports[`PickerInput should render with mode = undefined 1`] = `
   tabIndex={0}
 >
   <div
-    className="body multiline"
+    className="body uui-multiline"
   >
     <input
       aria-haspopup={true}
@@ -663,7 +663,7 @@ exports[`PickerInput should render with mode = undefined 1`] = `
     />
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       className="container uui-icon uui-enabled uui-icon-dropdown"
@@ -679,7 +679,7 @@ exports[`PickerInput should render with mode = undefined 1`] = `
 
 exports[`PickerInput should support single line 1`] = `
 <div
-  className="container uui-input-box -clickable root size-36 mode-form"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-36 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -702,7 +702,7 @@ exports[`PickerInput should support single line 1`] = `
     />
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       className="container uui-icon uui-enabled uui-icon-dropdown"
diff --git a/uui/components/pickers/__tests__/__snapshots__/PickerToggler.test.tsx.snap b/uui/components/pickers/__tests__/__snapshots__/PickerToggler.test.tsx.snap
index 62e58ca671..1e71bc95f6 100644
--- a/uui/components/pickers/__tests__/__snapshots__/PickerToggler.test.tsx.snap
+++ b/uui/components/pickers/__tests__/__snapshots__/PickerToggler.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`PickerToggler should render with maximum props 1`] = `
 <div
-  className="container uui-input-box -clickable root size-48 mode-form"
+  className="container uui-input-box -clickable uui-picker-toggler root uui-size-48 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -10,10 +10,10 @@ exports[`PickerToggler should render with maximum props 1`] = `
   tabIndex={0}
 >
   <div
-    className="body multiline"
+    className="body uui-multiline"
   >
     <span
-      className="uui-button-box uui-enabled size-42 root uui-color-neutral uui-fill-solid uui-tag"
+      className="uui-button-box uui-enabled root uui-size-inherit uui-color-neutral uui-fill-solid uui-tag"
       tabIndex={-1}
     >
       <div
@@ -33,7 +33,7 @@ exports[`PickerToggler should render with maximum props 1`] = `
     </span>
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   >
     <div
       aria-label="Clear"
@@ -53,7 +53,7 @@ exports[`PickerToggler should render with maximum props 1`] = `
 
 exports[`PickerToggler should render with minimum props 1`] = `
 <div
-  className="container uui-input-box root size-36 mode-form"
+  className="container uui-input-box uui-picker-toggler root uui-size-36 mode-form"
   onBlur={[Function]}
   onClick={[Function]}
   onFocus={[Function]}
@@ -73,7 +73,7 @@ exports[`PickerToggler should render with minimum props 1`] = `
     />
   </div>
   <div
-    className="actions"
+    className="uui-actions"
   />
 </div>
 `;
diff --git a/uui/components/tables/columnsConfigurationModal/__tests__/__snapshots__/ColumnsConfigurationModal.test.tsx.snap b/uui/components/tables/columnsConfigurationModal/__tests__/__snapshots__/ColumnsConfigurationModal.test.tsx.snap
index 170af361b8..61b724aaa9 100644
--- a/uui/components/tables/columnsConfigurationModal/__tests__/__snapshots__/ColumnsConfigurationModal.test.tsx.snap
+++ b/uui/components/tables/columnsConfigurationModal/__tests__/__snapshots__/ColumnsConfigurationModal.test.tsx.snap
@@ -173,7 +173,7 @@ exports[`ColumnsConfigurationModal should be rendered correctly 1`] = `
               Displayed in table
             </div>
             <div
-              className="root uui-count_indicator size-18 uui-color-neutral"
+              className="root uui-count_indicator uui-size-18 uui-color-neutral"
             >
               2
             </div>
diff --git a/uui/components/widgets/__tests__/__snapshots__/Badge.test.tsx.snap b/uui/components/widgets/__tests__/__snapshots__/Badge.test.tsx.snap
index 83038e83ee..1db71dfe62 100644
--- a/uui/components/widgets/__tests__/__snapshots__/Badge.test.tsx.snap
+++ b/uui/components/widgets/__tests__/__snapshots__/Badge.test.tsx.snap
@@ -30,7 +30,7 @@ exports[`Badge should be rendered correctly with props 1`] = `
     Test badge
   </div>
   <div
-    className="root uui-count_indicator size-18"
+    className="root uui-count_indicator uui-size-18"
   >
     12
   </div>
diff --git a/uui/components/widgets/__tests__/__snapshots__/Tag.test.tsx.snap b/uui/components/widgets/__tests__/__snapshots__/Tag.test.tsx.snap
index 25381f2d9d..6a9ff84653 100644
--- a/uui/components/widgets/__tests__/__snapshots__/Tag.test.tsx.snap
+++ b/uui/components/widgets/__tests__/__snapshots__/Tag.test.tsx.snap
@@ -2,14 +2,14 @@
 
 exports[`Tag should be rendered correctly 1`] = `
 <span
-  className="uui-button-box uui-enabled size-36 root uui-color-neutral uui-fill-solid uui-tag"
+  className="uui-button-box uui-enabled root uui-size-36 uui-color-neutral uui-fill-solid uui-tag"
   tabIndex={-1}
 />
 `;
 
 exports[`Tag should be rendered correctly with props 1`] = `
 <button
-  className="uui-button-box uui-enabled -clickable size-36 root uui-color-neutral uui-fill-solid uui-tag"
+  className="uui-button-box uui-enabled -clickable root uui-size-36 uui-color-neutral uui-fill-solid uui-tag"
   onClick={[Function]}
   tabIndex={0}
   type="button"
@@ -29,7 +29,7 @@ exports[`Tag should be rendered correctly with props 1`] = `
     Test badge
   </div>
   <div
-    className="root uui-count_indicator size-18 uui-color-white"
+    className="root uui-count_indicator uui-size-18 uui-color-white"
   >
     12
   </div>
