diff --git a/src/app/deals/components/shared/CreateDealButton/components/CreateCardForm.tsx b/src/app/deals/components/shared/CreateDealButton/components/CreateCardForm.tsx
index 2f22a06..1ad6d57 100644
--- a/src/app/deals/components/shared/CreateDealButton/components/CreateCardForm.tsx
+++ b/src/app/deals/components/shared/CreateDealButton/components/CreateCardForm.tsx
@@ -4,7 +4,7 @@ import { Button, Group, Stack, TextInput } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { useProjectsContext } from "@/app/deals/contexts/ProjectsContext";
 import { ClientSchema } from "@/lib/client";
-import ClientSelect from "@/modules/dealModularEditorTabs/Clients/shared/components/ClientSelect";
+import ClientSelect from "@/modules/dealModularEditorTabs/Clients/components/ClientSelect";
 import { ModuleNames } from "@/modules/modules";
 
 export type CreateDealForm = {
diff --git a/src/app/deals/drawers/BoardsMobileEditorDrawer/BoardsMobileEditorDrawer.tsx b/src/app/deals/drawers/BoardsMobileEditorDrawer/BoardsMobileEditorDrawer.tsx
index 13aa1ff..b4014e4 100644
--- a/src/app/deals/drawers/BoardsMobileEditorDrawer/BoardsMobileEditorDrawer.tsx
+++ b/src/app/deals/drawers/BoardsMobileEditorDrawer/BoardsMobileEditorDrawer.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import React, { FC } from "react";
-import { Drawer, rem } from "@mantine/core";
+import { Drawer } from "@mantine/core";
 import BoardsDrawerBody from "@/app/deals/drawers/BoardsMobileEditorDrawer/components/BoardsDrawerBody";
 import { BoardsMobileContextProvider } from "@/app/deals/drawers/BoardsMobileEditorDrawer/contexts/BoardsMobileContext";
 import { DrawerProps } from "@/drawers/types";
@@ -30,7 +30,7 @@ const BoardsMobileEditorDrawer: FC<DrawerProps<Props>> = ({
                     height: "100%",
                     display: "flex",
                     flexDirection: "column",
-                    gap: rem(10),
+                    gap: "xs",
                 },
             }}>
             <BoardsMobileContextProvider project={project}>
diff --git a/src/app/deals/drawers/ProjectsMobileEditorDrawer/ProjectsMobileEditorDrawer.tsx b/src/app/deals/drawers/ProjectsMobileEditorDrawer/ProjectsMobileEditorDrawer.tsx
index adca77a..432df0c 100644
--- a/src/app/deals/drawers/ProjectsMobileEditorDrawer/ProjectsMobileEditorDrawer.tsx
+++ b/src/app/deals/drawers/ProjectsMobileEditorDrawer/ProjectsMobileEditorDrawer.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import React, { FC } from "react";
-import { Center, Divider, Drawer, rem, Text } from "@mantine/core";
+import { Center, Divider, Drawer, Text } from "@mantine/core";
 import { ProjectsContextProvider } from "@/app/deals/contexts/ProjectsContext";
 import ProjectsDrawerBody from "@/app/deals/drawers/StatusesMobileEditorDrawer/components/ProjectsDrawerBody";
 import { DrawerProps } from "@/drawers/types";
@@ -30,7 +30,7 @@ const ProjectsMobileEditorDrawer: FC<DrawerProps<Props>> = ({
                     height: "100%",
                     display: "flex",
                     flexDirection: "column",
-                    gap: rem(10),
+                    gap: "xs",
                 },
             }}>
             <Center>
diff --git a/src/app/deals/drawers/StatusesMobileEditorDrawer/StatusesMobileEditorDrawer.tsx b/src/app/deals/drawers/StatusesMobileEditorDrawer/StatusesMobileEditorDrawer.tsx
index ca900aa..350ea1f 100644
--- a/src/app/deals/drawers/StatusesMobileEditorDrawer/StatusesMobileEditorDrawer.tsx
+++ b/src/app/deals/drawers/StatusesMobileEditorDrawer/StatusesMobileEditorDrawer.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import React, { FC } from "react";
-import { Drawer, rem } from "@mantine/core";
+import { Drawer } from "@mantine/core";
 import StatusesDrawerBody from "@/app/deals/drawers/StatusesMobileEditorDrawer/components/StatusesDrawerBody";
 import { StatusesMobileContextProvider } from "@/app/deals/drawers/StatusesMobileEditorDrawer/contexts/BoardStatusesContext";
 import { DrawerProps } from "@/drawers/types";
