diff --git a/src/shared/types/commonTypes.ts b/src/shared/types/commonTypes.ts
index 211c0ef..168dd0c 100644
--- a/src/shared/types/commonTypes.ts
+++ b/src/shared/types/commonTypes.ts
@@ -1,2 +1,5 @@
 export type AnyFunctional = (...args: any[]) => any;
 export type ComponentWithClassNameProp = { className?: string };
+export type Optional<T> = {
+  [P in keyof T]?: T[P]
+};
diff --git a/src/shared/ui/Button/ButtonGeneral/ButtonGeneral.tsx b/src/shared/ui/Button/ButtonGeneral/ButtonGeneral.tsx
index 4ba79c8..d17a49b 100644
--- a/src/shared/ui/Button/ButtonGeneral/ButtonGeneral.tsx
+++ b/src/shared/ui/Button/ButtonGeneral/ButtonGeneral.tsx
@@ -25,15 +25,16 @@ export type ButtonGeneralProps =
   GeneralButtonSquare | GeneralAnchorSquare | GeneralLinkSquare | GeneralButtonIcon;
 
 export const ButtonGeneral: FC<ButtonGeneralProps> = (props) => {
-  const nessaryProps: CommonButtonUIProps = {
-    size: 'm',
-  };
-
   const {
     children,
+    typeButton,
   } = props;
 
-  switch (props.typeButton) {
+  const nessaryProps: CommonButtonUIProps = {
+    size: 'm',
+  };
+
+  switch (typeButton) {
     case 'ButtonSquare':
       return (
         <ButtonSquare {...props} {...nessaryProps}>
diff --git a/src/shared/ui/Button/ButtonIconUI/ButtonIconUI.tsx b/src/shared/ui/Button/ButtonIconUI/ButtonIconUI.tsx
index f71ab52..28ef9d8 100644
--- a/src/shared/ui/Button/ButtonIconUI/ButtonIconUI.tsx
+++ b/src/shared/ui/Button/ButtonIconUI/ButtonIconUI.tsx
@@ -9,15 +9,18 @@ export interface ButtonIconUIProps extends CommonButtonUIProps {
 }
 
 export const ButtonIconUI: FC<ButtonIconUIProps> = ({
-  children, round, classNameButton, ...restProps
+  children, round, classNameButton, disabled, invertedTheme, nonInteractive, size,
 }) => (
   <div
     className={classNames(
       s.buttonIconUI,
       round && s.round,
       classNameButton,
+      s[size],
+      disabled && s.disabled,
+      invertedTheme && s.invertedTheme,
+      nonInteractive && s.nonInteractive,
     )}
-    {...restProps}
   >
     {children}
   </div>
diff --git a/src/shared/ui/Button/ButtonSquare/ButtonSquare.tsx b/src/shared/ui/Button/ButtonSquare/ButtonSquare.tsx
index 5848a13..36aa1a7 100644
--- a/src/shared/ui/Button/ButtonSquare/ButtonSquare.tsx
+++ b/src/shared/ui/Button/ButtonSquare/ButtonSquare.tsx
@@ -20,7 +20,8 @@ export const ButtonSquare: FC<ButtonSquareProps> = ({
 }) => (
   <ButtonWrapper
     classNameWrapper={classNameWrapper}
-    disabled={disabled || isLoading}
+    disabled={disabled}
+    nonInteractive={nonInteractive}
     {...restProps}
   >
     <ButtonSquareUI
diff --git a/src/shared/ui/Button/ButtonWrapper/ButtonWrapper.tsx b/src/shared/ui/Button/ButtonWrapper/ButtonWrapper.tsx
index 99152d6..3a5df6e 100644
--- a/src/shared/ui/Button/ButtonWrapper/ButtonWrapper.tsx
+++ b/src/shared/ui/Button/ButtonWrapper/ButtonWrapper.tsx
@@ -1,10 +1,8 @@
-import { ComponentPropsWithoutRef, FC, ReactNode } from 'react';
-import { Wrapper } from '../Wrapper/Wrapper';
+import { ComponentPropsWithoutRef, FC } from 'react';
+import { Optional } from 'shared/types/commonTypes';
+import { Wrapper, WrapperProps } from '../Wrapper/Wrapper';
 
-export interface ButtonWrapperProps extends Omit<ComponentPropsWithoutRef<'button'>, 'className'> {
-  children: ReactNode;
-  classNameWrapper?: string;
-}
+export interface ButtonWrapperProps extends Omit<ComponentPropsWithoutRef<'button'>, 'className' | 'children'>, Optional<WrapperProps> {}
 
 export const ButtonWrapper: FC<ButtonWrapperProps> = ({ children, ...restProps }) => (
   <Wrapper
diff --git a/src/shared/ui/Button/Wrapper/Wrapper.module.scss b/src/shared/ui/Button/Wrapper/Wrapper.module.scss
index c2d0dab..4f74b61 100644
--- a/src/shared/ui/Button/Wrapper/Wrapper.module.scss
+++ b/src/shared/ui/Button/Wrapper/Wrapper.module.scss
@@ -6,3 +6,7 @@
   display: block;
   text-decoration: none;
 }
+
+.nonInteractive {
+  pointer-events: none;
+}
diff --git a/src/shared/ui/Button/Wrapper/Wrapper.tsx b/src/shared/ui/Button/Wrapper/Wrapper.tsx
index 1568eee..57b0bd9 100644
--- a/src/shared/ui/Button/Wrapper/Wrapper.tsx
+++ b/src/shared/ui/Button/Wrapper/Wrapper.tsx
@@ -15,10 +15,14 @@ export type WrapperProps = {
   tag: WrapperTags;
   children: React.ReactNode;
   classNameWrapper?: string,
+  nonInteractive?: boolean,
+  disabled?: boolean,
+  // TODO: Fix
+  typeButton?: any,
 };
 
 export const Wrapper: FC<WrapperProps> = ({
-  children, tag = 'button', classNameWrapper, ...restProps
+  children, tag = 'button', classNameWrapper, disabled, nonInteractive, typeButton, ...restProps
 }) => {
   if (tag === 'a') {
     const restPropsCopy = { ...restProps } as WrapperAttributes['a'];
@@ -42,7 +46,7 @@ export const Wrapper: FC<WrapperProps> = ({
 
   const restPropsCopy = { ...restProps } as WrapperAttributes['button'];
   return (
-    <button className={classNames(s.button, classNameWrapper)} type="button" {...restPropsCopy}>
+    <button disabled={disabled} className={classNames(s.button, classNameWrapper, nonInteractive && s.nonInteractive)} type="button" {...restPropsCopy}>
       {children}
     </button>
   );