@@ -30,7 +30,7 @@ const StatusesMobileEditorDrawer: FC<DrawerProps<Props>> = ({
                     height: "100%",
                     display: "flex",
                     flexDirection: "column",
-                    gap: rem(10),
+                    gap: "xs",
                 },
             }}>
             <StatusesMobileContextProvider board={board}>
diff --git a/src/app/deals/modals/DealsBoardFiltersModal/DealsBoardFiltersModal.tsx b/src/app/deals/modals/DealsBoardFiltersModal/DealsBoardFiltersModal.tsx
index a41ea95..a65da58 100644
--- a/src/app/deals/modals/DealsBoardFiltersModal/DealsBoardFiltersModal.tsx
+++ b/src/app/deals/modals/DealsBoardFiltersModal/DealsBoardFiltersModal.tsx
@@ -4,7 +4,6 @@ import {
     Button,
     Flex,
     NumberInput,
-    rem,
     Space,
     Text,
     TextInput,
@@ -37,7 +36,7 @@ const DealsBoardFiltersModal = ({
     return (
         <form onSubmit={filtersForm.onSubmit(onSubmit)}>
             <Flex
-                gap={rem(10)}
+                gap={"xs"}
                 direction={"column"}>
                 <NumberInput
                     label={"ID"}
diff --git a/src/app/deals/modals/DealsScheduleFiltersModal/DealsScheduleFiltersModal.tsx b/src/app/deals/modals/DealsScheduleFiltersModal/DealsScheduleFiltersModal.tsx
index 5525d41..9341e3c 100644
--- a/src/app/deals/modals/DealsScheduleFiltersModal/DealsScheduleFiltersModal.tsx
+++ b/src/app/deals/modals/DealsScheduleFiltersModal/DealsScheduleFiltersModal.tsx
@@ -4,7 +4,6 @@ import {
     Button,
     Flex,
     NumberInput,
-    rem,
     Space,
     Text,
     TextInput,
@@ -39,7 +38,7 @@ const DealsScheduleFiltersModal = ({
     return (
         <form onSubmit={filtersForm.onSubmit(onSubmit)}>
             <Flex
-                gap={rem(10)}
+                gap={"xs"}
                 direction={"column"}>
                 <NumberInput
                     label={"ID"}
diff --git a/src/app/deals/modals/DealsTableFiltersModal/DealsTableFiltersModal.tsx b/src/app/deals/modals/DealsTableFiltersModal/DealsTableFiltersModal.tsx
index dc54433..9e4b833 100644
--- a/src/app/deals/modals/DealsTableFiltersModal/DealsTableFiltersModal.tsx
+++ b/src/app/deals/modals/DealsTableFiltersModal/DealsTableFiltersModal.tsx
@@ -4,7 +4,6 @@ import {
     Button,
     Flex,
     NumberInput,
-    rem,
     Space,
     Text,
     TextInput,
@@ -39,7 +38,7 @@ const DealsTableFiltersModal = ({
     return (
         <form onSubmit={filtersForm.onSubmit(onSubmit)}>
             <Flex
-                gap={rem(10)}
+                gap={"xs"}
                 direction={"column"}>
                 <NumberInput
                     label={"ID"}
diff --git a/src/app/services/components/shared/ServicesTable/ServicesTable.module.css b/src/app/services/components/shared/ServicesTable/ServicesTable.module.css
index 8a09005..2781cba 100644
--- a/src/app/services/components/shared/ServicesTable/ServicesTable.module.css
+++ b/src/app/services/components/shared/ServicesTable/ServicesTable.module.css
@@ -1,4 +1,4 @@
 .draggable-row[data-is-dragging='true'] td {
     opacity: 0.75;
-    border: rem(1px) solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
+    border: 1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4));
 }
diff --git a/src/app/services/modals/ServiceEditorModal/components/RangePriceInput.tsx b/src/app/services/modals/ServiceEditorModal/components/RangePriceInput.tsx
index 2dc81c4..c3e48b1 100644
--- a/src/app/services/modals/ServiceEditorModal/components/RangePriceInput.tsx
+++ b/src/app/services/modals/ServiceEditorModal/components/RangePriceInput.tsx
@@ -1,7 +1,7 @@
 import { FC } from "react";
 import { IconTrash } from "@tabler/icons-react";
 import { isNumber } from "lodash";
-import { Flex, Input, NumberInput, rem } from "@mantine/core";
+import { Flex, Input, NumberInput } from "@mantine/core";
 import ActionIconWithTip from "@/components/ui/ActionIconWithTip/ActionIconWithTip";
 import InlineButton from "@/components/ui/InlineButton/InlineButton";
 import { ServicePriceRangeSchema } from "@/lib/client";
@@ -50,7 +50,7 @@ const RangePriceInput: FC<PriceRangeInputType> = props => {
                 {props.value.map((range, idx) => (
                     <Flex
                         key={idx}
-                        gap={rem(10)}
+                        gap={"xs"}
                         align={"flex-end"}>
                         <ActionIconWithTip onClick={() => onDeleteRange(idx)}>
                             <IconTrash />
diff --git a/src/components/ui/ImageDropzone/ImageDropzone.tsx b/src/components/ui/ImageDropzone/ImageDropzone.tsx
index 010ffbc..5ca5004 100644
--- a/src/components/ui/ImageDropzone/ImageDropzone.tsx
+++ b/src/components/ui/ImageDropzone/ImageDropzone.tsx
@@ -98,7 +98,7 @@ const ImageDropzone: FC<Props> = (props: Props) => {
 
     return (
         <Flex
-            gap={rem(10)}
+            gap={"xs"}
             direction={"column"}>
             <Fieldset legend={"Изображение"}>
                 <Flex justify={"center"}>
diff --git a/src/modals/EnterNameModal/EnterNameModal.tsx b/src/modals/EnterNameModal/EnterNameModal.tsx
index 3059f9d..2bcb279 100644
--- a/src/modals/EnterNameModal/EnterNameModal.tsx
+++ b/src/modals/EnterNameModal/EnterNameModal.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Button, Flex, rem, TextInput } from "@mantine/core";
+import { Button, Flex, TextInput } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { ContextModalProps } from "@mantine/modals";
 
@@ -35,7 +35,7 @@ const EnterNameModal = ({
     return (
         <form onSubmit={form.onSubmit(values => onSubmit(values))}>
             <Flex
-                gap={rem(10)}
+                gap={"xs"}
                 direction={"column"}>
                 <TextInput
                     {...form.getInputProps("name")}
diff --git a/src/modules/dealModularEditorTabs/Clients/shared/ClientsTab.tsx b/src/modules/dealModularEditorTabs/Clients/ClientsTab.tsx
similarity index 78%
rename from src/modules/dealModularEditorTabs/Clients/shared/ClientsTab.tsx
rename to src/modules/dealModularEditorTabs/Clients/ClientsTab.tsx
index 84502ea..6897f8c 100644
--- a/src/modules/dealModularEditorTabs/Clients/shared/ClientsTab.tsx
+++ b/src/modules/dealModularEditorTabs/Clients/ClientsTab.tsx
@@ -1,9 +1,9 @@
 import { FC } from "react";
 import { Stack } from "@mantine/core";
 import { DealSchema } from "@/lib/client";
-import ClientDataForm from "@/modules/dealModularEditorTabs/Clients/shared/components/ClientDataForm";
-import ClientSelectForm from "@/modules/dealModularEditorTabs/Clients/shared/components/ClientSelectForm";
-import { ClientTabContextProvider } from "@/modules/dealModularEditorTabs/Clients/shared/contexts/ClientTabContext";
+import ClientDataForm from "@/modules/dealModularEditorTabs/Clients/components/ClientDataForm";
+import ClientSelectForm from "@/modules/dealModularEditorTabs/Clients/components/ClientSelectForm";
+import { ClientTabContextProvider } from "./contexts/ClientTabContext";
 
 type Props = {
     value: DealSchema;
diff --git a/src/modules/dealModularEditorTabs/Clients/shared/components/ClientDataForm.tsx b/src/modules/dealModularEditorTabs/Clients/components/ClientDataForm.tsx
similarity index 100%
rename from src/modules/dealModularEditorTabs/Clients/shared/components/ClientDataForm.tsx
rename to src/modules/dealModularEditorTabs/Clients/components/ClientDataForm.tsx
diff --git a/src/modules/dealModularEditorTabs/Clients/shared/components/ClientSelect.tsx b/src/modules/dealModularEditorTabs/Clients/components/ClientSelect.tsx
similarity index 100%
rename from src/modules/dealModularEditorTabs/Clients/shared/components/ClientSelect.tsx
rename to src/modules/dealModularEditorTabs/Clients/components/ClientSelect.tsx
diff --git a/src/modules/dealModularEditorTabs/Clients/shared/components/ClientSelectForm.tsx b/src/modules/dealModularEditorTabs/Clients/components/ClientSelectForm.tsx
similarity index 97%
rename from src/modules/dealModularEditorTabs/Clients/shared/components/ClientSelectForm.tsx
rename to src/modules/dealModularEditorTabs/Clients/components/ClientSelectForm.tsx
index 598c654..5ffe259 100644
--- a/src/modules/dealModularEditorTabs/Clients/shared/components/ClientSelectForm.tsx
+++ b/src/modules/dealModularEditorTabs/Clients/components/ClientSelectForm.tsx
@@ -1,7 +1,7 @@
 import { Fieldset, Group, Stack } from "@mantine/core";
 import InlineButton from "@/components/ui/InlineButton/InlineButton";
 import useIsMobile from "@/hooks/utils/useIsMobile";
-import ClientSelect from "@/modules/dealModularEditorTabs/Clients/shared/components/ClientSelect";
+import ClientSelect from "@/modules/dealModularEditorTabs/Clients/components/ClientSelect";
 import { useClientTabContext } from "../contexts/ClientTabContext";
 
 const ClientSelectForm = () => {
diff --git a/src/modules/dealModularEditorTabs/Clients/shared/contexts/ClientTabContext.tsx b/src/modules/dealModularEditorTabs/Clients/contexts/ClientTabContext.tsx
similarity index 100%
rename from src/modules/dealModularEditorTabs/Clients/shared/contexts/ClientTabContext.tsx
rename to src/modules/dealModularEditorTabs/Clients/contexts/ClientTabContext.tsx
diff --git a/src/modules/dealModularEditorTabs/FulfillmentBase/desktop/components/DealServicesTable/components/DealServiceRow.tsx b/src/modules/dealModularEditorTabs/FulfillmentBase/desktop/components/DealServicesTable/components/DealServiceRow.tsx
index 5ae9483..2b9c591 100644
--- a/src/modules/dealModularEditorTabs/FulfillmentBase/desktop/components/DealServicesTable/components/DealServiceRow.tsx
+++ b/src/modules/dealModularEditorTabs/FulfillmentBase/desktop/components/DealServicesTable/components/DealServiceRow.tsx
@@ -1,7 +1,7 @@
 import { FC } from "react";
 import { IconTrash } from "@tabler/icons-react";
 import { isNumber } from "lodash";
-import { Divider, Group, NumberInput, rem, Stack, Text } from "@mantine/core";
+import { Divider, Group, NumberInput, Stack, Text } from "@mantine/core";
 import { useDebouncedCallback } from "@mantine/hooks";
 import ActionIconWithTip from "@/components/ui/ActionIconWithTip/ActionIconWithTip";
 import { DealServiceSchema } from "@/lib/client";
@@ -64,7 +64,7 @@ const DealServiceRow: FC<Props> = ({ value, onChange, onDelete }) => {
                             display: "flex",
                             cursor: "pointer",
                             pointerEvents: "auto",
-                            paddingRight: rem(10),
+                            paddingRight: "xs",
                         },
                     }}
                     rightSection={
diff --git a/src/modules/dealModularEditorTabs/FulfillmentBase/shared/modals/ProductEditorModal/ProductEditorModal.tsx b/src/modules/dealModularEditorTabs/FulfillmentBase/shared/modals/ProductEditorModal/ProductEditorModal.tsx
index 10bf63b..07736a4 100644
--- a/src/modules/dealModularEditorTabs/FulfillmentBase/shared/modals/ProductEditorModal/ProductEditorModal.tsx
+++ b/src/modules/dealModularEditorTabs/FulfillmentBase/shared/modals/ProductEditorModal/ProductEditorModal.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Fieldset, Flex, rem, TextInput } from "@mantine/core";
+import { Fieldset, Flex, TextInput } from "@mantine/core";
 import { useForm } from "@mantine/form";
 import { ContextModalProps } from "@mantine/modals";
 import {
@@ -59,7 +59,7 @@ const ProductEditorModal = ({
             closeOnSubmit
             onClose={onClose}>
             <Flex
-                gap={rem(10)}
+                gap={"xs"}
                 direction={"column"}>
                 <Fieldset legend={"Основные характеристики"}>
                     <TextInput
diff --git a/src/modules/dealModularEditorTabs/index.ts b/src/modules/dealModularEditorTabs/index.ts
index 3f23561..e27c210 100644
--- a/src/modules/dealModularEditorTabs/index.ts
+++ b/src/modules/dealModularEditorTabs/index.ts
@@ -1,4 +1,4 @@
 export { default as CommonServicesTab } from "@/modules/dealModularEditorTabs/FulfillmentBase/mobile/CommonServicesTab";
 export { default as FulfillmentBaseTab } from "@/modules/dealModularEditorTabs/FulfillmentBase/desktop/FulfillmentBaseTab";
 export { default as ProductsTab } from "@/modules/dealModularEditorTabs/FulfillmentBase/mobile/ProductsTab";
-export { default as ClientsTab } from "@/modules/dealModularEditorTabs/Clients/shared/ClientsTab";
+export { default as ClientsTab } from "@/modules/dealModularEditorTabs/Clients/ClientsTab";