diff --git a/app/org/(panel)/organizations/[organizationId]/(components)/OrganizationHeader/OrganizationHeader.tsx b/app/org/(panel)/organizations/[organizationId]/(components)/OrganizationHeader/OrganizationHeader.tsx
index 7c67db68..9dc3d738 100644
--- a/app/org/(panel)/organizations/[organizationId]/(components)/OrganizationHeader/OrganizationHeader.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/(components)/OrganizationHeader/OrganizationHeader.tsx
@@ -1,6 +1,6 @@
 import Image from 'next/image';
 
-import background from '@/assets/images/background/organization.png';
+import organizationBackgroundImage from '@/assets/images/background/organization.png';
 import logo from '@/assets/images/logo/organization.png';
 import { I18nText } from '@/components/common';
 import { Typography } from '@/components/ui';
@@ -16,20 +16,23 @@ export const OrganizationHeader = ({ organization }: OrganizationHeaderProps) =>
     <div className='relative mt-2.5 flex h-64 w-full flex-col items-center'>
       <Image
         priority={false}
-        className='h-[168px] w-full rounded-lg'
-        src={organization.background || background}
+        className='h-[168px] w-full rounded-lg object-cover'
+        src={organization.background || organizationBackgroundImage}
         alt='org-background'
       />
       <div className='absolute bottom-0 mx-4 mt-auto h-36 w-[96%] rounded-lg border-none bg-background/70 pb-4 pl-4 pr-4 pt-3 shadow-sm backdrop-blur-lg'>
         <div className='flex gap-5'>
-          <Image
-            priority={false}
-            className='h-20 w-20 rounded border-none'
-            width={80}
-            height={80}
-            src={organization.avatar || logo}
-            alt='org-background'
-          />
+          <div>
+            <Image
+              priority={false}
+              className='h-15 w-15 rounded border-none'
+              width={60}
+              height={60}
+              src={organization.avatar || logo}
+              alt='org-background'
+            />
+          </div>
+
           <div className='flex flex-col justify-center'>
             <Typography variant='h5' tag='h5'>
               {organization.name}
diff --git a/app/org/(panel)/organizations/[organizationId]/(components)/OrganizationHeader/components/OrganizationHeaderTabs/OrganizationHeaderTabs.tsx b/app/org/(panel)/organizations/[organizationId]/(components)/OrganizationHeader/components/OrganizationHeaderTabs/OrganizationHeaderTabs.tsx
index d2a8db2a..1a7ee77f 100644
--- a/app/org/(panel)/organizations/[organizationId]/(components)/OrganizationHeader/components/OrganizationHeaderTabs/OrganizationHeaderTabs.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/(components)/OrganizationHeader/components/OrganizationHeaderTabs/OrganizationHeaderTabs.tsx
@@ -8,7 +8,7 @@ import { Tabs, TabsList } from '@/components/ui';
 import type { ProfileTab } from '../../../../(constants)/navigation';
 import {
   FRANCHISEE_PROFILE_TABS,
-  ORGANIZATION_PROFILE_TAB_VALUES,
+  ORG_ORGANIZATION_TAB_VALUES,
   ORGANIZER_PROFILE_TABS,
   PARTNER_PROFILE_TABS,
   SPONSOR_PROFILE_TABS
@@ -31,7 +31,7 @@ export const OrganizationHeaderTabs = ({ organization }: OrganizationHeaderTabsP
   const segment = useSelectedLayoutSegment();
 
   return (
-    <Tabs defaultValue={ORGANIZATION_PROFILE_TAB_VALUES[segment?.toUpperCase() ?? 'PROFILE']}>
+    <Tabs defaultValue={ORG_ORGANIZATION_TAB_VALUES[segment?.toUpperCase() ?? 'PROFILE']}>
       <TabsList className='items-top text-organization-tabs flex w-full justify-end gap-1 bg-transparent'>
         {TABS[organization.type].map((tab, index) => {
           const Icon = tab.icon;
diff --git a/app/org/(panel)/organizations/[organizationId]/(constants)/navigation.tsx b/app/org/(panel)/organizations/[organizationId]/(constants)/navigation.tsx
index 0534035e..41f0776b 100644
--- a/app/org/(panel)/organizations/[organizationId]/(constants)/navigation.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/(constants)/navigation.tsx
@@ -3,21 +3,21 @@ import { ActivityIcon, MapPinIcon, UserIcon, UsersRoundIcon } from 'lucide-react
 
 import { ROUTES } from '@/utils/constants';
 
-export const ORGANIZATION_PROFILE_TAB_VALUES = {
+export const ORG_ORGANIZATION_TAB_VALUES = {
   PROFILE: 'profile',
   ADDRESSES: 'addresses',
   EMPLOYEES: 'employees',
   ACTIVITIES: 'activities',
   SCHEDULE: 'schedule'
-};
+} as const;
 
 export interface ProfileTab {
   icon: LucideIcon;
   title: string;
   value: string;
-  route: (typeof ROUTES.ORG.ORGANIZATIONS)[Exclude<
+  route: (typeof ROUTES.ORG.ORGANIZATIONS)[Extract<
     keyof typeof ROUTES.ORG.ORGANIZATIONS,
-    'ROOT' | 'DASHBOARD'
+    keyof typeof ORG_ORGANIZATION_TAB_VALUES
   >];
 }
 
@@ -26,7 +26,7 @@ export const FRANCHISEE_PROFILE_TABS: ProfileTab[] = [
   {
     icon: UserIcon,
     title: 'organization.profile.header.profile',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.PROFILE,
+    value: ORG_ORGANIZATION_TAB_VALUES.PROFILE,
     route: ROUTES.ORG.ORGANIZATIONS.PROFILE
   }
 ];
@@ -35,7 +35,7 @@ export const SPONSOR_PROFILE_TABS: ProfileTab[] = [
   {
     icon: UserIcon,
     title: 'organization.profile.header.profile',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.PROFILE,
+    value: ORG_ORGANIZATION_TAB_VALUES.PROFILE,
     route: ROUTES.ORG.ORGANIZATIONS.PROFILE
   }
 ];
@@ -44,31 +44,31 @@ export const PARTNER_PROFILE_TABS: ProfileTab[] = [
   {
     icon: UserIcon,
     title: 'organization.profile.header.profile',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.PROFILE,
+    value: ORG_ORGANIZATION_TAB_VALUES.PROFILE,
     route: ROUTES.ORG.ORGANIZATIONS.PROFILE
   },
   {
     icon: MapPinIcon,
     title: 'organization.profile.header.addresses',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.ADDRESSES,
+    value: ORG_ORGANIZATION_TAB_VALUES.ADDRESSES,
     route: ROUTES.ORG.ORGANIZATIONS.ADDRESSES
   },
   {
     icon: UsersRoundIcon,
     title: 'organization.profile.header.employees',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.EMPLOYEES,
+    value: ORG_ORGANIZATION_TAB_VALUES.EMPLOYEES,
     route: ROUTES.ORG.ORGANIZATIONS.EMPLOYEES
   },
   {
     icon: ActivityIcon,
     title: 'organization.profile.header.activities',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.ACTIVITIES,
+    value: ORG_ORGANIZATION_TAB_VALUES.ACTIVITIES,
     route: ROUTES.ORG.ORGANIZATIONS.ACTIVITIES
   },
   {
     icon: ActivityIcon,
     title: 'organization.profile.header.schedule',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.SCHEDULE,
+    value: ORG_ORGANIZATION_TAB_VALUES.SCHEDULE,
     route: ROUTES.ORG.ORGANIZATIONS.SCHEDULE
   }
 ];
diff --git a/app/org/(panel)/organizations/[organizationId]/addresses/(components)/ActionAddressForm/hooks/useActionAddressForm.tsx b/app/org/(panel)/organizations/[organizationId]/addresses/(components)/ActionAddressForm/hooks/useActionAddressForm.tsx
index 23635766..d14fb79f 100644
--- a/app/org/(panel)/organizations/[organizationId]/addresses/(components)/ActionAddressForm/hooks/useActionAddressForm.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/addresses/(components)/ActionAddressForm/hooks/useActionAddressForm.tsx
@@ -75,7 +75,7 @@ export const useActionAddressForm = ({
 
     if (actionType === 'add') {
       const postOrganizationActionAddressParams = {
-        params: { ...requestParams, legalId: params.organizationId },
+        params: { ...requestParams, legalEntityId: params.organizationId },
         action: actionType
       } as const;
 
diff --git a/app/org/(panel)/organizations/[organizationId]/addresses/loading.tsx b/app/org/(panel)/organizations/[organizationId]/addresses/loading.tsx
index 90e95392..e6ca31d3 100644
--- a/app/org/(panel)/organizations/[organizationId]/addresses/loading.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/addresses/loading.tsx
@@ -8,7 +8,7 @@ const OrganizationAddressesLoading = () => (
       <Skeleton className='h-10 w-36 bg-background' />
     </div>
 
-    <div className='justify-center gap-5 2xlx:grid-cols-2 xlx:flex xlx:flex-wrap 2xl:grid-cols-3 xl:grid'>
+    <div className='justify-center gap-5 2xlx:grid-cols-2 xlx:flex xlx:flex-wrap xl:grid 2xl:grid-cols-3'>
       {Array(5)
         .fill({})
         .map((_, index) => (
diff --git a/app/org/(panel)/organizations/[organizationId]/addresses/page.tsx b/app/org/(panel)/organizations/[organizationId]/addresses/page.tsx
index 55a9c881..dfbaee1d 100644
--- a/app/org/(panel)/organizations/[organizationId]/addresses/page.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/addresses/page.tsx
@@ -25,7 +25,7 @@ const OrganizationAddressesPage = async ({ params }: OrganizationAddressesPagePr
         </Typography>
         <AddAddressDialog />
       </div>
-      <div className='gap-5 2xlx:grid-cols-2 xlx:flex xlx:flex-wrap 2xl:grid-cols-3 xl:grid'>
+      <div className='gap-5 2xlx:grid-cols-2 xlx:flex xlx:flex-wrap xl:grid 2xl:grid-cols-3'>
         {getLegalAddressesByLegalIdResponse.map((address) => (
           <AddressCard key={address.id} address={address} />
         ))}
diff --git a/app/org/(panel)/organizations/[organizationId]/employees/loading.tsx b/app/org/(panel)/organizations/[organizationId]/employees/loading.tsx
index c4a32cbc..49d9bcb4 100644
--- a/app/org/(panel)/organizations/[organizationId]/employees/loading.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/employees/loading.tsx
@@ -8,7 +8,7 @@ const OrganizationEmployeesLoading = () => (
       <Skeleton className='h-10 w-36 bg-background' />
     </div>
 
-    <div className='grid gap-3 4xlx:grid-cols-4 3xlx:grid-cols-3 2xlx:grid-cols-2 mdx:grid-cols-1'>
+    <div className='grid grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-3'>
       {Array(5)
         .fill({})
         .map((_, index) => (
diff --git a/app/org/(panel)/organizations/[organizationId]/employees/page.tsx b/app/org/(panel)/organizations/[organizationId]/employees/page.tsx
index 552cd16b..56b84cde 100644
--- a/app/org/(panel)/organizations/[organizationId]/employees/page.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/employees/page.tsx
@@ -25,7 +25,7 @@ const OrganizationEmployeesPage = async ({ params }: OrganizationEmployeesPagePr
         </Typography>
         <AddEmployeeDialog />
       </div>
-      <div className='grid gap-3 4xlx:grid-cols-4 3xlx:grid-cols-3 2xlx:grid-cols-2 mdx:grid-cols-1'>
+      <div className='grid grid-cols-1 gap-3 md:grid-cols-2 lg:grid-cols-3'>
         {getOrganizationEmployeesResponse.map((employee) => (
           <EmployeeCard key={employee.id} employee={employee} />
         ))}
diff --git a/app/org/(panel)/organizations/[organizationId]/layout.tsx b/app/org/(panel)/organizations/[organizationId]/layout.tsx
index 95366b4e..2657bed8 100644
--- a/app/org/(panel)/organizations/[organizationId]/layout.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/layout.tsx
@@ -12,7 +12,8 @@ interface OrganizationPageLayoutProps {
 
 const OrganizationPageLayout = async ({ params, children }: OrganizationPageLayoutProps) => {
   const organization = await getOrganizationById({
-    params: { id: params.organizationId }
+    params: { id: params.organizationId },
+    config: { cache: 'no-store' }
   });
 
   return (
diff --git a/app/org/(panel)/organizations/[organizationId]/profile/@card/page.tsx b/app/org/(panel)/organizations/[organizationId]/profile/@card/page.tsx
index 5114546e..b66f6b60 100644
--- a/app/org/(panel)/organizations/[organizationId]/profile/@card/page.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/profile/@card/page.tsx
@@ -30,7 +30,7 @@ interface OrganizationProfileCardSlotProps {
 const OrganizationProfileCardPage = async ({ params }: OrganizationProfileCardSlotProps) => {
   const getOrganizationByIdResponse = await getOrganizationById({
     params: { id: params.organizationId },
-    config: { cache: 'no-cache' }
+    config: { cache: 'no-store' }
   });
 
   return (
@@ -42,14 +42,16 @@ const OrganizationProfileCardPage = async ({ params }: OrganizationProfileCardSl
           </Typography>
         </InfoCardTitle>
         <InfoCardAction className='rounded-none bg-transparent'>
-          <EditOrganizationProfileDialog
-            organization={getOrganizationByIdResponse}
-            trigger={
-              <Button variant='ghost' className='ml-3 mr-1 h-8 w-8 p-2'>
-                <Edit3Icon size={20} strokeWidth={1.5} />
-              </Button>
-            }
-          />
+          <div className='right absolute right-2 top-2 z-10'>
+            <EditOrganizationProfileDialog
+              organization={getOrganizationByIdResponse}
+              trigger={
+                <Button variant='ghost' size='icon'>
+                  <Edit3Icon size={20} strokeWidth={1.5} />
+                </Button>
+              }
+            />
+          </div>
         </InfoCardAction>
       </InfoCardHeader>
       <InfoCardContent className='flex w-full flex-col px-7'>
diff --git a/app/org/(panel)/organizations/[organizationId]/profile/@changes/constants/addOrganizationChangeSchema.ts b/app/org/(panel)/organizations/[organizationId]/profile/@changes/constants/addOrganizationChangeSchema.ts
index 79f4007b..84b2c85f 100644
--- a/app/org/(panel)/organizations/[organizationId]/profile/@changes/constants/addOrganizationChangeSchema.ts
+++ b/app/org/(panel)/organizations/[organizationId]/profile/@changes/constants/addOrganizationChangeSchema.ts
@@ -1,10 +1,10 @@
 import * as z from 'zod';
 
-export const addOrganizationChangeSchema = z.object({
+export const addOrganizationChangesSchema = z.object({
   comment: z
     .string()
     .min(1, { message: 'validation.required' })
     .max(255, { message: 'validation.max' })
 });
 
-export type AddOrganizationChangeSchema = z.infer<typeof addOrganizationChangeSchema>;
+export type AddOrganizationChangesSchema = z.infer<typeof addOrganizationChangesSchema>;
diff --git a/app/org/(panel)/organizations/[organizationId]/profile/@changes/hooks/useOrganizationProfileChangesPage.ts b/app/org/(panel)/organizations/[organizationId]/profile/@changes/hooks/useOrganizationProfileChangesPage.ts
index ef2f1273..0b680b6e 100644
--- a/app/org/(panel)/organizations/[organizationId]/profile/@changes/hooks/useOrganizationProfileChangesPage.ts
+++ b/app/org/(panel)/organizations/[organizationId]/profile/@changes/hooks/useOrganizationProfileChangesPage.ts
@@ -4,8 +4,8 @@ import { useParams } from 'next/navigation';
 
 import { useGetChangesInfiniteQuery, usePostChangesMutation } from '@/utils/api';
 
-import type { AddOrganizationChangeSchema } from '../constants/addOrganizationChangeSchema';
-import { addOrganizationChangeSchema } from '../constants/addOrganizationChangeSchema';
+import type { AddOrganizationChangesSchema } from '../constants/addOrganizationChangeSchema';
+import { addOrganizationChangesSchema } from '../constants/addOrganizationChangeSchema';
 
 const DEFAULT_CHANGES_PAGE = 1;
 const CHANGES_LIMIT = 5;
@@ -21,9 +21,9 @@ export const useOrganizationProfileChangesPage = () => {
     criteria: params.organizationId
   });
 
-  const addOrganizationChangeForm = useForm<AddOrganizationChangeSchema>({
+  const addOrganizationChangeForm = useForm<AddOrganizationChangesSchema>({
     mode: 'onSubmit',
-    resolver: zodResolver(addOrganizationChangeSchema),
+    resolver: zodResolver(addOrganizationChangesSchema),
     defaultValues: { comment: '' }
   });
 
diff --git a/app/org/(panel)/organizations/[organizationId]/profile/@statistics/page.tsx b/app/org/(panel)/organizations/[organizationId]/profile/@statistics/page.tsx
index 9c30ec49..63850db6 100644
--- a/app/org/(panel)/organizations/[organizationId]/profile/@statistics/page.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/profile/@statistics/page.tsx
@@ -14,7 +14,7 @@ import {
 } from '@/components/ui';
 
 const OrganizationProfileStatisticsPage = () => (
-  <div className='flex gap-4'>
+  <div className='flex flex-col gap-4 sm:flex-row'>
     <InfoCard>
       <InfoCardHeader className='p-5'>
         <InfoCardTitle>
diff --git a/app/org/(panel)/organizations/[organizationId]/profile/@tariff/page.tsx b/app/org/(panel)/organizations/[organizationId]/profile/@tariff/page.tsx
index 35b2a80b..89e72bf0 100644
--- a/app/org/(panel)/organizations/[organizationId]/profile/@tariff/page.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/profile/@tariff/page.tsx
@@ -26,7 +26,7 @@ const OrganizationProfileTariffPage = async ({ params }: OrganizationProfileTari
   const getTariffByLegalEntityIdResponse = await getTariffByLegalEntityId({
     params: { legalEntityId: params.organizationId },
     config: {
-      cache: 'no-cache'
+      cache: 'no-store'
     }
   });
 
@@ -54,7 +54,7 @@ const OrganizationProfileTariffPage = async ({ params }: OrganizationProfileTari
           />
         </InfoCardAction>
       </InfoCardHeader>
-      <InfoCardContent className='mt-3 flex w-full justify-center'>
+      <InfoCardContent className='mt-1 flex w-full justify-center'>
         <InfoCardItem className='flex flex-col items-center border-none'>
           <InfoCardItemTitle>
             <Typography variant='h3' tag='h3'>
diff --git a/app/org/(panel)/organizations/[organizationId]/profile/layout.tsx b/app/org/(panel)/organizations/[organizationId]/profile/layout.tsx
index a1c6b77b..44364f17 100644
--- a/app/org/(panel)/organizations/[organizationId]/profile/layout.tsx
+++ b/app/org/(panel)/organizations/[organizationId]/profile/layout.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-interface OrganizationProfilePageLayoutProps {
+interface OrganizationProfileLayoutProps {
   children: React.ReactNode;
   card: React.ReactNode;
   changes: React.ReactNode;
@@ -13,10 +13,10 @@ const OrganizationProfileLayout = ({
   changes,
   statistics,
   tariff
-}: OrganizationProfilePageLayoutProps) => (
-  <div className='flex justify-center gap-[22px] smx:flex-col'>
-    {card}
-    <div className='flex w-1/2 flex-col gap-[22px] smx:w-full'>
+}: OrganizationProfileLayoutProps) => (
+  <div className='flex flex-1 flex-col justify-center gap-4 lg:flex-row'>
+    <div className='flex-1'>{card}</div>
+    <div className='flex flex-1 flex-col gap-4'>
       {tariff}
       {statistics}
       {changes}
diff --git a/app/org/auth/page.tsx b/app/org/auth/page.tsx
index 563b158e..03fa7069 100644
--- a/app/org/auth/page.tsx
+++ b/app/org/auth/page.tsx
@@ -1,26 +1,26 @@
 import Image from 'next/image';
 
-import AuthImage from '@/assets/images/auth.webp';
+import authImage from '@/assets/images/auth.webp';
 import { I18nText, Logo } from '@/components/common';
 import { Typography } from '@/components/ui';
 
 import { LoginForm } from './(components)/LoginForm/LoginForm';
 
 const OrgAuthPage = () => (
-  <div className='flex min-h-screen flex-col items-center justify-between p-2'>
-    <div className='flex flex-1 items-center justify-around gap-28 xlx:gap-12 xlx:p-5'>
-      <div className='flex flex-col space-y-6'>
-        <div className='mb-10'>
+  <div className='flex min-h-screen flex-col items-center justify-between p-10'>
+    <div className='flex flex-1 items-center justify-around gap-12 p-5 md:gap-28'>
+      <div className='flex max-w-[450px] flex-col space-y-6'>
+        <div className='mb-20 flex justify-start'>
           <Logo className='fill-taiga' />
         </div>
         <div>
-          <Typography variant='h2' tag='h2' className='my-[30px] text-center text-4xl xlx:text-2xl'>
+          <Typography variant='h2' tag='h1' className='my-[30px] text-start text-4xl'>
             <I18nText path='org.auth.title' />
           </Typography>
           <LoginForm />
         </div>
       </div>
-      <Image src={AuthImage} alt='auth image' className='w-[36rem] xlx:block xlx:w-96 mdx:hidden' />
+      <Image src={authImage} alt='auth image' className='mt-20 hidden xl:block' />
     </div>
     <footer className='m-3 flex flex-wrap justify-center divide-x divide-solid divide-gray-700 *:px-1 mdx:divide-x-0'>
       <Typography variant='body3' className='text-foreground'>
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/OrganizationHeader.tsx b/app/partner/(components)/OrganizationHeader/OrganizationHeader.tsx
similarity index 85%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/OrganizationHeader.tsx
rename to app/partner/(components)/OrganizationHeader/OrganizationHeader.tsx
index efc686d9..210890c2 100644
--- a/app/partner/[organizationId]/(components)/OrganizationHeader/OrganizationHeader.tsx
+++ b/app/partner/(components)/OrganizationHeader/OrganizationHeader.tsx
@@ -2,7 +2,7 @@
 
 import Image from 'next/image';
 
-import background from '@/assets/images/background/organization.png';
+import organizationBackgroundImage from '@/assets/images/background/organization.png';
 import logo from '@/assets/images/logo/organization.png';
 import { I18nText } from '@/components/common';
 import { Typography } from '@/components/ui';
@@ -26,21 +26,24 @@ export const OrganizationHeader = ({ organization }: OrganizationHeaderProps) =>
       <div className='relative mt-2.5 flex h-64 w-full flex-col items-center'>
         <Image
           priority={false}
-          className='h-[168px] w-full rounded-lg'
-          src={organization.background || background}
+          className='h-[168px] w-full rounded-lg object-cover'
+          src={organization.background || organizationBackgroundImage}
           alt='org-background'
         />
         <div className='absolute bottom-0 mx-4 mt-auto flex h-36 w-[96%] flex-col gap-5 rounded-lg border-none bg-background/70 pb-4 pl-4 pr-4 pt-3 shadow-sm backdrop-blur-lg'>
           <div className='flex justify-between'>
             <div className='flex gap-5'>
-              <Image
-                priority={false}
-                className='h-15 w-15 rounded border-none'
-                width={60}
-                height={60}
-                src={organization.avatar || logo}
-                alt='org-background'
-              />
+              <div>
+                <Image
+                  priority={false}
+                  className='h-15 w-15 rounded border-none'
+                  width={60}
+                  height={60}
+                  src={organization.avatar || logo}
+                  alt='org-background'
+                />
+              </div>
+
               <div className='flex flex-col justify-center'>
                 <Typography variant='h5' tag='h5'>
                   {organization.name}
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/ActionPartnerForm/ActionPartnerForm.tsx b/app/partner/(components)/OrganizationHeader/components/ActionPartnerForm/ActionPartnerForm.tsx
similarity index 99%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/ActionPartnerForm/ActionPartnerForm.tsx
rename to app/partner/(components)/OrganizationHeader/components/ActionPartnerForm/ActionPartnerForm.tsx
index 8766431a..99b1402e 100644
--- a/app/partner/[organizationId]/(components)/OrganizationHeader/components/ActionPartnerForm/ActionPartnerForm.tsx
+++ b/app/partner/(components)/OrganizationHeader/components/ActionPartnerForm/ActionPartnerForm.tsx
@@ -20,7 +20,7 @@ import {
 } from '@/components/ui';
 import { useI18n } from '@/utils/contexts';
 
-import type { PartnerData } from '../../(constants)/types';
+import type { PartnerData } from '../../constants/types';
 
 import { useActionPartnerForm } from './hooks/useActionPartnerForm';
 
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/ActionPartnerForm/constants/actionPartnerSchema.ts b/app/partner/(components)/OrganizationHeader/components/ActionPartnerForm/constants/actionPartnerSchema.ts
similarity index 100%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/ActionPartnerForm/constants/actionPartnerSchema.ts
rename to app/partner/(components)/OrganizationHeader/components/ActionPartnerForm/constants/actionPartnerSchema.ts
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/ActionPartnerForm/constants/index.ts b/app/partner/(components)/OrganizationHeader/components/ActionPartnerForm/constants/index.ts
similarity index 100%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/ActionPartnerForm/constants/index.ts
rename to app/partner/(components)/OrganizationHeader/components/ActionPartnerForm/constants/index.ts
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/ActionPartnerForm/hooks/useActionPartnerForm.ts b/app/partner/(components)/OrganizationHeader/components/ActionPartnerForm/hooks/useActionPartnerForm.ts
similarity index 96%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/ActionPartnerForm/hooks/useActionPartnerForm.ts
rename to app/partner/(components)/OrganizationHeader/components/ActionPartnerForm/hooks/useActionPartnerForm.ts
index 9899e89d..16870f53 100644
--- a/app/partner/[organizationId]/(components)/OrganizationHeader/components/ActionPartnerForm/hooks/useActionPartnerForm.ts
+++ b/app/partner/(components)/OrganizationHeader/components/ActionPartnerForm/hooks/useActionPartnerForm.ts
@@ -6,7 +6,7 @@ import { toast } from 'sonner';
 import { usePutUserMutation } from '@/utils/api/hooks/usePutUserMutation';
 import { useI18n } from '@/utils/contexts';
 
-import type { PartnerData } from '../../../(constants)/types';
+import type { PartnerData } from '../../../constants/types';
 import type { PartnerSchema } from '../constants/actionPartnerSchema';
 import { actionPartnerSchema } from '../constants/actionPartnerSchema';
 
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/DesktopProfileMenu/DesktopProfileMenu.tsx b/app/partner/(components)/OrganizationHeader/components/DesktopProfileMenu/DesktopProfileMenu.tsx
similarity index 96%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/DesktopProfileMenu/DesktopProfileMenu.tsx
rename to app/partner/(components)/OrganizationHeader/components/DesktopProfileMenu/DesktopProfileMenu.tsx
index b966efca..fa8a1a81 100644
--- a/app/partner/[organizationId]/(components)/OrganizationHeader/components/DesktopProfileMenu/DesktopProfileMenu.tsx
+++ b/app/partner/(components)/OrganizationHeader/components/DesktopProfileMenu/DesktopProfileMenu.tsx
@@ -4,7 +4,7 @@ import Image from 'next/image';
 import { I18nText, NotificationsDropdownMenu, ThemeSwitcher } from '@/components/common';
 import { Button, CircularButton, Typography } from '@/components/ui';
 
-import type { PartnerData } from '../../(constants)/types';
+import type { PartnerData } from '../../constants/types';
 
 interface DesktopProfileMenuProps {
   partner: PartnerData;
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/EditPartnerDialog/EditPartnerDialog.tsx b/app/partner/(components)/OrganizationHeader/components/EditPartnerDialog/EditPartnerDialog.tsx
similarity index 89%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/EditPartnerDialog/EditPartnerDialog.tsx
rename to app/partner/(components)/OrganizationHeader/components/EditPartnerDialog/EditPartnerDialog.tsx
index 719bc886..9e0f7c18 100644
--- a/app/partner/[organizationId]/(components)/OrganizationHeader/components/EditPartnerDialog/EditPartnerDialog.tsx
+++ b/app/partner/(components)/OrganizationHeader/components/EditPartnerDialog/EditPartnerDialog.tsx
@@ -11,7 +11,7 @@ import {
   Typography
 } from '@/components/ui';
 
-import type { PartnerData } from '../../(constants)/types';
+import type { PartnerData } from '../../constants/types';
 import { ActionPartnerForm } from '../ActionPartnerForm/ActionPartnerForm';
 
 interface EditPartnerDialogProps extends React.ComponentProps<typeof Dialog> {
@@ -28,7 +28,7 @@ export const EditPartnerDialog = ({ onEdit, partner, ...props }: EditPartnerDial
       <DialogHeader>
         <DialogTitle>
           <Typography variant='h4' tag='h4'>
-            <I18nText path='dialog.addEmployee.title' />
+            <I18nText path='dialog.editEmployee.title' />
           </Typography>
         </DialogTitle>
       </DialogHeader>
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/MobileProfileDropdownMenu/MobileProfileDropdownMenu.tsx b/app/partner/(components)/OrganizationHeader/components/MobileProfileDropdownMenu/MobileProfileDropdownMenu.tsx
similarity index 98%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/MobileProfileDropdownMenu/MobileProfileDropdownMenu.tsx
rename to app/partner/(components)/OrganizationHeader/components/MobileProfileDropdownMenu/MobileProfileDropdownMenu.tsx
index d6133c5b..d87e2bdc 100644
--- a/app/partner/[organizationId]/(components)/OrganizationHeader/components/MobileProfileDropdownMenu/MobileProfileDropdownMenu.tsx
+++ b/app/partner/(components)/OrganizationHeader/components/MobileProfileDropdownMenu/MobileProfileDropdownMenu.tsx
@@ -13,7 +13,7 @@ import {
   Typography
 } from '@/components/ui';
 
-import type { PartnerData } from '../../(constants)/types';
+import type { PartnerData } from '../../constants/types';
 
 import { useMobileProfileDropdownMenu } from './hooks/useMobileProfileDropdownMenu';
 
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/MobileProfileDropdownMenu/hooks/useMobileProfileDropdownMenu.tsx b/app/partner/(components)/OrganizationHeader/components/MobileProfileDropdownMenu/hooks/useMobileProfileDropdownMenu.tsx
similarity index 100%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/MobileProfileDropdownMenu/hooks/useMobileProfileDropdownMenu.tsx
rename to app/partner/(components)/OrganizationHeader/components/MobileProfileDropdownMenu/hooks/useMobileProfileDropdownMenu.tsx
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/OrganizationHeaderTabs/OrganizationHeaderTabs.tsx b/app/partner/(components)/OrganizationHeader/components/OrganizationHeaderTabs/OrganizationHeaderTabs.tsx
similarity index 92%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/OrganizationHeaderTabs/OrganizationHeaderTabs.tsx
rename to app/partner/(components)/OrganizationHeader/components/OrganizationHeaderTabs/OrganizationHeaderTabs.tsx
index 30971c37..91a2fc6c 100644
--- a/app/partner/[organizationId]/(components)/OrganizationHeader/components/OrganizationHeaderTabs/OrganizationHeaderTabs.tsx
+++ b/app/partner/(components)/OrganizationHeader/components/OrganizationHeaderTabs/OrganizationHeaderTabs.tsx
@@ -8,9 +8,9 @@ import { Tabs, TabsList } from '@/components/ui';
 import type { ProfileTab } from '../../../../(constants)/navigation';
 import {
   FRANCHISEE_PROFILE_TABS,
-  ORGANIZATION_PROFILE_TAB_VALUES,
   ORGANIZER_PROFILE_TABS,
   PARTNER_PROFILE_TABS,
+  PARTNER_TAB_VALUES,
   SPONSOR_PROFILE_TABS
 } from '../../../../(constants)/navigation';
 
@@ -31,7 +31,7 @@ export const OrganizationHeaderTabs = ({ organization }: OrganizationHeaderTabsP
   const segment = useSelectedLayoutSegment();
 
   return (
-    <Tabs defaultValue={ORGANIZATION_PROFILE_TAB_VALUES[segment?.toUpperCase() ?? 'PROFILE']}>
+    <Tabs defaultValue={PARTNER_TAB_VALUES[segment?.toUpperCase() ?? 'PROFILE']}>
       <TabsList className='items-top text-organization-tabs flex w-full justify-end gap-1 bg-transparent'>
         {TABS[organization.type].map((tab, index) => {
           const Icon = tab.icon;
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/OrganizationHeaderTabs/components/OrganizationHeaderTabsTrigger/OrganizationHeaderTabsTrigger.tsx b/app/partner/(components)/OrganizationHeader/components/OrganizationHeaderTabs/components/OrganizationHeaderTabsTrigger/OrganizationHeaderTabsTrigger.tsx
similarity index 87%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/OrganizationHeaderTabs/components/OrganizationHeaderTabsTrigger/OrganizationHeaderTabsTrigger.tsx
rename to app/partner/(components)/OrganizationHeader/components/OrganizationHeaderTabs/components/OrganizationHeaderTabsTrigger/OrganizationHeaderTabsTrigger.tsx
index 95a9699a..77ab8995 100644
--- a/app/partner/[organizationId]/(components)/OrganizationHeader/components/OrganizationHeaderTabs/components/OrganizationHeaderTabsTrigger/OrganizationHeaderTabsTrigger.tsx
+++ b/app/partner/(components)/OrganizationHeader/components/OrganizationHeaderTabs/components/OrganizationHeaderTabsTrigger/OrganizationHeaderTabsTrigger.tsx
@@ -18,7 +18,7 @@ export const OrganizationHeaderTabsTrigger = ({
   <Link href={link}>
     <TabsTrigger
       value={value}
-      className='border-1 flex min-w-[135px] justify-center gap-2 rounded-xl py-[10px] text-xs font-normal data-[state=active]:bg-tabsBackground data-[state=active]:text-tabsText data-[state=active]:drop-shadow-md 2lgx:min-w-3 lgx:min-w-[135px] 2mdx:min-w-3'
+      className='border-1 flex min-w-[135px] justify-center gap-2 rounded-xl py-[10px] text-xs font-normal data-[state=active]:bg-tabsBackground data-[state=active]:text-tabsText data-[state=active]:text-taiga data-[state=active]:drop-shadow-md 2lgx:min-w-3 lgx:min-w-[135px] 2mdx:min-w-3'
       {...props}
     >
       {children}
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/components/QrCodeScanner/QrCodeScannerDialog.tsx b/app/partner/(components)/OrganizationHeader/components/QrCodeScanner/QrCodeScannerDialog.tsx
similarity index 100%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/components/QrCodeScanner/QrCodeScannerDialog.tsx
rename to app/partner/(components)/OrganizationHeader/components/QrCodeScanner/QrCodeScannerDialog.tsx
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/(constants)/types.ts b/app/partner/(components)/OrganizationHeader/constants/types.ts
similarity index 100%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/(constants)/types.ts
rename to app/partner/(components)/OrganizationHeader/constants/types.ts
diff --git a/app/partner/[organizationId]/(components)/OrganizationHeader/hooks/useOrganizationHeader.ts b/app/partner/(components)/OrganizationHeader/hooks/useOrganizationHeader.ts
similarity index 98%
rename from app/partner/[organizationId]/(components)/OrganizationHeader/hooks/useOrganizationHeader.ts
rename to app/partner/(components)/OrganizationHeader/hooks/useOrganizationHeader.ts
index 5960fb34..d8137978 100644
--- a/app/partner/[organizationId]/(components)/OrganizationHeader/hooks/useOrganizationHeader.ts
+++ b/app/partner/(components)/OrganizationHeader/hooks/useOrganizationHeader.ts
@@ -10,7 +10,6 @@ export const useOrganizationHeader = () => {
   const { user } = useUser();
   const [editEmployeeDialogOpen, setEditEmployeeDialogOpen] = React.useState(false);
   const [editQrScannerDialogOpen, setEditQrScannerDialogOpen] = React.useState(false);
-  console.log(user);
   const [isEditPending, startEditTransition] = React.useTransition();
 
   const onEditPartner = () => {
diff --git a/app/partner/[organizationId]/(constants)/navigation.tsx b/app/partner/(constants)/navigation.tsx
similarity index 78%
rename from app/partner/[organizationId]/(constants)/navigation.tsx
rename to app/partner/(constants)/navigation.tsx
index 108858de..230bc128 100644
--- a/app/partner/[organizationId]/(constants)/navigation.tsx
+++ b/app/partner/(constants)/navigation.tsx
@@ -3,7 +3,7 @@ import { ActivityIcon, MapPinIcon, UserIcon, UsersRoundIcon } from 'lucide-react
 
 import { ROUTES } from '@/utils/constants';
 
-export const ORGANIZATION_PROFILE_TAB_VALUES = {
+export const PARTNER_TAB_VALUES = {
   PROFILE: 'profile',
   ADDRESSES: 'addresses',
   EMPLOYEES: 'employees',
@@ -23,7 +23,7 @@ export const FRANCHISEE_PROFILE_TABS: ProfileTab[] = [
   {
     icon: UserIcon,
     title: 'organization.profile.header.profile',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.PROFILE,
+    value: PARTNER_TAB_VALUES.PROFILE,
     route: ROUTES.PARTNER.PROFILE
   }
 ];
@@ -32,7 +32,7 @@ export const SPONSOR_PROFILE_TABS: ProfileTab[] = [
   {
     icon: UserIcon,
     title: 'organization.profile.header.profile',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.PROFILE,
+    value: PARTNER_TAB_VALUES.PROFILE,
     route: ROUTES.PARTNER.PROFILE
   }
 ];
@@ -41,31 +41,31 @@ export const PARTNER_PROFILE_TABS: ProfileTab[] = [
   {
     icon: UserIcon,
     title: 'organization.profile.header.profile',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.PROFILE,
+    value: PARTNER_TAB_VALUES.PROFILE,
     route: ROUTES.PARTNER.PROFILE
   },
   {
     icon: MapPinIcon,
     title: 'organization.profile.header.addresses',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.ADDRESSES,
+    value: PARTNER_TAB_VALUES.ADDRESSES,
     route: ROUTES.PARTNER.ADDRESSES
   },
   {
     icon: UsersRoundIcon,
     title: 'organization.profile.header.employees',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.EMPLOYEES,
+    value: PARTNER_TAB_VALUES.EMPLOYEES,
     route: ROUTES.PARTNER.EMPLOYEES
   },
   {
     icon: ActivityIcon,
     title: 'organization.profile.header.activities',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.ACTIVITIES,
+    value: PARTNER_TAB_VALUES.ACTIVITIES,
     route: ROUTES.PARTNER.ACTIVITIES
   },
   {
     icon: ActivityIcon,
     title: 'organization.profile.header.schedule',
-    value: ORGANIZATION_PROFILE_TAB_VALUES.SCHEDULE,
+    value: PARTNER_TAB_VALUES.SCHEDULE,
     route: ROUTES.PARTNER.SCHEDULE
   }
 ];
diff --git a/app/partner/[organizationId]/layout.tsx b/app/partner/[organizationId]/layout.tsx
deleted file mode 100644
index 3c588260..00000000
--- a/app/partner/[organizationId]/layout.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { getOrganizationById } from '@/utils/api/requests';
-
-import { OrganizationHeader } from './(components)/OrganizationHeader/OrganizationHeader';
-
-interface OrganizationPageLayoutProps {
-  params: { organizationId: string };
-  children: React.ReactNode;
-}
-
-const OrganizationPageLayout = async ({ params, children }: OrganizationPageLayoutProps) => {
-  const organization = await getOrganizationById({
-    params: { id: params.organizationId }
-  });
-
-  return (
-    <div className='bg-secondary'>
-      <div className='flex flex-col gap-4 px-[181px] py-10 2lgx:px-[64px] 2mdx:px-[32px]'>
-        <OrganizationHeader organization={organization} />
-        {children}
-      </div>
-    </div>
-  );
-};
-
-export default OrganizationPageLayout;
diff --git a/app/partner/[organizationId]/activities/loading.tsx b/app/partner/activities/loading.tsx
similarity index 100%
rename from app/partner/[organizationId]/activities/loading.tsx
rename to app/partner/activities/loading.tsx
diff --git a/app/partner/[organizationId]/activities/page.tsx b/app/partner/activities/page.tsx
similarity index 52%
rename from app/partner/[organizationId]/activities/page.tsx
rename to app/partner/activities/page.tsx
index b988c8fb..aacbba8f 100644
--- a/app/partner/[organizationId]/activities/page.tsx
+++ b/app/partner/activities/page.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
 
-interface OrganizationActivitiesPageProps {
+interface PartnerActivitiesPageProps {
   params: { organizationId: string };
 }
 
-const OrganizationActivitiesPage = ({ params }: OrganizationActivitiesPageProps) => {
+const PartnerActivitiesPage = ({ params }: PartnerActivitiesPageProps) => {
   console.log(params);
 
   return <>заглушка чтобы посмотреть хэдер организации</>;
 };
 
-export default OrganizationActivitiesPage;
+export default PartnerActivitiesPage;
diff --git a/app/partner/addresses/(components)/ActionAddressForm/ActionAddressForm.tsx b/app/partner/addresses/(components)/ActionAddressForm/ActionAddressForm.tsx
new file mode 100644
index 00000000..bd5c5747
--- /dev/null
+++ b/app/partner/addresses/(components)/ActionAddressForm/ActionAddressForm.tsx
@@ -0,0 +1,220 @@
+'use client';
+
+import { AddressCombobox } from '@/components/comboboxes';
+import { I18nText } from '@/components/common';
+import {
+  Button,
+  ClockInput,
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  Input,
+  Typography
+} from '@/components/ui';
+import { cn } from '@/lib/utils';
+import { useI18n } from '@/utils/contexts';
+
+import type { AddressData } from '../../(constants)/types';
+
+import { useActionAddressForm } from './hooks/useActionAddressForm';
+import type { AddressActionType } from './constants';
+import { convertLocalitiesToComboboxItems } from './helpers';
+
+interface ActionAddressProps<ActionType extends AddressActionType> {
+  onAction: () => void;
+  actionType: ActionType;
+  address?: AddressData;
+}
+
+export const ActionAddressForm = <ActionType extends AddressActionType>({
+  onAction,
+  actionType,
+  address
+}: ActionAddressProps<ActionType>) => {
+  const i18n = useI18n();
+  const { state, form, functions } = useActionAddressForm({ onAction, actionType, address });
+
+  return (
+    <Form {...form}>
+      <form onSubmit={functions.onSubmit} className='w-full'>
+        <fieldset disabled={state.isLoading} className='flex w-full flex-col items-end'>
+          <div className='flex w-full gap-5 smx:flex-col'>
+            <div className='flex-1 space-y-3'>
+              <FormField
+                control={form.control}
+                name='locality'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <I18nText path='field.location.label' />
+                    </FormLabel>
+                    <AddressCombobox
+                      value={field.value}
+                      className='w-full'
+                      onSelect={(newValue) => form.setValue('locality', newValue ?? '')}
+                      convertAddresses={convertLocalitiesToComboboxItems}
+                    />
+                    <FormMessage>
+                      {form.formState?.errors?.locality && (
+                        <I18nText
+                          path={form.formState.errors.locality.message as LocaleMessageId}
+                        />
+                      )}
+                    </FormMessage>
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={form.control}
+                name='street'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <I18nText path='field.street.label' />
+                    </FormLabel>
+                    <FormControl>
+                      <Input
+                        {...field}
+                        placeholder={i18n.formatMessage({
+                          id: 'field.street.placeholder'
+                        })}
+                      />
+                    </FormControl>
+                    <FormMessage>
+                      {form.formState?.errors?.street && (
+                        <I18nText path={form.formState.errors.street.message as LocaleMessageId} />
+                      )}
+                    </FormMessage>
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={form.control}
+                name='house'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <I18nText path='field.house.label' />
+                    </FormLabel>
+                    <FormControl>
+                      <Input {...field} />
+                    </FormControl>
+                    <FormMessage>
+                      {form.formState?.errors?.house && (
+                        <I18nText path={form.formState.errors.house.message as LocaleMessageId} />
+                      )}
+                    </FormMessage>
+                  </FormItem>
+                )}
+              />
+            </div>
+            <div className='flex-1 space-y-3'>
+              <FormField
+                control={form.control}
+                name='details'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <I18nText path='field.details.label' />
+                    </FormLabel>
+                    <FormControl>
+                      <Input
+                        {...field}
+                        placeholder={i18n.formatMessage({
+                          id: 'field.details.placeholder'
+                        })}
+                      />
+                    </FormControl>
+                    <FormMessage>
+                      {form.formState?.errors?.details && (
+                        <I18nText path={form.formState.errors.details.message as LocaleMessageId} />
+                      )}
+                    </FormMessage>
+                  </FormItem>
+                )}
+              />
+              <Typography variant='sub1' tag='p'>
+                <I18nText path='addressCard.description.workingTime' />
+              </Typography>
+              {Array.from({ length: 7 }, (_, index) => {
+                const day = index as 0 | 1 | 2 | 3 | 4 | 5 | 6;
+                const dayOff = form.watch(`workingHours.${day}.dayOff`);
+
+                return (
+                  <div className='mt-3 flex' key={day}>
+                    <Button
+                      type='button'
+                      onClick={() => form.setValue(`workingHours.${day}.dayOff`, !dayOff)}
+                      variant={dayOff ? 'secondary' : 'default'}
+                      className={cn('max-h-6 w-6 rounded-md p-1 px-1.5 text-center text-[10px]')}
+                    >
+                      <I18nText path={`dayOfWeek.${day + 1}` as LocaleMessageId} />
+                    </Button>
+                    <div>
+                      <FormField
+                        control={form.control}
+                        name={`workingHours.${day}.time.from`}
+                        render={({ field }) => (
+                          <>
+                            <ClockInput
+                              className='mx-2 h-6 w-11 border-0 border-b p-1'
+                              disabled={dayOff}
+                              {...field}
+                            />
+                            <FormMessage className='text-xs'>
+                              {form.formState.errors?.workingHours?.[day]?.time?.from && (
+                                <I18nText
+                                  path={
+                                    form.formState.errors?.workingHours[day]?.time?.from
+                                      ?.message as LocaleMessageId
+                                  }
+                                />
+                              )}
+                            </FormMessage>
+                          </>
+                        )}
+                      />
+                    </div>
+                    <I18nText path='dialog.addAddress.form.untill' />
+                    <div>
+                      <FormField
+                        control={form.control}
+                        name={`workingHours.${day}.time.to`}
+                        render={({ field }) => (
+                          <>
+                            <ClockInput
+                              className='mx-2 h-6 w-11 border-0 border-b p-1'
+                              disabled={dayOff}
+                              {...field}
+                            />
+                            <FormMessage className='text-xs'>
+                              {form.formState.errors?.workingHours?.[day]?.time?.to && (
+                                <I18nText
+                                  path={
+                                    form.formState.errors?.workingHours[day]?.time?.to
+                                      ?.message as LocaleMessageId
+                                  }
+                                />
+                              )}
+                            </FormMessage>
+                          </>
+                        )}
+                      />
+                    </div>
+                  </div>
+                );
+              })}
+            </div>
+          </div>
+
+          <Button type='submit' variant='secondary' loading={state.isLoading}>
+            <I18nText path='button.save' />
+          </Button>
+        </fieldset>
+      </form>
+    </Form>
+  );
+};
diff --git a/app/partner/addresses/(components)/ActionAddressForm/constants/actionAddressSchema.ts b/app/partner/addresses/(components)/ActionAddressForm/constants/actionAddressSchema.ts
new file mode 100644
index 00000000..508efb6f
--- /dev/null
+++ b/app/partner/addresses/(components)/ActionAddressForm/constants/actionAddressSchema.ts
@@ -0,0 +1,29 @@
+import * as z from 'zod';
+
+const timeSchema = z.object({
+  from: z.string(),
+  to: z.string()
+});
+
+const workingHourSchema = z.object({
+  time: timeSchema,
+  dayOff: z.boolean()
+});
+
+export const actionAddressSchema = z.object({
+  locality: z.string().min(1, { message: 'validation.required' }),
+  street: z.string().min(1, { message: 'validation.required' }),
+  house: z.string().min(1, { message: 'validation.required' }),
+  details: z.string(),
+  workingHours: z.object({
+    '0': workingHourSchema,
+    '1': workingHourSchema,
+    '2': workingHourSchema,
+    '3': workingHourSchema,
+    '4': workingHourSchema,
+    '5': workingHourSchema,
+    '6': workingHourSchema
+  })
+});
+
+export type ActionAddressSchema = z.infer<typeof actionAddressSchema>;
diff --git a/app/partner/addresses/(components)/ActionAddressForm/constants/index.ts b/app/partner/addresses/(components)/ActionAddressForm/constants/index.ts
new file mode 100644
index 00000000..67256cd6
--- /dev/null
+++ b/app/partner/addresses/(components)/ActionAddressForm/constants/index.ts
@@ -0,0 +1,2 @@
+export * from './actionAddressSchema';
+export * from './types';
diff --git a/app/partner/addresses/(components)/ActionAddressForm/constants/types.ts b/app/partner/addresses/(components)/ActionAddressForm/constants/types.ts
new file mode 100644
index 00000000..1d7e798d
--- /dev/null
+++ b/app/partner/addresses/(components)/ActionAddressForm/constants/types.ts
@@ -0,0 +1 @@
+export type AddressActionType = 'add' | 'edit';
diff --git a/app/partner/addresses/(components)/ActionAddressForm/helpers/convertLocalitiesToComboboxItems.ts b/app/partner/addresses/(components)/ActionAddressForm/helpers/convertLocalitiesToComboboxItems.ts
new file mode 100644
index 00000000..d79e4fae
--- /dev/null
+++ b/app/partner/addresses/(components)/ActionAddressForm/helpers/convertLocalitiesToComboboxItems.ts
@@ -0,0 +1,10 @@
+export const convertLocalitiesToComboboxItems = (addresses: AddressResponseFixMe[]) =>
+  addresses
+    .filter(
+      (address) =>
+        address.city && !address.street && !address.house && !address.flat && address.cityWithType
+    )
+    .map((address) => ({
+      label: address.cityWithType,
+      value: address.cityWithType
+    }));
diff --git a/app/partner/addresses/(components)/ActionAddressForm/helpers/convertWorkingHours.ts b/app/partner/addresses/(components)/ActionAddressForm/helpers/convertWorkingHours.ts
new file mode 100644
index 00000000..a2fb87eb
--- /dev/null
+++ b/app/partner/addresses/(components)/ActionAddressForm/helpers/convertWorkingHours.ts
@@ -0,0 +1,15 @@
+import type { WorkingHour } from '../../../(constants)/types';
+import type { ActionAddressSchema } from '../constants/actionAddressSchema';
+
+export const convertWorkingHours = (workingHours: WorkingHour[]) =>
+  workingHours.reduce(
+    (acc, workingHour, index) => {
+      const { from, to } = workingHour;
+      acc[index] = {
+        ...workingHour,
+        time: { from: `${from.hour}:${from.minutes}`, to: `${to.hour}:${to.minutes}` }
+      };
+      return acc;
+    },
+    {} as ActionAddressSchema['workingHours']
+  );
diff --git a/app/partner/addresses/(components)/ActionAddressForm/helpers/index.ts b/app/partner/addresses/(components)/ActionAddressForm/helpers/index.ts
new file mode 100644
index 00000000..1910a447
--- /dev/null
+++ b/app/partner/addresses/(components)/ActionAddressForm/helpers/index.ts
@@ -0,0 +1,2 @@
+export * from './convertLocalitiesToComboboxItems';
+export * from './convertWorkingHours';
diff --git a/app/partner/addresses/(components)/ActionAddressForm/hooks/useActionAddressForm.tsx b/app/partner/addresses/(components)/ActionAddressForm/hooks/useActionAddressForm.tsx
new file mode 100644
index 00000000..d14fb79f
--- /dev/null
+++ b/app/partner/addresses/(components)/ActionAddressForm/hooks/useActionAddressForm.tsx
@@ -0,0 +1,112 @@
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useParams } from 'next/navigation';
+import { toast } from 'sonner';
+
+import { useI18n } from '@/utils/contexts';
+
+import type { AddressData } from '../../../(constants)/types';
+import type { ActionAddressSchema, AddressActionType } from '../constants';
+import { actionAddressSchema } from '../constants';
+import { convertWorkingHours } from '../helpers';
+
+import { useOrganizationActionAddressMutation } from './useOrganizationActionAddressMutation';
+
+interface UseActionEmployeeFormParams {
+  onAction: () => void;
+  actionType: AddressActionType;
+  address?: AddressData;
+}
+
+const DEFAULT_WORKING_HOURS = {
+  '0': { time: { from: '09:00', to: '18:00' }, dayOff: false },
+  '1': { time: { from: '09:00', to: '18:00' }, dayOff: false },
+  '2': { time: { from: '09:00', to: '18:00' }, dayOff: false },
+  '3': { time: { from: '09:00', to: '18:00' }, dayOff: false },
+  '4': { time: { from: '09:00', to: '18:00' }, dayOff: false },
+  '5': { time: { from: '09:00', to: '18:00' }, dayOff: false },
+  '6': { time: { from: '09:00', to: '18:00' }, dayOff: true }
+};
+
+export const useActionAddressForm = ({
+  onAction,
+  address,
+  actionType
+}: UseActionEmployeeFormParams) => {
+  const i18n = useI18n();
+  const params = useParams<{ organizationId: string }>();
+
+  const actionAddressForm = useForm<ActionAddressSchema>({
+    mode: 'onSubmit',
+    resolver: zodResolver(actionAddressSchema),
+    defaultValues: {
+      locality: address?.locality ?? '',
+      street: address?.street ?? '',
+      house: address?.house ?? '',
+      details: address?.details ?? '',
+      workingHours: address?.workingHours
+        ? convertWorkingHours(address.workingHours)
+        : DEFAULT_WORKING_HOURS
+    }
+  });
+
+  const organizationActionAddressMutation = useOrganizationActionAddressMutation();
+
+  const onSubmit = actionAddressForm.handleSubmit(async (values) => {
+    const formattedWorkingHours = Object.entries(values.workingHours).map(([day, element]) => {
+      const [from1, from2] = element.time.from.split(':');
+      const [to1, to2] = element.time.to.split(':');
+
+      const fromHour = Number(from1);
+      const fromMinutes = Number(from2);
+
+      const toHour = Number(to1);
+      const toMinutes = Number(to2);
+
+      return {
+        day: Number(day),
+        from: { hour: fromHour, minutes: fromMinutes },
+        to: { hour: toHour, minutes: toMinutes },
+        dayOff: element.dayOff
+      };
+    });
+
+    const requestParams = { ...values, workingHours: formattedWorkingHours };
+
+    if (actionType === 'add') {
+      const postOrganizationActionAddressParams = {
+        params: { ...requestParams, legalEntityId: params.organizationId },
+        action: actionType
+      } as const;
+
+      await organizationActionAddressMutation.mutateAsync(postOrganizationActionAddressParams);
+
+      toast.success(i18n.formatMessage({ id: 'toast.addAddress' }), {
+        cancel: { label: 'Close' }
+      });
+    }
+
+    if (actionType === 'edit') {
+      const putOrganizationActionAddressParams = {
+        params: { ...requestParams, id: address!.id },
+        action: actionType
+      } as const;
+
+      await organizationActionAddressMutation.mutateAsync(putOrganizationActionAddressParams);
+
+      toast.success(i18n.formatMessage({ id: 'toast.editAddress' }), {
+        cancel: { label: 'Close' }
+      });
+    }
+
+    onAction();
+  });
+
+  return {
+    state: {
+      isLoading: organizationActionAddressMutation.isPending
+    },
+    form: actionAddressForm,
+    functions: { onSubmit }
+  };
+};
diff --git a/app/partner/addresses/(components)/ActionAddressForm/hooks/useOrganizationActionAddressMutation.ts b/app/partner/addresses/(components)/ActionAddressForm/hooks/useOrganizationActionAddressMutation.ts
new file mode 100644
index 00000000..3703c99d
--- /dev/null
+++ b/app/partner/addresses/(components)/ActionAddressForm/hooks/useOrganizationActionAddressMutation.ts
@@ -0,0 +1,31 @@
+import { useMutation } from '@tanstack/react-query';
+
+import type { PostLegalAddressRequestConfig, PutLegalAddressByIdRequestConfig } from '@/utils/api';
+import { postLegalAddress, putLegalAddressById } from '@/utils/api';
+
+export const useOrganizationActionAddressMutation = (
+  settings?: MutationSettings<
+    | (PostLegalAddressRequestConfig & {
+        action: 'add';
+      })
+    | (PutLegalAddressByIdRequestConfig & {
+        action: 'edit';
+      }),
+    typeof postLegalAddress | typeof putLegalAddressById
+  >
+) =>
+  useMutation({
+    mutationKey: ['organizationActionAdressMutation'],
+    mutationFn: ({ params, action, config }) => {
+      if (action === 'add') {
+        return postLegalAddress({ params, config: { ...settings?.config, ...config } });
+      }
+
+      if (action === 'edit') {
+        return putLegalAddressById({ params, config: { ...settings?.config, ...config } });
+      }
+
+      throw new Error('Invalid action');
+    },
+    ...settings?.options
+  });
diff --git a/app/partner/addresses/(components)/AddAddressDialog/AddAddressDialog.tsx b/app/partner/addresses/(components)/AddAddressDialog/AddAddressDialog.tsx
new file mode 100644
index 00000000..cf7c23f0
--- /dev/null
+++ b/app/partner/addresses/(components)/AddAddressDialog/AddAddressDialog.tsx
@@ -0,0 +1,51 @@
+'use client';
+
+import React from 'react';
+import { PlusCircledIcon } from '@radix-ui/react-icons';
+import { XIcon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  Button,
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+  Typography
+} from '@/components/ui';
+
+import { ActionAddressForm } from '../ActionAddressForm/ActionAddressForm';
+
+import { useAddAddressDialog } from './hooks/useAddAddressDialog';
+
+export const AddAddressDialog = () => {
+  const { state, functions } = useAddAddressDialog();
+
+  return (
+    <Dialog open={state.open} onOpenChange={functions.setOpen}>
+      <DialogTrigger asChild>
+        <Button variant='light' className='mx-2 p-5' size='sm'>
+          <PlusCircledIcon className='mr-2 h-4 w-4' />
+          <I18nText path='button.addAddress' />
+        </Button>
+      </DialogTrigger>
+      <DialogContent className='flex h-fit w-11/12 max-w-[713px] flex-col rounded-lg smx:max-h-[90%]'>
+        <DialogClose disabled={state.isLoading}>
+          <XIcon className='h-6 w-6' />
+        </DialogClose>
+        <DialogHeader>
+          <DialogTitle>
+            <Typography variant='h4' tag='h4'>
+              <I18nText path='dialog.addAddress.title' />
+            </Typography>
+          </DialogTitle>
+        </DialogHeader>
+        <div className='flex h-full flex-col items-end justify-between overflow-y-auto rounded-lg border p-5'>
+          <ActionAddressForm onAction={functions.onAction} actionType='add' />
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/app/partner/addresses/(components)/AddAddressDialog/hooks/useAddAddressDialog.ts b/app/partner/addresses/(components)/AddAddressDialog/hooks/useAddAddressDialog.ts
new file mode 100644
index 00000000..e61d0c33
--- /dev/null
+++ b/app/partner/addresses/(components)/AddAddressDialog/hooks/useAddAddressDialog.ts
@@ -0,0 +1,16 @@
+import React from 'react';
+import { useRouter } from 'next/navigation';
+
+export const useAddAddressDialog = () => {
+  const router = useRouter();
+
+  const [open, setOpen] = React.useState(false);
+  const [isAddPending, setAddTransition] = React.useTransition();
+
+  const onAction = () => {
+    setOpen(false);
+    setAddTransition(() => router.refresh());
+  };
+
+  return { state: { open, isLoading: isAddPending }, functions: { setOpen, onAction } };
+};
diff --git a/app/partner/addresses/(components)/AddressCard/AddressCard.tsx b/app/partner/addresses/(components)/AddressCard/AddressCard.tsx
new file mode 100644
index 00000000..354d93e6
--- /dev/null
+++ b/app/partner/addresses/(components)/AddressCard/AddressCard.tsx
@@ -0,0 +1,152 @@
+'use client';
+
+import { Edit3Icon, MoreHorizontalIcon, Trash2Icon } from 'lucide-react';
+
+import { BoldText, I18nText } from '@/components/common';
+import {
+  AlertDialog,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  Button,
+  Card,
+  CardContent,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  Typography
+} from '@/components/ui';
+
+import type { AddressData } from '../../(constants)/types';
+import { EditAddressDialog } from '../EditAddressDialog/EditAddressDialog';
+
+import { WorkingHoursList } from './components/WorkingHoursList/WorkingHoursList';
+import { useAddressCard } from './hooks/useAddressCard';
+
+interface AddressCardProps {
+  address: AddressData;
+}
+
+export const AddressCard = ({ address }: AddressCardProps) => {
+  const { state, functions } = useAddressCard({ address });
+
+  return (
+    <Card className='relative min-w-[340px] flex-1'>
+      <AlertDialog open={state.deleteAlertOpen}>
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>
+              <I18nText path='addressCard.deleteAlert.title' />
+            </AlertDialogTitle>
+            <AlertDialogDescription>
+              <I18nText
+                path='addressCard.deleteAlert.description'
+                values={{
+                  bold: BoldText,
+                  name: `${address.locality} ${address.street}, ${address.house}`
+                }}
+              />
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <Button
+              variant='outline'
+              disabled={state.isLoading}
+              onClick={functions.onDeleteCloseClick}
+            >
+              <I18nText path='button.cancel' />
+            </Button>
+
+            <Button loading={state.isLoading} onClick={functions.onAlertDeleteClick}>
+              <I18nText path='button.delete' />
+            </Button>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+      <CardContent className='flex flex-row-reverse justify-between p-8 pb-12 pr-5 pt-4'>
+        <div className='right absolute right-2 top-2 z-10 flex gap-1'>
+          <EditAddressDialog
+            open={state.editDialogOpen}
+            onOpenChange={functions.onEditCloseClick}
+            address={address}
+            onEdit={functions.onEdit}
+          />
+
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button variant='ghost' size='icon' loading={state.isLoading}>
+                <MoreHorizontalIcon />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent>
+              <DropdownMenuItem className='cursor-pointer' onClick={functions.onEditClick}>
+                <Edit3Icon className='mr-2 h-4 w-4' />
+                <Typography tag='p' variant='body2'>
+                  <I18nText path='button.edit' />
+                </Typography>
+              </DropdownMenuItem>
+              <DropdownMenuItem
+                className='cursor-pointer text-red-600 focus:text-red-600'
+                onClick={functions.onDeleteClick}
+              >
+                <Trash2Icon className='mr-2 h-4 w-4' />
+                <Typography tag='p' variant='body2'>
+                  <I18nText path='button.delete' />
+                </Typography>
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
+        <div className='mt-6 flex flex-1 flex-col space-y-3'>
+          <div className='flex justify-between'>
+            <Typography variant='sub2' tag='h3' className='flex-1'>
+              <I18nText path='table.column.location' />
+            </Typography>
+            <Typography variant='body2' tag='p' className='flex-1'>
+              {address.locality}
+            </Typography>
+          </div>
+
+          <div className='flex justify-between'>
+            <Typography variant='sub2' tag='h3' className='flex-1'>
+              <I18nText path='field.street.label' />
+            </Typography>
+            <Typography variant='body2' tag='p' className='flex-1'>
+              {address.street}
+            </Typography>
+          </div>
+
+          <div className='flex justify-between'>
+            <Typography variant='sub2' tag='h3' className='flex-1'>
+              <I18nText path='field.house.label' />
+            </Typography>
+            <Typography variant='body2' tag='p' className='flex-1'>
+              {address.house}
+            </Typography>
+          </div>
+
+          <div className='flex justify-between'>
+            <Typography variant='sub2' tag='h3' className='flex-1'>
+              <I18nText path='field.details.label' />
+            </Typography>
+            <Typography variant='body2' tag='p' className='flex-1'>
+              {address.details}
+            </Typography>
+          </div>
+
+          <div className='flex justify-between'>
+            <Typography variant='sub2' tag='h3' className='flex-1'>
+              <I18nText path='addressCard.description.workingTime' />
+            </Typography>
+            <Typography variant='body2' className='flex-1'>
+              <WorkingHoursList workingHours={address.workingHours} />
+            </Typography>
+          </div>
+        </div>
+      </CardContent>
+    </Card>
+  );
+};
diff --git a/app/partner/addresses/(components)/AddressCard/components/WorkingHoursList/WorkingHoursList.tsx b/app/partner/addresses/(components)/AddressCard/components/WorkingHoursList/WorkingHoursList.tsx
new file mode 100644
index 00000000..e117b6bf
--- /dev/null
+++ b/app/partner/addresses/(components)/AddressCard/components/WorkingHoursList/WorkingHoursList.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+
+import { I18nText } from '@/components/common';
+
+import type { WorkingHour } from '../../../../(constants)/types';
+
+interface WorkingHoursListProps {
+  workingHours: WorkingHour[];
+}
+
+const formatTime = (time: number) => {
+  return time.toString().padStart(2, '0');
+};
+
+export const WorkingHoursList = ({ workingHours }: WorkingHoursListProps) => {
+  const formattedWorkingHours = workingHours.reduce(
+    (acc, workingHour) => {
+      if (workingHour.dayOff) {
+        const dayOffKey = 'dayOfWeek.dayOff';
+        if (acc[dayOffKey]) {
+          acc[dayOffKey].push(workingHour);
+        } else acc[dayOffKey] = [workingHour];
+      }
+
+      if (!workingHour.dayOff) {
+        const timeKey = `${formatTime(workingHour.from.hour)}:${formatTime(workingHour.from.minutes)} - ${formatTime(workingHour.to.hour)}:${formatTime(workingHour.to.minutes)}`;
+        if (acc[timeKey]) {
+          acc[timeKey].push(workingHour);
+        } else acc[timeKey] = [workingHour];
+      }
+
+      return acc;
+    },
+    {} as Record<string, WorkingHourDto[]>
+  );
+
+  return (
+    <div className='flex flex-wrap gap-2'>
+      {Object.entries(formattedWorkingHours).map(([key, workingHours], index) => (
+        <div key={index}>
+          {workingHours.map((workingHour, index) => (
+            <React.Fragment key={index}>
+              <I18nText path={`dayOfWeek.${workingHour.day + 1}` as LocaleMessageId} />
+              {index !== workingHours.length - 1 ? ', ' : ''}
+            </React.Fragment>
+          ))}
+          {key === 'dayOfWeek.dayOff' && (
+            <>
+              : <I18nText path='dayOfWeek.dayOff' />
+            </>
+          )}
+          {key !== 'dayOfWeek.dayOff' && <>: {key}</>}
+        </div>
+      ))}
+    </div>
+  );
+};
diff --git a/app/partner/addresses/(components)/AddressCard/hooks/useAddressCard.ts b/app/partner/addresses/(components)/AddressCard/hooks/useAddressCard.ts
new file mode 100644
index 00000000..40734567
--- /dev/null
+++ b/app/partner/addresses/(components)/AddressCard/hooks/useAddressCard.ts
@@ -0,0 +1,70 @@
+import React from 'react';
+import { useRouter } from 'next/navigation';
+import { toast } from 'sonner';
+
+import { useDeleteLegalAddressByIdMutation } from '@/utils/api';
+import { useI18n } from '@/utils/contexts';
+
+import type { AddressData } from '../../../(constants)/types';
+
+interface UseAddressCardParams {
+  address: AddressData;
+}
+
+export const useAddressCard = ({ address }: UseAddressCardParams) => {
+  const i18n = useI18n();
+  const router = useRouter();
+
+  const [editDialogOpen, setEditDialogOpen] = React.useState(false);
+  const [deleteAlertOpen, setDeleteAlertOpen] = React.useState(false);
+  const [isDeletePending, startDeleteTransition] = React.useTransition();
+  const [isEditPending, startEditTransition] = React.useTransition();
+
+  const deleteLegalAddressByIdMutation = useDeleteLegalAddressByIdMutation();
+
+  const onAlertDeleteClick = async () => {
+    await deleteLegalAddressByIdMutation.mutateAsync({ params: { id: address.id } });
+    toast.success(
+      i18n.formatMessage(
+        { id: 'toast.deleted' },
+        { name: `${address.locality} ${address.street}, ${address.house}` }
+      ),
+      {
+        cancel: { label: i18n.formatMessage({ id: 'button.close' }) }
+      }
+    );
+    setDeleteAlertOpen(false);
+    startDeleteTransition(() => router.refresh());
+  };
+
+  const onEdit = () => {
+    toast.success(i18n.formatMessage({ id: 'toast.editAddress' }), {
+      cancel: { label: i18n.formatMessage({ id: 'button.close' }) }
+    });
+
+    setEditDialogOpen(false);
+    startEditTransition(() => router.refresh());
+  };
+
+  const onEditClick = () => setEditDialogOpen(true);
+  const onEditCloseClick = () => setEditDialogOpen(false);
+
+  const onDeleteClick = () => setDeleteAlertOpen(true);
+  const onDeleteCloseClick = () => setDeleteAlertOpen(false);
+
+  return {
+    state: {
+      editDialogOpen,
+      deleteAlertOpen,
+      isLoading: deleteLegalAddressByIdMutation.isPending || isDeletePending || isEditPending
+    },
+    functions: {
+      onEdit,
+      onDeleteClick,
+      onEditClick,
+      onEditCloseClick,
+      onAlertDeleteClick,
+      onDeleteCloseClick
+    }
+  };
+};
diff --git a/app/partner/addresses/(components)/EditAddressDialog/EditAddressDialog.tsx b/app/partner/addresses/(components)/EditAddressDialog/EditAddressDialog.tsx
new file mode 100644
index 00000000..9c3052a4
--- /dev/null
+++ b/app/partner/addresses/(components)/EditAddressDialog/EditAddressDialog.tsx
@@ -0,0 +1,42 @@
+'use client';
+
+import React from 'react';
+import { XIcon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  Typography
+} from '@/components/ui';
+
+import type { AddressData } from '../../(constants)/types';
+import { ActionAddressForm } from '../ActionAddressForm/ActionAddressForm';
+
+interface EditAddressDialogProps extends React.ComponentProps<typeof Dialog> {
+  onEdit: () => void;
+  address: AddressData;
+}
+
+export const EditAddressDialog = ({ onEdit, address, ...props }: EditAddressDialogProps) => (
+  <Dialog {...props}>
+    <DialogContent className='flex h-fit w-11/12 max-w-[713px] flex-col rounded-lg smx:max-h-[90%]'>
+      <DialogClose>
+        <XIcon className='h-6 w-6' />
+      </DialogClose>
+      <DialogHeader>
+        <DialogTitle>
+          <Typography variant='h4' tag='h4'>
+            <I18nText path='dialog.addAddress.title' />
+          </Typography>
+        </DialogTitle>
+      </DialogHeader>
+      <div className='flex h-full flex-col items-end justify-between overflow-y-auto rounded-lg border p-5'>
+        <ActionAddressForm onAction={onEdit} actionType='edit' address={address} />
+      </div>
+    </DialogContent>
+  </Dialog>
+);
diff --git a/app/partner/addresses/(constants)/types.ts b/app/partner/addresses/(constants)/types.ts
new file mode 100644
index 00000000..01e96af9
--- /dev/null
+++ b/app/partner/addresses/(constants)/types.ts
@@ -0,0 +1,21 @@
+export interface WorkingHour {
+  day: number;
+  from: {
+    hour: number;
+    minutes: number;
+  };
+  to: {
+    hour: number;
+    minutes: number;
+  };
+  dayOff: boolean;
+}
+
+export interface AddressData {
+  id: string;
+  locality: string;
+  street: string;
+  house: string;
+  details?: string;
+  workingHours: WorkingHour[];
+}
diff --git a/app/partner/addresses/loading.tsx b/app/partner/addresses/loading.tsx
new file mode 100644
index 00000000..11aeb7ec
--- /dev/null
+++ b/app/partner/addresses/loading.tsx
@@ -0,0 +1,29 @@
+import { AddressCardSkeleton } from '@/components/ui';
+import { Skeleton } from '@/components/ui/skeleton';
+
+const PartnerAddressesLoading = () => (
+  <>
+    <div className='flex justify-between'>
+      <Skeleton className='h-8 w-28 bg-background' />
+      <Skeleton className='h-10 w-36 bg-background' />
+    </div>
+
+    <div className='grid grid-cols-1 gap-3 lg:grid-cols-2'>
+      {Array(5)
+        .fill({})
+        .map((_, index) => (
+          <div
+            className='flex min-h-72 min-w-[300px] flex-row-reverse space-y-3 rounded bg-background p-8 pr-5 pt-4'
+            key={index}
+          >
+            <div className='ml-2 flex flex-1 justify-end'>
+              <Skeleton className='float-right h-6 w-6 rounded-full pb-3' />
+            </div>
+            <AddressCardSkeleton />
+          </div>
+        ))}
+    </div>
+  </>
+);
+
+export default PartnerAddressesLoading;
diff --git a/app/partner/addresses/page.tsx b/app/partner/addresses/page.tsx
new file mode 100644
index 00000000..0b0b5934
--- /dev/null
+++ b/app/partner/addresses/page.tsx
@@ -0,0 +1,37 @@
+import { I18nText } from '@/components/common';
+import { Typography } from '@/components/ui';
+import { getLegalAddressesByLegalId, getOrganizationCurrent } from '@/utils/api/requests';
+
+import { AddAddressDialog } from './(components)/AddAddressDialog/AddAddressDialog';
+import { AddressCard } from './(components)/AddressCard/AddressCard';
+
+const PartnerAddressesPage = async () => {
+  const getOrganizationCurrentResponse = await getOrganizationCurrent({
+    config: { cache: 'no-store' }
+  });
+
+  const getLegalAddressesByLegalIdResponse = await getLegalAddressesByLegalId({
+    params: { legalId: getOrganizationCurrentResponse.id },
+    config: {
+      cache: 'no-store'
+    }
+  });
+
+  return (
+    <>
+      <div className='flex justify-between'>
+        <Typography variant='h5' tag='h5'>
+          <I18nText path='partners.addresses.title' />
+        </Typography>
+        <AddAddressDialog />
+      </div>
+      <div className='grid grid-cols-1 gap-3 lg:grid-cols-2'>
+        {getLegalAddressesByLegalIdResponse.map((address) => (
+          <AddressCard key={address.id} address={address} />
+        ))}
+      </div>
+    </>
+  );
+};
+
+export default PartnerAddressesPage;
diff --git a/app/partner/employees/(components)/ActionEmployeeForm/ActionEmployeeForm.tsx b/app/partner/employees/(components)/ActionEmployeeForm/ActionEmployeeForm.tsx
new file mode 100644
index 00000000..74c4e247
--- /dev/null
+++ b/app/partner/employees/(components)/ActionEmployeeForm/ActionEmployeeForm.tsx
@@ -0,0 +1,228 @@
+import { I18nText } from '@/components/common';
+import { DropzoneCard } from '@/components/dropzone';
+import {
+  Button,
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  Input,
+  PhoneNumberInput,
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+  Typography
+} from '@/components/ui';
+import { useI18n } from '@/utils/contexts';
+
+import type { EmployeeData } from '../../(constants)/types';
+
+import { useActionEmployeeForm } from './hooks/useActionEmployeeForm';
+import type { EmployeeActionType } from './constants';
+
+interface ActionEmployeeProps<ActionType extends EmployeeActionType> {
+  onAction: () => void;
+  actionType: ActionType;
+  employee?: EmployeeData;
+}
+
+export const ActionEmployeeForm = <ActionType extends EmployeeActionType>({
+  onAction,
+  actionType,
+  employee
+}: ActionEmployeeProps<ActionType>) => {
+  const i18n = useI18n();
+  const { state, form, functions } = useActionEmployeeForm({ onAction, actionType, employee });
+
+  return (
+    <Form {...form}>
+      <form onSubmit={functions.onSubmit} className='w-full'>
+        <fieldset disabled={state.isLoading} className='flex w-full flex-col items-end'>
+          <div className='mb-7 flex w-full gap-5 smx:flex-col'>
+            <div className='flex-1 space-y-3'>
+              {state.showPreview && employee?.image && (
+                <div className='flex items-center gap-3'>
+                  <DropzoneCard
+                    value={employee.image}
+                    onChange={functions.onDeletePreviewClick}
+                    className='h-32 w-32'
+                  />
+                  <Typography variant='sub2'>{employee.image.split('/').at(-1)}</Typography>
+                </div>
+              )}
+              {!state.showPreview && (
+                <FormField
+                  control={form.control}
+                  name='file'
+                  render={({ field }) => {
+                    const fileFieldValue = form.getValues('file');
+
+                    return (
+                      <FormItem className='flex items-center gap-3'>
+                        <FormControl>
+                          <div>
+                            <DropzoneCard {...field} className='h-32 w-32' />
+                          </div>
+                        </FormControl>
+                        <div>
+                          {fileFieldValue && (
+                            <Typography variant='sub2'>{fileFieldValue.name}</Typography>
+                          )}
+
+                          {!fileFieldValue && (
+                            <>
+                              <Typography variant='sub2'>
+                                <I18nText path='field.imageDownload.title' />
+                              </Typography>
+                              <Typography variant='body2'>
+                                <I18nText path='field.imageDownload.description' />
+                              </Typography>
+                            </>
+                          )}
+                          <FormMessage>
+                            {form.formState?.errors?.file && (
+                              <I18nText
+                                path={form.formState.errors.file.message as LocaleMessageId}
+                              />
+                            )}
+                          </FormMessage>
+                        </div>
+                      </FormItem>
+                    );
+                  }}
+                />
+              )}
+              <FormField
+                control={form.control}
+                name='role'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <I18nText path='field.role.label' />
+                    </FormLabel>
+                    <FormControl>
+                      <Select {...field} value={field.value} onValueChange={field.onChange}>
+                        <SelectTrigger className='h-8 w-48'>
+                          <SelectValue placeholder='Роль' />
+                        </SelectTrigger>
+                        <SelectContent>
+                          <SelectItem value='Administrator'>
+                            <I18nText path='organization.employee.role.administrator' />
+                          </SelectItem>
+                          <SelectItem value='Leading'>
+                            <I18nText path='organization.employee.role.leading' />
+                          </SelectItem>
+                          <SelectItem value='Manager'>
+                            <I18nText path='organization.employee.role.manager' />
+                          </SelectItem>
+                        </SelectContent>
+                      </Select>
+                    </FormControl>
+                    <FormMessage>
+                      {form.formState?.errors?.role && (
+                        <I18nText path={form.formState.errors.role.message as LocaleMessageId} />
+                      )}
+                    </FormMessage>
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={form.control}
+                name='surname'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <I18nText path='field.surname.label' />
+                    </FormLabel>
+                    <FormControl>
+                      <Input {...field} />
+                    </FormControl>
+                    <FormMessage>
+                      {form.formState?.errors?.surname && (
+                        <I18nText path={form.formState.errors.surname.message as LocaleMessageId} />
+                      )}
+                    </FormMessage>
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={form.control}
+                name='name'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <I18nText path='field.name.label' />
+                    </FormLabel>
+                    <FormControl>
+                      <Input {...field} />
+                    </FormControl>
+                    <FormMessage>
+                      {form.formState?.errors?.name && (
+                        <I18nText path={form.formState.errors.name.message as LocaleMessageId} />
+                      )}
+                    </FormMessage>
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={form.control}
+                name='email'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <I18nText path='field.email.label' />
+                    </FormLabel>
+                    <FormControl>
+                      <Input
+                        {...field}
+                        placeholder={i18n.formatMessage({ id: 'field.email.placeholder' })}
+                      />
+                    </FormControl>
+                    <FormMessage>
+                      {form.formState?.errors?.email && (
+                        <I18nText path={form.formState.errors.email.message as LocaleMessageId} />
+                      )}
+                    </FormMessage>
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={form.control}
+                name='phone'
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <I18nText path='field.phone.label' />
+                    </FormLabel>
+                    <FormControl>
+                      <PhoneNumberInput {...field} />
+                    </FormControl>
+                    <FormMessage>
+                      {form.formState?.errors?.phone && (
+                        <I18nText path={form.formState.errors.phone.message as LocaleMessageId} />
+                      )}
+                    </FormMessage>
+                  </FormItem>
+                )}
+              />
+            </div>
+          </div>
+          <Button
+            type='submit'
+            variant='default'
+            size='lg'
+            loading={state.isLoading}
+            className='w-full'
+          >
+            {actionType === 'add' && <I18nText path='button.add' />}
+            {actionType === 'edit' && <I18nText path='button.save' />}
+          </Button>
+        </fieldset>
+      </form>
+    </Form>
+  );
+};
diff --git a/app/partner/employees/(components)/ActionEmployeeForm/constants/actionEmployeeSchema.ts b/app/partner/employees/(components)/ActionEmployeeForm/constants/actionEmployeeSchema.ts
new file mode 100644
index 00000000..8ce4eec7
--- /dev/null
+++ b/app/partner/employees/(components)/ActionEmployeeForm/constants/actionEmployeeSchema.ts
@@ -0,0 +1,34 @@
+import * as z from 'zod';
+
+const MAX_FILE_SIZE = 5000000;
+const ACCEPTED_IMAGE_TYPES = ['image/jpeg', 'image/jpg', 'image/png', 'image/webp'];
+
+export const actionEmployeeSchema = z.object({
+  role: z.enum(['Administrator', 'Leading', 'Manager']),
+  surname: z.string().min(1, { message: 'validation.required' }),
+  name: z.string().min(1, { message: 'validation.required' }),
+  email: z
+    .string()
+    .min(1, {
+      message: 'validation.required'
+    })
+    .email({
+      message: 'validation.email.format'
+    }),
+  phone: z.string().min(1, { message: 'validation.required' }),
+  file: z
+    .custom<File>((file) => file instanceof File)
+    .optional()
+    .refine((file) => !file || (file instanceof File && file.size <= MAX_FILE_SIZE), {
+      message: 'validation.photo.max'
+    })
+    .refine(
+      (file) => {
+        if (!file) return true;
+        return ACCEPTED_IMAGE_TYPES.includes(file?.type);
+      },
+      { message: 'validation.photo.format' }
+    )
+});
+
+export type EmployeeSchema = z.infer<typeof actionEmployeeSchema>;
diff --git a/app/partner/employees/(components)/ActionEmployeeForm/constants/index.ts b/app/partner/employees/(components)/ActionEmployeeForm/constants/index.ts
new file mode 100644
index 00000000..c6c8d220
--- /dev/null
+++ b/app/partner/employees/(components)/ActionEmployeeForm/constants/index.ts
@@ -0,0 +1,2 @@
+export * from './actionEmployeeSchema';
+export * from './types';
diff --git a/app/partner/employees/(components)/ActionEmployeeForm/constants/types.ts b/app/partner/employees/(components)/ActionEmployeeForm/constants/types.ts
new file mode 100644
index 00000000..79e18de3
--- /dev/null
+++ b/app/partner/employees/(components)/ActionEmployeeForm/constants/types.ts
@@ -0,0 +1 @@
+export type EmployeeActionType = 'add' | 'edit';
diff --git a/app/partner/employees/(components)/ActionEmployeeForm/hooks/useActionEmployeeForm.ts b/app/partner/employees/(components)/ActionEmployeeForm/hooks/useActionEmployeeForm.ts
new file mode 100644
index 00000000..9893b66a
--- /dev/null
+++ b/app/partner/employees/(components)/ActionEmployeeForm/hooks/useActionEmployeeForm.ts
@@ -0,0 +1,97 @@
+import React from 'react';
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useParams } from 'next/navigation';
+import { toast } from 'sonner';
+
+import { useI18n } from '@/utils/contexts';
+
+import type { EmployeeData } from '../../../(constants)/types';
+import type { EmployeeSchema } from '../constants/actionEmployeeSchema';
+import { actionEmployeeSchema } from '../constants/actionEmployeeSchema';
+import type { EmployeeActionType } from '../constants/types';
+
+import { useOrganizationActionEmployeeMutation } from './useOrganizationActionEmployeeMutation';
+
+interface UseActionEmployeeFormParams {
+  onAction: () => void;
+  actionType: EmployeeActionType;
+  employee?: EmployeeData;
+}
+
+export const useActionEmployeeForm = ({
+  onAction,
+  employee,
+  actionType
+}: UseActionEmployeeFormParams) => {
+  const i18n = useI18n();
+  const params = useParams<{ organizationId: string }>();
+
+  const [showPreview, setShowPreview] = React.useState(actionType === 'edit' && !!employee?.image);
+  const onDeletePreviewClick = () => setShowPreview(false);
+
+  const actionEmployeeForm = useForm<EmployeeSchema>({
+    mode: 'onSubmit',
+    resolver: zodResolver(actionEmployeeSchema),
+    defaultValues: {
+      role: employee?.role ?? 'Manager',
+      name: employee?.name ?? '',
+      surname: employee?.surname ?? '',
+      email: employee?.email ?? '',
+      phone: employee?.phone.replace('+7', '') ?? '',
+      file: undefined
+    }
+  });
+
+  const organizationActionEmployeeMutation = useOrganizationActionEmployeeMutation();
+
+  const onSubmit = actionEmployeeForm.handleSubmit(async (values) => {
+    const requestParams = {
+      ...values,
+      legalEntityId: params.organizationId
+    };
+
+    if (actionType === 'add') {
+      const postOrganizationActionEmployeeParams = {
+        params: requestParams,
+        action: actionType
+      } as const;
+
+      await organizationActionEmployeeMutation.mutateAsync(postOrganizationActionEmployeeParams);
+
+      toast.success(i18n.formatMessage({ id: 'toast.addEmployee' }), {
+        cancel: { label: i18n.formatMessage({ id: 'button.close' }) }
+      });
+    }
+
+    if (actionType === 'edit') {
+      const { file, ...restRequestParams } = requestParams;
+
+      const postOrganizationActionEmployeeParams = {
+        params: {
+          ...restRequestParams,
+          ...(file && { file }),
+          userId: employee!.id
+        },
+        action: actionType
+      } as const;
+
+      await organizationActionEmployeeMutation.mutateAsync(postOrganizationActionEmployeeParams);
+
+      toast.success(i18n.formatMessage({ id: 'toast.editEmployee' }), {
+        cancel: { label: i18n.formatMessage({ id: 'button.close' }) }
+      });
+    }
+
+    onAction();
+  });
+
+  return {
+    state: {
+      showPreview,
+      isLoading: organizationActionEmployeeMutation.isPending
+    },
+    form: actionEmployeeForm,
+    functions: { onSubmit, onDeletePreviewClick }
+  };
+};
diff --git a/app/partner/employees/(components)/ActionEmployeeForm/hooks/useOrganizationActionEmployeeMutation.ts b/app/partner/employees/(components)/ActionEmployeeForm/hooks/useOrganizationActionEmployeeMutation.ts
new file mode 100644
index 00000000..02500241
--- /dev/null
+++ b/app/partner/employees/(components)/ActionEmployeeForm/hooks/useOrganizationActionEmployeeMutation.ts
@@ -0,0 +1,34 @@
+import { useMutation } from '@tanstack/react-query';
+
+import type {
+  PostOrganizationAddEmployeeRequestConfig,
+  PutOrganizationEditEmployeeRequestConfig
+} from '@/utils/api';
+import { postOrganizationAddEmployee, putOrganizationEditEmployee } from '@/utils/api';
+
+export const useOrganizationActionEmployeeMutation = (
+  settings?: MutationSettings<
+    | (PostOrganizationAddEmployeeRequestConfig & {
+        action: 'add';
+      })
+    | (PutOrganizationEditEmployeeRequestConfig & {
+        action: 'edit';
+      }),
+    typeof putOrganizationEditEmployee | typeof postOrganizationAddEmployee
+  >
+) =>
+  useMutation({
+    mutationKey: ['organizationActionEmployeeMutation'],
+    mutationFn: ({ params, action, config }) => {
+      if (action === 'edit') {
+        return putOrganizationEditEmployee({ params, config: { ...settings?.config, ...config } });
+      }
+
+      if (action === 'add') {
+        return postOrganizationAddEmployee({ params, config: { ...settings?.config, ...config } });
+      }
+
+      throw new Error('Invalid action');
+    },
+    ...settings?.options
+  });
diff --git a/app/partner/employees/(components)/AddEmployeeDialog/AddEmployeeDialog.tsx b/app/partner/employees/(components)/AddEmployeeDialog/AddEmployeeDialog.tsx
new file mode 100644
index 00000000..6c50a5d7
--- /dev/null
+++ b/app/partner/employees/(components)/AddEmployeeDialog/AddEmployeeDialog.tsx
@@ -0,0 +1,51 @@
+'use client';
+
+import React from 'react';
+import { PlusCircledIcon } from '@radix-ui/react-icons';
+import { XIcon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  Button,
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+  Typography
+} from '@/components/ui';
+
+import { ActionEmployeeForm } from '../ActionEmployeeForm/ActionEmployeeForm';
+
+import { useAddEmployeeDialog } from './hooks/useAddEmployeeDialog';
+
+export const AddEmployeeDialog = () => {
+  const { state, functions } = useAddEmployeeDialog();
+
+  return (
+    <Dialog open={state.open} onOpenChange={functions.setOpen}>
+      <DialogTrigger asChild>
+        <Button variant='light' className='mx-2 p-5' size='sm'>
+          <PlusCircledIcon className='mr-2 h-4 w-4' />
+          <I18nText path='button.addEmployee' />
+        </Button>
+      </DialogTrigger>
+      <DialogContent className='flex h-fit w-11/12 max-w-[713px] flex-col rounded-lg smx:max-h-[90%]'>
+        <DialogClose disabled={state.isLoading}>
+          <XIcon className='h-6 w-6' />
+        </DialogClose>
+        <DialogHeader>
+          <DialogTitle>
+            <Typography variant='h4' tag='h4'>
+              <I18nText path='dialog.addEmployee.title' />
+            </Typography>
+          </DialogTitle>
+        </DialogHeader>
+        <div className='flex h-full flex-col items-end justify-between overflow-y-auto rounded-lg border p-5'>
+          <ActionEmployeeForm onAction={functions.onAction} actionType='add' />
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/app/partner/employees/(components)/AddEmployeeDialog/hooks/useAddEmployeeDialog.ts b/app/partner/employees/(components)/AddEmployeeDialog/hooks/useAddEmployeeDialog.ts
new file mode 100644
index 00000000..20d03d2e
--- /dev/null
+++ b/app/partner/employees/(components)/AddEmployeeDialog/hooks/useAddEmployeeDialog.ts
@@ -0,0 +1,16 @@
+import React from 'react';
+import { useRouter } from 'next/navigation';
+
+export const useAddEmployeeDialog = () => {
+  const router = useRouter();
+
+  const [open, setOpen] = React.useState(false);
+  const [isAddPending, setAddTransition] = React.useTransition();
+
+  const onAction = () => {
+    setOpen(false);
+    setAddTransition(() => router.refresh());
+  };
+
+  return { state: { open, isLoading: isAddPending }, functions: { setOpen, onAction } };
+};
diff --git a/app/partner/employees/(components)/EditEmployeeDialog/EditEmployeeDialog.tsx b/app/partner/employees/(components)/EditEmployeeDialog/EditEmployeeDialog.tsx
new file mode 100644
index 00000000..12c9b68b
--- /dev/null
+++ b/app/partner/employees/(components)/EditEmployeeDialog/EditEmployeeDialog.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { XIcon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  Typography
+} from '@/components/ui';
+
+import type { EmployeeData } from '../../(constants)/types';
+import { ActionEmployeeForm } from '../ActionEmployeeForm/ActionEmployeeForm';
+
+interface EditEmployeeDialogProps extends React.ComponentProps<typeof Dialog> {
+  onEdit: () => void;
+  employee: EmployeeData;
+}
+
+export const EditEmployeeDialog = ({ onEdit, employee, ...props }: EditEmployeeDialogProps) => (
+  <Dialog {...props}>
+    <DialogContent className='flex h-fit w-11/12 max-w-[500px] flex-col rounded-lg mdx:w-full'>
+      <DialogClose>
+        <XIcon className='h-6 w-6' />
+      </DialogClose>
+      <DialogHeader>
+        <DialogTitle>
+          <Typography variant='h4' tag='h4'>
+            <I18nText path='dialog.addEmployee.title' />
+          </Typography>
+        </DialogTitle>
+      </DialogHeader>
+
+      <ActionEmployeeForm onAction={onEdit} actionType='edit' employee={employee} />
+    </DialogContent>
+  </Dialog>
+);
diff --git a/app/partner/employees/(components)/EmployeeCard/EmployeeCard.tsx b/app/partner/employees/(components)/EmployeeCard/EmployeeCard.tsx
new file mode 100644
index 00000000..3b4e1711
--- /dev/null
+++ b/app/partner/employees/(components)/EmployeeCard/EmployeeCard.tsx
@@ -0,0 +1,169 @@
+'use client';
+
+import React from 'react';
+import { Edit3Icon, MailIcon, MoreHorizontalIcon, Trash2Icon } from 'lucide-react';
+import Image from 'next/image';
+
+import { BoldText, I18nText } from '@/components/common';
+import {
+  AlertDialog,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  Badge,
+  Button,
+  Card,
+  CardContent,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  Separator,
+  Typography
+} from '@/components/ui';
+import { cn } from '@/lib/utils';
+
+import type { EmployeeData } from '../../(constants)/types';
+import { EditEmployeeDialog } from '../EditEmployeeDialog/EditEmployeeDialog';
+
+import { useEmployeeCard } from './hooks/useEmployeeCard';
+
+interface EmployeeCardProps {
+  loading?: boolean;
+  employee: EmployeeData;
+}
+
+export const EmployeeCard = ({ employee }: EmployeeCardProps) => {
+  const { state, functions } = useEmployeeCard(employee);
+
+  return (
+    <Card className='relative min-w-[330px] flex-1'>
+      <CardContent className='flex items-center justify-center p-8 pb-12 pr-5 pt-4'>
+        <div>
+          {employee.status === 'inactive' && (
+            <div className='right absolute left-4 top-4'>
+              <Badge>
+                <I18nText path='employeeCard.status.inactive' />
+              </Badge>
+            </div>
+          )}
+
+          <div className='right absolute right-2 top-2 z-10 flex gap-1'>
+            <EditEmployeeDialog
+              open={state.editDialogOpen}
+              onOpenChange={functions.onEditCloseClick}
+              employee={employee}
+              onEdit={functions.onEdit}
+            />
+
+            <AlertDialog open={state.deleteAlertOpen}>
+              <AlertDialogContent>
+                <AlertDialogHeader>
+                  <AlertDialogTitle>
+                    <I18nText path='employeeCard.deleteAlert.title' />
+                  </AlertDialogTitle>
+                  <AlertDialogDescription>
+                    <I18nText
+                      path='employeeCard.deleteAlert.description'
+                      values={{ bold: BoldText, name: employee.name }}
+                    />
+                  </AlertDialogDescription>
+                </AlertDialogHeader>
+                <AlertDialogFooter>
+                  <Button
+                    variant='outline'
+                    disabled={state.isLoading}
+                    onClick={functions.onDeleteCloseClick}
+                  >
+                    <I18nText path='button.cancel' />
+                  </Button>
+
+                  <Button loading={state.isLoading} onClick={functions.onAlertDeleteClick}>
+                    <I18nText path='button.delete' />
+                  </Button>
+                </AlertDialogFooter>
+              </AlertDialogContent>
+            </AlertDialog>
+
+            <DropdownMenu>
+              <DropdownMenuTrigger asChild>
+                <Button variant='ghost' size='icon' loading={state.isLoading}>
+                  <MoreHorizontalIcon />
+                </Button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent>
+                {employee.status === 'inactive' && (
+                  <DropdownMenuItem
+                    className='cursor-pointer'
+                    onClick={functions.onSendConfirmationClick}
+                  >
+                    <MailIcon className='mr-2 h-4 w-4' />
+                    <Typography tag='p' variant='body2'>
+                      <I18nText path='button.sendConfirmation' />
+                    </Typography>
+                  </DropdownMenuItem>
+                )}
+                <DropdownMenuItem className='cursor-pointer' onClick={functions.onEditClick}>
+                  <Edit3Icon className='mr-2 h-4 w-4' />
+                  <Typography tag='p' variant='body2'>
+                    <I18nText path='button.edit' />
+                  </Typography>
+                </DropdownMenuItem>
+                <DropdownMenuItem
+                  className='cursor-pointer text-red-600 focus:text-red-600'
+                  onClick={functions.onDeleteClick}
+                >
+                  <Trash2Icon className='mr-2 h-4 w-4' />
+                  <Typography tag='p' variant='body2'>
+                    <I18nText path='button.delete' />
+                  </Typography>
+                </DropdownMenuItem>
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </div>
+        </div>
+
+        <div
+          className={cn('flex flex-1 flex-col items-center space-y-3 pt-4', {
+            'opacity-70': employee.status === 'inactive'
+          })}
+        >
+          <div className='mb-2 flex flex-col items-center'>
+            <div className='relative h-16 w-16'>
+              <Image src={employee.image} fill alt='user' className='rounded-full' />
+            </div>
+            <div className='mt-2 flex flex-col items-center space-y-1'>
+              <Typography variant='h7' tag='p' className='flex-1'>
+                {employee.name} {employee.surname}
+              </Typography>
+              <Typography variant='body3' tag='p' className='flex-1'>
+                {employee.role}
+              </Typography>
+            </div>
+          </div>
+          <Separator />
+          <div className='flex space-x-6'>
+            <div className='flex-1 space-y-2'>
+              <Typography variant='sub2' tag='p' className='flex-1'>
+                <I18nText path='organization.employee.email' />
+              </Typography>
+              <Typography variant='sub2' tag='p' className='flex-1'>
+                <I18nText path='organization.employee.phoneNumber' />
+              </Typography>
+            </div>
+            <div className='flex-1 space-y-2'>
+              <Typography variant='sub3' tag='p' className='flex-1 font-normal'>
+                {employee.email}
+              </Typography>
+              <Typography variant='sub3' tag='p' className='flex-1 font-normal'>
+                {employee.phone}
+              </Typography>
+            </div>
+          </div>
+        </div>
+      </CardContent>
+    </Card>
+  );
+};
diff --git a/app/partner/employees/(components)/EmployeeCard/hooks/useEmployeeCard.ts b/app/partner/employees/(components)/EmployeeCard/hooks/useEmployeeCard.ts
new file mode 100644
index 00000000..03f034f8
--- /dev/null
+++ b/app/partner/employees/(components)/EmployeeCard/hooks/useEmployeeCard.ts
@@ -0,0 +1,72 @@
+import React from 'react';
+import { useRouter } from 'next/navigation';
+import { toast } from 'sonner';
+
+import {
+  useDeleteOrganizationDeleteEmployeeMutation,
+  useGetAuthNewCodeMutation
+} from '@/utils/api/hooks';
+import { useI18n } from '@/utils/contexts';
+
+import type { EmployeeData } from '../../../(constants)/types';
+
+export const useEmployeeCard = (employee: EmployeeData) => {
+  const i18n = useI18n();
+  const router = useRouter();
+
+  const [editDialogOpen, setEditDialogOpen] = React.useState(false);
+  const [deleteAlertOpen, setDeleteAlertOpen] = React.useState(false);
+  const [isDeletePending, startDeleteTransition] = React.useTransition();
+  const [isEditPending, startEditTransition] = React.useTransition();
+
+  const getAuthNewCodeMutation = useGetAuthNewCodeMutation();
+  const deleteOrganizationDeleteEmployeeMutation = useDeleteOrganizationDeleteEmployeeMutation();
+
+  const onAlertDeleteClick = async () => {
+    await deleteOrganizationDeleteEmployeeMutation.mutateAsync({ params: { id: employee.id } });
+    toast.success(i18n.formatMessage({ id: 'toast.employeeDeleted' }, { name: employee.name }));
+    setDeleteAlertOpen(false);
+    startDeleteTransition(() => router.refresh());
+  };
+
+  const onSendConfirmationClick = async () => {
+    await getAuthNewCodeMutation.mutateAsync({ params: { email: employee.email } });
+    toast.success(i18n.formatMessage({ id: 'toast.sendConfirmation' }, { email: employee.email }));
+  };
+
+  const onEdit = () => {
+    toast.success(i18n.formatMessage({ id: 'toast.editEmployee' }), {
+      cancel: { label: i18n.formatMessage({ id: 'button.close' }) }
+    });
+
+    setEditDialogOpen(false);
+    startEditTransition(() => router.refresh());
+  };
+
+  const onEditClick = () => setEditDialogOpen(true);
+  const onEditCloseClick = () => setEditDialogOpen(false);
+
+  const onDeleteClick = () => setDeleteAlertOpen(true);
+  const onDeleteCloseClick = () => setDeleteAlertOpen(false);
+
+  return {
+    state: {
+      editDialogOpen,
+      deleteAlertOpen,
+      isLoading:
+        getAuthNewCodeMutation.isPending ||
+        deleteOrganizationDeleteEmployeeMutation.isPending ||
+        isDeletePending ||
+        isEditPending
+    },
+    functions: {
+      onEdit,
+      onSendConfirmationClick,
+      onDeleteClick,
+      onEditClick,
+      onEditCloseClick,
+      onAlertDeleteClick,
+      onDeleteCloseClick
+    }
+  };
+};
diff --git a/app/partner/employees/(constants)/types.ts b/app/partner/employees/(constants)/types.ts
new file mode 100644
index 00000000..976b496b
--- /dev/null
+++ b/app/partner/employees/(constants)/types.ts
@@ -0,0 +1,10 @@
+export interface EmployeeData {
+  id: string;
+  name: string;
+  surname: string;
+  email: string;
+  role: 'Administrator' | 'Leading' | 'Manager';
+  phone: string;
+  status: string;
+  image: string;
+}
diff --git a/app/partner/employees/loading.tsx b/app/partner/employees/loading.tsx
new file mode 100644
index 00000000..5cf17c4f
--- /dev/null
+++ b/app/partner/employees/loading.tsx
@@ -0,0 +1,27 @@
+import { EmployeeCardSkeleton } from '@/components/ui';
+import { Skeleton } from '@/components/ui/skeleton';
+
+const PartnerEmployeesLoading = () => (
+  <>
+    <div className='flex justify-between'>
+      <Skeleton className='h-8 w-28 bg-background' />
+      <Skeleton className='h-10 w-36 bg-background' />
+    </div>
+
+    <div className='grid grid-cols-1 gap-3 lg:grid-cols-2 2lg:grid-cols-3'>
+      {Array(5)
+        .fill({})
+        .map((_, index) => (
+          <div
+            className='relative flex min-h-72 w-full min-w-[300px] space-y-3 rounded bg-background p-8'
+            key={index}
+          >
+            <Skeleton className='absolute right-5 top-5 h-6 w-6 rounded-full' />
+            <EmployeeCardSkeleton />
+          </div>
+        ))}
+    </div>
+  </>
+);
+
+export default PartnerEmployeesLoading;
diff --git a/app/partner/employees/page.tsx b/app/partner/employees/page.tsx
new file mode 100644
index 00000000..b290462a
--- /dev/null
+++ b/app/partner/employees/page.tsx
@@ -0,0 +1,37 @@
+import { I18nText } from '@/components/common';
+import { Typography } from '@/components/ui';
+import { getOrganizationCurrent, getOrganizationEmployees } from '@/utils/api/requests';
+
+import { AddEmployeeDialog } from './(components)/AddEmployeeDialog/AddEmployeeDialog';
+import { EmployeeCard } from './(components)/EmployeeCard/EmployeeCard';
+
+const PartnerEmployeesPage = async () => {
+  const getOrganizationCurrentResponse = await getOrganizationCurrent({
+    config: { cache: 'no-store' }
+  });
+
+  const getOrganizationEmployeesResponse = await getOrganizationEmployees({
+    params: { id: getOrganizationCurrentResponse.id },
+    config: {
+      cache: 'no-store'
+    }
+  });
+
+  return (
+    <div className='space-y-4'>
+      <div className='flex justify-between'>
+        <Typography variant='h5' tag='h5'>
+          <I18nText path='partners.employees.title' />
+        </Typography>
+        <AddEmployeeDialog />
+      </div>
+      <div className='grid grid-cols-1 gap-3 lg:grid-cols-2 2lg:grid-cols-3'>
+        {getOrganizationEmployeesResponse.map((employee) => (
+          <EmployeeCard key={employee.id} employee={employee} />
+        ))}
+      </div>
+    </div>
+  );
+};
+
+export default PartnerEmployeesPage;
diff --git a/app/partner/layout.tsx b/app/partner/layout.tsx
new file mode 100644
index 00000000..f1054049
--- /dev/null
+++ b/app/partner/layout.tsx
@@ -0,0 +1,31 @@
+import { getOrganizationById, getOrganizationCurrent } from '@/utils/api/requests';
+
+import { OrganizationHeader } from './(components)/OrganizationHeader/OrganizationHeader';
+
+interface OrganizationPageLayoutProps {
+  children: React.ReactNode;
+}
+
+const PartnerLayout = async ({ children }: OrganizationPageLayoutProps) => {
+  const getOrganizationCurrentResponse = await getOrganizationCurrent({
+    config: { cache: 'no-store' }
+  });
+
+  const getOrganizationByIdResponse = await getOrganizationById({
+    params: { id: getOrganizationCurrentResponse.id },
+    config: { cache: 'no-store' }
+  });
+
+  return (
+    <main className='min-h-screen bg-secondary'>
+      <div className='container px-20 py-10'>
+        <div className='flex flex-col gap-4'>
+          <OrganizationHeader organization={getOrganizationByIdResponse} />
+          {children}
+        </div>
+      </div>
+    </main>
+  );
+};
+
+export default PartnerLayout;
diff --git a/app/partner/profile/@card/components/EditOrganizationProfileDialog/EditOrganizationProfileDialog.tsx b/app/partner/profile/@card/components/EditOrganizationProfileDialog/EditOrganizationProfileDialog.tsx
new file mode 100644
index 00000000..4a182181
--- /dev/null
+++ b/app/partner/profile/@card/components/EditOrganizationProfileDialog/EditOrganizationProfileDialog.tsx
@@ -0,0 +1,51 @@
+'use client';
+
+import { XIcon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+  ScrollArea,
+  Typography
+} from '@/components/ui';
+
+import { EditOrganizationProfileForm } from './components/EditOrganizationProfileForm/EditOrganizationProfileForm';
+import { useEditOrganizationProfileDialog } from './hooks/useEditOrganizationProfileDialog';
+
+interface EditOrganizationProfileDialogProps {
+  organization: OrganizationResponse;
+  trigger: JSX.Element;
+}
+
+export const EditOrganizationProfileDialog = ({
+  organization,
+  trigger
+}: EditOrganizationProfileDialogProps) => {
+  const { functions, state } = useEditOrganizationProfileDialog();
+
+  return (
+    <Dialog open={state.open} onOpenChange={functions.setOpen}>
+      <DialogTrigger asChild>{trigger}</DialogTrigger>
+      <DialogContent className='h-screen w-screen lg:max-h-[700px] lg:max-w-[700px]'>
+        <DialogClose>
+          <XIcon className='h-6 w-6' />
+        </DialogClose>
+        <DialogHeader>
+          <DialogTitle asChild>
+            <Typography tag='h4' variant='h4'>
+              <I18nText path='dialog.editOrganizationProfile.title' />
+            </Typography>
+          </DialogTitle>
+        </DialogHeader>
+        <ScrollArea className='max-h-[90vh] p-6'>
+          <EditOrganizationProfileForm organization={organization} onEdited={functions.onEdited} />
+        </ScrollArea>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/EditOrganizationProfileForm.tsx b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/EditOrganizationProfileForm.tsx
new file mode 100644
index 00000000..85302ef8
--- /dev/null
+++ b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/EditOrganizationProfileForm.tsx
@@ -0,0 +1,515 @@
+import { PlusIcon, Trash2Icon } from 'lucide-react';
+
+import { AddressCombobox } from '@/components/comboboxes';
+import { I18nText } from '@/components/common';
+import {
+  BikInput,
+  Button,
+  CheckingAccountInput,
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  InnInput,
+  Input,
+  KppInput,
+  OgrnInput,
+  PhoneNumberInput,
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+  Typography
+} from '@/components/ui';
+import { useI18n } from '@/utils/contexts';
+
+import { ORGANIZATION_STAGES } from './constants/editOrganizationProfileSchema';
+import { convertLocalitiesToComboboxItems } from './helpers/convertLocalitiesToComboboxItems';
+import { useEditOrganizationProfileForm } from './hooks/useEditOrganizationProfileForm';
+
+interface EditOrganizationFormProps {
+  organization: OrganizationResponse;
+  onEdited: () => void;
+}
+
+export const MAX_SOCIAL_LINKS_COUNT = 3;
+
+export const EditOrganizationProfileForm = ({
+  organization,
+  onEdited
+}: EditOrganizationFormProps) => {
+  const i18n = useI18n();
+  const { form, functions, state } = useEditOrganizationProfileForm({ organization, onEdited });
+
+  return (
+    <Form {...form}>
+      <form onSubmit={functions.onSubmit} className='relative'>
+        <fieldset disabled={state.isLoading} className='relative space-y-3 px-1'>
+          <Typography variant='h5' tag='h5'>
+            <I18nText path='organization.profile.title' />
+          </Typography>
+
+          <FormField
+            control={form.control}
+            name='stage'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.stage.label' />
+                </FormLabel>
+                <FormControl>
+                  <Select {...field} value={field.value} onValueChange={field.onChange}>
+                    <SelectTrigger className='h-8 w-48'>
+                      <SelectValue
+                        placeholder={i18n.formatMessage({
+                          id: 'field.organization.stage.placeholder'
+                        })}
+                      />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {ORGANIZATION_STAGES.map((stage) => (
+                        <SelectItem value={stage}>
+                          <I18nText
+                            path={`organization.stage.${stage.toLowerCase()}` as LocaleMessageId}
+                          />
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.stage && (
+                    <I18nText path={form.formState.errors.stage.message as LocaleMessageId} />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='name'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.name.label' />
+                </FormLabel>
+                <FormControl>
+                  <Input {...field} />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.name && (
+                    <I18nText path={form.formState.errors.name.message as LocaleMessageId} />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='information.contactName'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.contactName.label' />
+                </FormLabel>
+                <FormControl>
+                  <Input {...field} />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.information?.contactName && (
+                    <I18nText
+                      path={
+                        form.formState.errors.information.contactName.message as LocaleMessageId
+                      }
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='information.phone'
+            render={({ field: { onChange, ...field } }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.phone.label' />
+                </FormLabel>
+                <FormControl>
+                  <PhoneNumberInput onValueChange={({ value }) => onChange(value)} {...field} />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.information?.phone && (
+                    <I18nText
+                      path={form.formState.errors.information.phone.message as LocaleMessageId}
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='information.email'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.email.label' />
+                </FormLabel>
+                <FormControl>
+                  <Input
+                    {...field}
+                    placeholder={i18n.formatMessage({
+                      id: 'field.email.placeholder'
+                    })}
+                  />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.information?.email && (
+                    <I18nText
+                      path={form.formState.errors.information.email.message as LocaleMessageId}
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='information.site'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.site.label' />
+                </FormLabel>
+                <FormControl>
+                  <Input
+                    {...field}
+                    placeholder={i18n.formatMessage({
+                      id: 'field.organization.site.placeholder'
+                    })}
+                  />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.information?.site && (
+                    <I18nText
+                      path={form.formState.errors.information.site.message as LocaleMessageId}
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='locality'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.locality.label' />
+                </FormLabel>
+                <FormControl>
+                  <AddressCombobox
+                    value={field.value}
+                    className='w-full'
+                    onSelect={(newValue) => form.setValue('locality', newValue ?? '')}
+                    convertAddresses={convertLocalitiesToComboboxItems}
+                  />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.locality && (
+                    <I18nText path={form.formState.errors.locality.message as LocaleMessageId} />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <div className='space-y-3'>
+            {form.socialField.fields.map((currentField, index) => (
+              <FormField
+                control={form.control}
+                key={currentField.id}
+                name={`information.social.${index}.value`}
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>
+                      <I18nText path='field.organization.social.label' />
+                    </FormLabel>
+                    <FormControl>
+                      <div className='flex'>
+                        <Input
+                          {...field}
+                          placeholder={i18n.formatMessage({
+                            id: 'field.organization.social.placeholder'
+                          })}
+                        />
+                        <Button
+                          type='button'
+                          variant='outline'
+                          size='icon'
+                          className='ml-2'
+                          disabled={!index}
+                          onClick={() => form.socialField.remove(index)}
+                        >
+                          <Trash2Icon className='size-5' />
+                        </Button>
+                      </div>
+                    </FormControl>
+                    <FormMessage>
+                      {form.formState?.errors?.information?.social &&
+                        form.formState?.errors?.information?.social[index] && (
+                          <I18nText
+                            path={
+                              form.formState?.errors?.information?.social[index]?.value
+                                ?.message as LocaleMessageId
+                            }
+                          />
+                        )}
+                    </FormMessage>
+                  </FormItem>
+                )}
+              />
+            ))}
+          </div>
+          <Button
+            type='button'
+            variant='outline'
+            size='icon'
+            disabled={form.socialField.fields.length >= MAX_SOCIAL_LINKS_COUNT}
+            onClick={() => form.socialField.append({})}
+          >
+            <PlusIcon className='size-5' />
+          </Button>
+
+          <Typography variant='h5' tag='h5' className='mt-5'>
+            <I18nText path='organization.profile.information.title' />
+          </Typography>
+
+          <FormField
+            control={form.control}
+            name='information.fullNameOfTheLegalEntity'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.fullName.label' />
+                </FormLabel>
+                <FormControl>
+                  <Input {...field} />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.information?.fullNameOfTheLegalEntity && (
+                    <I18nText
+                      path={
+                        form.formState.errors.information.fullNameOfTheLegalEntity
+                          .message as LocaleMessageId
+                      }
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='information.legalAddress'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.legalAddress.label' />
+                </FormLabel>
+                <FormControl>
+                  <AddressCombobox
+                    value={field.value}
+                    className='w-full'
+                    onSelect={(newValue) =>
+                      form.setValue('information.legalAddress', newValue ?? '')
+                    }
+                  />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.information?.legalAddress && (
+                    <I18nText
+                      path={
+                        form.formState.errors.information.legalAddress.message as LocaleMessageId
+                      }
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='information.postAddress'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.postAddress.label' />
+                </FormLabel>
+                <FormControl>
+                  <AddressCombobox
+                    value={field.value}
+                    className='w-full'
+                    onSelect={(newValue) =>
+                      form.setValue('information.postAddress', newValue ?? '')
+                    }
+                  />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.information?.postAddress && (
+                    <I18nText
+                      path={
+                        form.formState.errors.information.postAddress.message as LocaleMessageId
+                      }
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='inn'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.inn.label' />
+                </FormLabel>
+                <FormControl>
+                  <InnInput tooltip={i18n.formatMessage({ id: 'tooltip.inn' })} {...field} />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.inn && (
+                    <I18nText path={form.formState.errors.inn.message as LocaleMessageId} />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='information.kpp'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.kpp.label' />
+                </FormLabel>
+                <FormControl>
+                  <KppInput tooltip={i18n.formatMessage({ id: 'tooltip.kpp' })} {...field} />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.information?.kpp && (
+                    <I18nText
+                      path={form.formState.errors.information.kpp.message as LocaleMessageId}
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='information.ogrn'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.ogrn.label' />
+                </FormLabel>
+                <FormControl>
+                  <OgrnInput tooltip={i18n.formatMessage({ id: 'tooltip.ogrn' })} {...field} />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.information?.ogrn && (
+                    <I18nText
+                      path={form.formState.errors.information.ogrn.message as LocaleMessageId}
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <Typography variant='h5' tag='h5' className='mt-5'>
+            <I18nText path='organization.profile.requisites.title' />
+          </Typography>
+          <FormField
+            control={form.control}
+            name='requisites.bank'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.bank.label' />
+                </FormLabel>
+                <FormControl>
+                  <Input
+                    {...field}
+                    placeholder={i18n.formatMessage({
+                      id: 'field.organization.bank.placeholder'
+                    })}
+                  />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.requisites?.bank && (
+                    <I18nText
+                      path={form.formState.errors.requisites.bank.message as LocaleMessageId}
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='requisites.bik'
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.bik.label' />
+                </FormLabel>
+                <FormControl>
+                  <BikInput tooltip={i18n.formatMessage({ id: 'tooltip.bik' })} {...field} />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.requisites?.bik && (
+                    <I18nText
+                      path={form.formState.errors.requisites.bik.message as LocaleMessageId}
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='requisites.checkingAccount'
+            render={({ field: { onChange, ...field } }) => (
+              <FormItem>
+                <FormLabel>
+                  <I18nText path='field.organization.checkingAccount.label' />
+                </FormLabel>
+                <FormControl>
+                  <CheckingAccountInput onValueChange={({ value }) => onChange(value)} {...field} />
+                </FormControl>
+                <FormMessage>
+                  {form.formState?.errors?.requisites?.checkingAccount && (
+                    <I18nText
+                      path={
+                        form.formState.errors.requisites.checkingAccount.message as LocaleMessageId
+                      }
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+
+          <Button className='sticky bottom-0 mt-5 w-full' type='submit' loading={state.isLoading}>
+            <I18nText path='button.save' />
+          </Button>
+        </fieldset>
+      </form>
+    </Form>
+  );
+};
diff --git a/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/constants/editOrganizationProfileSchema.ts b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/constants/editOrganizationProfileSchema.ts
new file mode 100644
index 00000000..1ff89a24
--- /dev/null
+++ b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/constants/editOrganizationProfileSchema.ts
@@ -0,0 +1,50 @@
+import * as z from 'zod';
+
+import {
+  bikSchema,
+  checkingAccountSchema,
+  innSchema,
+  kppSchema,
+  ogrnSchema,
+  phoneNumberSchema
+} from '@/components/ui';
+
+export const ORGANIZATION_STAGES = ['REQUEST', 'NEGOTIATION', 'CONCLUSION'] as const;
+
+export const editOrganizationProfileSchema = z.object({
+  stage: z.enum(ORGANIZATION_STAGES),
+  locality: z.string().min(1, { message: 'validation.required' }),
+  name: z
+    .string()
+    .min(1, { message: 'validation.required' })
+    .max(128, { message: 'validation.max' }),
+  description: z.string().max(1000, { message: 'validation.max' }).optional(),
+  inn: innSchema.optional(),
+  information: z.object({
+    postAddress: z.string().max(1000, { message: 'validation.max' }).optional(),
+    contactName: z
+      .string()
+      .min(1, { message: 'validation.required' })
+      .max(128, { message: 'validation.max' }),
+    phone: phoneNumberSchema.min(1, { message: 'validation.required' }),
+    email: z.string().optional(),
+    site: z.string().optional(),
+    city: z.string().optional(),
+    social: z.array(
+      z.object({
+        value: z.string().url({ message: 'validation.url.format' }).optional()
+      })
+    ),
+    fullNameOfTheLegalEntity: z.string().max(1000, { message: 'validation.max' }).optional(),
+    legalAddress: z.string().max(1000, { message: 'validation.max' }).optional(),
+    kpp: kppSchema.optional(),
+    ogrn: ogrnSchema.optional()
+  }),
+  requisites: z.object({
+    bank: z.string().max(128, { message: 'validation.max' }).optional(),
+    bik: bikSchema.optional(),
+    checkingAccount: checkingAccountSchema.optional()
+  })
+});
+
+export type EditOrganizationProfileSchema = z.infer<typeof editOrganizationProfileSchema>;
diff --git a/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/helpers/convertFormValuesToSocial.ts b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/helpers/convertFormValuesToSocial.ts
new file mode 100644
index 00000000..63a3efe7
--- /dev/null
+++ b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/helpers/convertFormValuesToSocial.ts
@@ -0,0 +1,2 @@
+export const convertFormValuesToSocial = (values: { value?: string }[]) =>
+  (values.filter(({ value }) => !!value) as { value: string }[]).map(({ value }) => value);
diff --git a/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/helpers/convertLocalitiesToComboboxItems.ts b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/helpers/convertLocalitiesToComboboxItems.ts
new file mode 100644
index 00000000..d79e4fae
--- /dev/null
+++ b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/helpers/convertLocalitiesToComboboxItems.ts
@@ -0,0 +1,10 @@
+export const convertLocalitiesToComboboxItems = (addresses: AddressResponseFixMe[]) =>
+  addresses
+    .filter(
+      (address) =>
+        address.city && !address.street && !address.house && !address.flat && address.cityWithType
+    )
+    .map((address) => ({
+      label: address.cityWithType,
+      value: address.cityWithType
+    }));
diff --git a/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/helpers/convertSocialToFormValues.ts b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/helpers/convertSocialToFormValues.ts
new file mode 100644
index 00000000..90ac8e7c
--- /dev/null
+++ b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/helpers/convertSocialToFormValues.ts
@@ -0,0 +1,4 @@
+export const convertSocialToFormValues = (social: string[]) =>
+  social.map((link) => ({
+    value: link
+  }));
diff --git a/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/hooks/useEditOrganizationProfileForm.ts b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/hooks/useEditOrganizationProfileForm.ts
new file mode 100644
index 00000000..80b6268f
--- /dev/null
+++ b/app/partner/profile/@card/components/EditOrganizationProfileDialog/components/EditOrganizationProfileForm/hooks/useEditOrganizationProfileForm.ts
@@ -0,0 +1,83 @@
+import { useFieldArray, useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useQueryClient } from '@tanstack/react-query';
+import { useRouter } from 'next/navigation';
+
+import { usePutOrganizationByIdMutation } from '@/utils/api';
+
+import type { EditOrganizationProfileSchema } from '../constants/editOrganizationProfileSchema';
+import { editOrganizationProfileSchema } from '../constants/editOrganizationProfileSchema';
+import { convertFormValuesToSocial } from '../helpers/convertFormValuesToSocial';
+import { convertSocialToFormValues } from '../helpers/convertSocialToFormValues';
+
+interface UseEditOrganizationProfileFormParams {
+  organization: OrganizationResponse;
+  onEdited: () => void;
+}
+
+export const useEditOrganizationProfileForm = ({
+  organization,
+  onEdited
+}: UseEditOrganizationProfileFormParams) => {
+  const router = useRouter();
+  const queryClient = useQueryClient();
+  const editOrganizationForm = useForm<EditOrganizationProfileSchema>({
+    mode: 'onSubmit',
+    resolver: zodResolver(editOrganizationProfileSchema),
+    defaultValues: {
+      stage: organization.stage ?? 'REQUEST',
+      locality: organization.locality ?? '',
+      name: organization.name ?? '',
+      description: organization.description ?? undefined,
+      inn: organization.information?.inn ?? undefined,
+      information: {
+        postAddress: organization.information?.postAddress ?? undefined,
+        contactName: organization.contactName ?? '',
+        phone: organization.phone ? String(organization.phone).slice(1) : '',
+        email: organization.email ?? undefined,
+        site: organization.site ?? undefined,
+        social: organization.social ? convertSocialToFormValues(organization.social) : [{}],
+        fullNameOfTheLegalEntity: organization.information?.fullNameOfTheLegalEntity ?? undefined,
+        legalAddress: organization.information?.legalAddress ?? undefined,
+        kpp: organization.information?.kpp ?? undefined,
+        ogrn: organization.information?.ogrn ?? undefined
+      },
+      requisites: {
+        bank: organization.requisites?.bank ?? undefined,
+        bik: organization.requisites?.bik ?? undefined,
+        checkingAccount: organization.requisites?.checkingAccount ?? undefined
+      }
+    }
+  });
+
+  const socialField = useFieldArray({
+    name: 'information.social',
+    control: editOrganizationForm.control
+  });
+
+  const putOrganizationByIdMutation = usePutOrganizationByIdMutation();
+
+  const onSubmit = editOrganizationForm.handleSubmit(async (values) => {
+    const putOrganizationByIdParams = {
+      ...values,
+      id: organization.id,
+      information: {
+        ...values.information,
+        phone: `7${values.information.phone}`,
+        social: convertFormValuesToSocial(values.information.social)
+      }
+    };
+
+    await putOrganizationByIdMutation.mutateAsync({ params: putOrganizationByIdParams });
+    router.refresh();
+    queryClient.invalidateQueries({ queryKey: ['getChanges'] });
+
+    onEdited();
+  });
+
+  return {
+    state: { isLoading: putOrganizationByIdMutation.isPending },
+    form: { ...editOrganizationForm, socialField },
+    functions: { onSubmit }
+  };
+};
diff --git a/app/partner/profile/@card/components/EditOrganizationProfileDialog/hooks/useEditOrganizationProfileDialog.tsx b/app/partner/profile/@card/components/EditOrganizationProfileDialog/hooks/useEditOrganizationProfileDialog.tsx
new file mode 100644
index 00000000..508d177b
--- /dev/null
+++ b/app/partner/profile/@card/components/EditOrganizationProfileDialog/hooks/useEditOrganizationProfileDialog.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { toast } from 'sonner';
+
+import { useI18n } from '@/utils/contexts';
+
+export const useEditOrganizationProfileDialog = () => {
+  const intl = useI18n();
+  const [open, setOpen] = React.useState(false);
+
+  const onEdited = () => {
+    setOpen(false);
+
+    toast.success(intl.formatMessage({ id: 'toast.organizationProfileChanged' }), {
+      cancel: { label: 'Close' }
+    });
+  };
+
+  return { state: { open }, functions: { setOpen, onEdited } };
+};
diff --git a/app/partner/profile/@card/loading.tsx b/app/partner/profile/@card/loading.tsx
new file mode 100644
index 00000000..0b0c9264
--- /dev/null
+++ b/app/partner/profile/@card/loading.tsx
@@ -0,0 +1,24 @@
+import { Skeleton } from '@/components/ui/skeleton';
+
+const PartnerProfileCardLoading = () => (
+  <div className='flex h-fit min-h-72 min-w-[340px] flex-1 flex-col space-y-3 rounded bg-background p-7'>
+    <div className='space-y-7'>
+      <Skeleton className='h-6 rounded-xl' />
+      <Skeleton className='h-5 rounded-xl' />
+    </div>
+    <div className='space-y-4 pt-6'>
+      <Skeleton className='h-4 w-5/12 rounded-xl' />
+      <Skeleton className='h-4 w-5/12 rounded-xl' />
+      <Skeleton className='h-4 w-5/12 rounded-xl' />
+      <Skeleton className='h-4 w-5/12 rounded-xl' />
+      <Skeleton className='h-4 w-5/12 rounded-xl' />
+      <Skeleton className='h-4 w-4/12 rounded-xl' />
+    </div>
+    <div className='space-y-6 pt-5'>
+      <Skeleton className='h-6 w-10/12 rounded-xl' />
+      <Skeleton className='h-6 w-10/12 rounded-xl' />
+    </div>
+  </div>
+);
+
+export default PartnerProfileCardLoading;
diff --git a/app/partner/profile/@card/page.tsx b/app/partner/profile/@card/page.tsx
new file mode 100644
index 00000000..5025f03a
--- /dev/null
+++ b/app/partner/profile/@card/page.tsx
@@ -0,0 +1,252 @@
+import { Edit3Icon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+  Button,
+  InfoCard,
+  InfoCardAction,
+  InfoCardContent,
+  InfoCardHeader,
+  InfoCardTitle,
+  OrganizationProfileCardInfo,
+  OrganizationProfileCardInfoContent,
+  OrganizationProfileCardInfoIcon,
+  OrganizationProfileCardInfoTitle,
+  Separator,
+  Typography
+} from '@/components/ui';
+import { getOrganizationById, getOrganizationCurrent } from '@/utils/api/requests';
+
+import { EditOrganizationProfileDialog } from './components/EditOrganizationProfileDialog/EditOrganizationProfileDialog';
+
+const PartnerProfileCardPage = async () => {
+  const getOrganizationCurrentResponse = await getOrganizationCurrent({
+    config: { cache: 'no-store' }
+  });
+
+  const getOrganizationByIdResponse = await getOrganizationById({
+    params: { id: getOrganizationCurrentResponse.id },
+    config: { cache: 'no-store' }
+  });
+
+  return (
+    <InfoCard className='relative'>
+      <InfoCardHeader className='pb-0'>
+        <InfoCardTitle>
+          <Typography variant='h5' tag='h5'>
+            <I18nText path='organization.profile.title' />
+          </Typography>
+        </InfoCardTitle>
+        <InfoCardAction className='rounded-none bg-transparent'>
+          <div className='right absolute right-2 top-2 z-10'>
+            <EditOrganizationProfileDialog
+              organization={getOrganizationByIdResponse}
+              trigger={
+                <Button variant='ghost' size='icon'>
+                  <Edit3Icon size={20} strokeWidth={1.5} />
+                </Button>
+              }
+            />
+          </div>
+        </InfoCardAction>
+      </InfoCardHeader>
+      <InfoCardContent className='flex w-full flex-col px-7'>
+        <Typography variant='body2' tag='p' className='text-muted-foreground'>
+          {getOrganizationByIdResponse.description}
+        </Typography>
+        <Separator className='my-5' />
+        <div className='flex flex-col gap-3 text-sm'>
+          {getOrganizationByIdResponse.name && (
+            <OrganizationProfileCardInfo>
+              <OrganizationProfileCardInfoTitle>
+                <I18nText path='organization.profile.name' />
+              </OrganizationProfileCardInfoTitle>
+              <OrganizationProfileCardInfoContent>
+                {getOrganizationByIdResponse.name}
+              </OrganizationProfileCardInfoContent>
+            </OrganizationProfileCardInfo>
+          )}
+          {getOrganizationByIdResponse.contactName && (
+            <OrganizationProfileCardInfo>
+              <OrganizationProfileCardInfoTitle>
+                <I18nText path='organization.profile.contactName' />
+              </OrganizationProfileCardInfoTitle>
+              <OrganizationProfileCardInfoContent>
+                {getOrganizationByIdResponse.contactName}
+              </OrganizationProfileCardInfoContent>
+            </OrganizationProfileCardInfo>
+          )}
+          {getOrganizationByIdResponse.phone && (
+            <OrganizationProfileCardInfo>
+              <OrganizationProfileCardInfoTitle>
+                <I18nText path='organization.profile.phone' />
+              </OrganizationProfileCardInfoTitle>
+              <OrganizationProfileCardInfoContent>
+                {getOrganizationByIdResponse.phone}
+              </OrganizationProfileCardInfoContent>
+            </OrganizationProfileCardInfo>
+          )}
+          {getOrganizationByIdResponse.email && (
+            <OrganizationProfileCardInfo>
+              <OrganizationProfileCardInfoTitle>
+                <I18nText path='organization.profile.email' />
+              </OrganizationProfileCardInfoTitle>
+              <OrganizationProfileCardInfoContent>
+                {getOrganizationByIdResponse.email}
+              </OrganizationProfileCardInfoContent>
+            </OrganizationProfileCardInfo>
+          )}
+          {getOrganizationByIdResponse.locality && (
+            <OrganizationProfileCardInfo>
+              <OrganizationProfileCardInfoTitle>
+                <I18nText path='organization.profile.locality' />
+              </OrganizationProfileCardInfoTitle>
+              <OrganizationProfileCardInfoContent>
+                {getOrganizationByIdResponse.locality}
+              </OrganizationProfileCardInfoContent>
+            </OrganizationProfileCardInfo>
+          )}
+          {getOrganizationByIdResponse.social && (
+            <OrganizationProfileCardInfo>
+              <OrganizationProfileCardInfoTitle>
+                <I18nText path='organization.profile.social' />
+              </OrganizationProfileCardInfoTitle>
+              <OrganizationProfileCardInfoContent>
+                <span className='flex gap-2'>
+                  {getOrganizationByIdResponse.social.map((link, index) => (
+                    <OrganizationProfileCardInfoIcon key={index} link={link} />
+                  ))}
+                </span>
+              </OrganizationProfileCardInfoContent>
+            </OrganizationProfileCardInfo>
+          )}
+        </div>
+        <Separator className='mt-4' />
+        <Accordion type='single' collapsible>
+          <AccordionItem value='organization.information' className='border-none'>
+            <AccordionTrigger>
+              <Typography variant='h7' tag='h6'>
+                <I18nText path='organization.profile.information.title' />
+              </Typography>
+            </AccordionTrigger>
+            {getOrganizationByIdResponse.information &&
+              !!Object.keys(getOrganizationByIdResponse.information).length && (
+                <AccordionContent className='flex flex-col gap-3'>
+                  {getOrganizationByIdResponse.information.fullNameOfTheLegalEntity && (
+                    <OrganizationProfileCardInfo>
+                      <OrganizationProfileCardInfoTitle>
+                        <I18nText path='organization.profile.information.fullName' />
+                      </OrganizationProfileCardInfoTitle>
+                      <OrganizationProfileCardInfoContent>
+                        {getOrganizationByIdResponse.information.fullNameOfTheLegalEntity}
+                      </OrganizationProfileCardInfoContent>
+                    </OrganizationProfileCardInfo>
+                  )}
+                  {getOrganizationByIdResponse.information.legalAddress && (
+                    <OrganizationProfileCardInfo>
+                      <OrganizationProfileCardInfoTitle>
+                        <I18nText path='organization.profile.information.legalAddress' />
+                      </OrganizationProfileCardInfoTitle>
+                      <OrganizationProfileCardInfoContent>
+                        {getOrganizationByIdResponse.information.legalAddress}
+                      </OrganizationProfileCardInfoContent>
+                    </OrganizationProfileCardInfo>
+                  )}
+                  {getOrganizationByIdResponse.information.postAddress && (
+                    <OrganizationProfileCardInfo>
+                      <OrganizationProfileCardInfoTitle>
+                        <I18nText path='organization.profile.information.postAddress' />
+                      </OrganizationProfileCardInfoTitle>
+                      <OrganizationProfileCardInfoContent>
+                        {getOrganizationByIdResponse.information.postAddress}
+                      </OrganizationProfileCardInfoContent>
+                    </OrganizationProfileCardInfo>
+                  )}
+                  {getOrganizationByIdResponse.information.inn && (
+                    <OrganizationProfileCardInfo>
+                      <OrganizationProfileCardInfoTitle>
+                        <I18nText path='organization.profile.information.inn' />
+                      </OrganizationProfileCardInfoTitle>
+                      <OrganizationProfileCardInfoContent>
+                        {getOrganizationByIdResponse.information.inn}
+                      </OrganizationProfileCardInfoContent>
+                    </OrganizationProfileCardInfo>
+                  )}
+                  {getOrganizationByIdResponse.information.kpp && (
+                    <OrganizationProfileCardInfo>
+                      <OrganizationProfileCardInfoTitle>
+                        <I18nText path='organization.profile.information.kpp' />
+                      </OrganizationProfileCardInfoTitle>
+                      <OrganizationProfileCardInfoContent>
+                        {getOrganizationByIdResponse.information.kpp}
+                      </OrganizationProfileCardInfoContent>
+                    </OrganizationProfileCardInfo>
+                  )}
+                  {getOrganizationByIdResponse.information.ogrn && (
+                    <OrganizationProfileCardInfo>
+                      <OrganizationProfileCardInfoTitle>
+                        <I18nText path='organization.profile.information.ogrn' />
+                      </OrganizationProfileCardInfoTitle>
+                      <OrganizationProfileCardInfoContent>
+                        {getOrganizationByIdResponse.information.ogrn}
+                      </OrganizationProfileCardInfoContent>
+                    </OrganizationProfileCardInfo>
+                  )}
+                </AccordionContent>
+              )}
+          </AccordionItem>
+        </Accordion>
+        <Separator />
+        <Accordion type='single' collapsible>
+          <AccordionItem value='organization.requisites' className='border-none'>
+            <AccordionTrigger>
+              <Typography variant='h7' tag='h6'>
+                <I18nText path='organization.profile.requisites.title' />
+              </Typography>
+            </AccordionTrigger>
+            {getOrganizationByIdResponse.requisites &&
+              !!Object.keys(getOrganizationByIdResponse.requisites).length && (
+                <AccordionContent className='flex flex-col gap-3'>
+                  {getOrganizationByIdResponse.requisites.bank && (
+                    <OrganizationProfileCardInfo>
+                      <OrganizationProfileCardInfoTitle>
+                        <I18nText path='organization.profile.requisites.bank' />
+                      </OrganizationProfileCardInfoTitle>
+                      <OrganizationProfileCardInfoContent>
+                        {getOrganizationByIdResponse.requisites.bank}
+                      </OrganizationProfileCardInfoContent>
+                    </OrganizationProfileCardInfo>
+                  )}
+                  {getOrganizationByIdResponse.requisites.bik && (
+                    <OrganizationProfileCardInfo>
+                      <OrganizationProfileCardInfoTitle>
+                        <I18nText path='organization.profile.requisites.bik' />
+                      </OrganizationProfileCardInfoTitle>
+                      <OrganizationProfileCardInfoContent>
+                        {getOrganizationByIdResponse.requisites.bik}
+                      </OrganizationProfileCardInfoContent>
+                    </OrganizationProfileCardInfo>
+                  )}
+                  {getOrganizationByIdResponse.requisites.checkingAccount && (
+                    <OrganizationProfileCardInfo>
+                      <OrganizationProfileCardInfoTitle>
+                        <I18nText path='organization.profile.requisites.checkingAccount' />
+                      </OrganizationProfileCardInfoTitle>
+                      <OrganizationProfileCardInfoContent>
+                        {getOrganizationByIdResponse.requisites.checkingAccount}
+                      </OrganizationProfileCardInfoContent>
+                    </OrganizationProfileCardInfo>
+                  )}
+                </AccordionContent>
+              )}
+          </AccordionItem>
+        </Accordion>
+      </InfoCardContent>
+    </InfoCard>
+  );
+};
+export default PartnerProfileCardPage;
diff --git a/app/partner/profile/@changes/components/PartnerProfileChangesForm/PartnerProfileChangesForm.tsx b/app/partner/profile/@changes/components/PartnerProfileChangesForm/PartnerProfileChangesForm.tsx
new file mode 100644
index 00000000..1ea9fce7
--- /dev/null
+++ b/app/partner/profile/@changes/components/PartnerProfileChangesForm/PartnerProfileChangesForm.tsx
@@ -0,0 +1,102 @@
+'use client';
+
+import * as fns from 'date-fns';
+import { SendHorizonalIcon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  Button,
+  Card,
+  CardTitle,
+  Form,
+  FormField,
+  FormItem,
+  FormMessage,
+  Textarea,
+  Timeline,
+  TimelineContent,
+  TimelineItem,
+  TimelineTitle,
+  Typography
+} from '@/components/ui';
+import { useI18n } from '@/utils/contexts';
+
+import PartnerProfileChangesLoading from '../../loading';
+
+import { usePartnerProfileChangesForm } from './hooks/usePartnerProfileChangesForm';
+
+interface PartnerProfileChangesFormProps {
+  organizationId: string;
+}
+
+export const PartnerProfileChangesForm = ({ organizationId }: PartnerProfileChangesFormProps) => {
+  const i18n = useI18n();
+  const { form, functions, state } = usePartnerProfileChangesForm({ organizationId });
+
+  if (state.query.isLoading) return <PartnerProfileChangesLoading />;
+
+  return (
+    <Card className='flex w-full flex-col p-4'>
+      <Form {...form}>
+        <form onSubmit={functions.onSubmit}>
+          <fieldset disabled={state.isLoading} className='flex'>
+            <FormField
+              control={form.control}
+              name='comment'
+              render={({ field }) => (
+                <FormItem className='flex-grow'>
+                  <Textarea
+                    {...field}
+                    className='h-24 w-full border border-secondary px-3 py-4'
+                    placeholder={i18n.formatMessage({ id: 'field.note.placeholder' })}
+                  />
+                  <FormMessage>
+                    {form.formState?.errors?.comment && (
+                      <I18nText path={form.formState.errors.comment.message as LocaleMessageId} />
+                    )}
+                  </FormMessage>
+                </FormItem>
+              )}
+            />
+
+            <Button
+              type='submit'
+              variant='secondary'
+              className='ml-3 mr-1 h-8 w-8 self-end p-2'
+              disabled={state.isLoading}
+            >
+              <SendHorizonalIcon />
+            </Button>
+          </fieldset>
+        </form>
+      </Form>
+      <CardTitle className='mt-5'>
+        <Typography variant='h5' tag='p'>
+          <I18nText path='organization.profile.changes.title' />
+        </Typography>
+      </CardTitle>
+      <Timeline>
+        {state.query.data?.pages.map((page) =>
+          page.rows.map((change) => (
+            <TimelineItem key={change.id}>
+              <TimelineTitle>
+                {fns.format(change.createdAt, 'dd.MM.yy')} {fns.format(change.createdAt, 'HH:mm')}
+              </TimelineTitle>
+              <TimelineContent>{change.new.comment || change.action}</TimelineContent>
+            </TimelineItem>
+          ))
+        )}
+      </Timeline>
+      {state.query.hasNextPage && (
+        <Button
+          className='w-full'
+          onClick={() => state.query.fetchNextPage()}
+          disabled={state.query.isFetchingNextPage}
+          loading={state.query.isFetchingNextPage}
+        >
+          <I18nText path='button.loadMore' />
+        </Button>
+      )}
+    </Card>
+  );
+};
diff --git a/app/partner/profile/@changes/components/PartnerProfileChangesForm/constants/addPartnerProfileChangesSchema.ts b/app/partner/profile/@changes/components/PartnerProfileChangesForm/constants/addPartnerProfileChangesSchema.ts
new file mode 100644
index 00000000..52b302ad
--- /dev/null
+++ b/app/partner/profile/@changes/components/PartnerProfileChangesForm/constants/addPartnerProfileChangesSchema.ts
@@ -0,0 +1,10 @@
+import * as z from 'zod';
+
+export const addPartnerProfileChangesSchema = z.object({
+  comment: z
+    .string()
+    .min(1, { message: 'validation.required' })
+    .max(255, { message: 'validation.max' })
+});
+
+export type AddPartnerProfileChangesSchema = z.infer<typeof addPartnerProfileChangesSchema>;
diff --git a/app/partner/profile/@changes/components/PartnerProfileChangesForm/hooks/usePartnerProfileChangesForm.ts b/app/partner/profile/@changes/components/PartnerProfileChangesForm/hooks/usePartnerProfileChangesForm.ts
new file mode 100644
index 00000000..4f760228
--- /dev/null
+++ b/app/partner/profile/@changes/components/PartnerProfileChangesForm/hooks/usePartnerProfileChangesForm.ts
@@ -0,0 +1,53 @@
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+
+import { useGetChangesInfiniteQuery, usePostChangesMutation } from '@/utils/api';
+
+import type { AddPartnerProfileChangesSchema } from '../constants/addPartnerProfileChangesSchema';
+import { addPartnerProfileChangesSchema } from '../constants/addPartnerProfileChangesSchema';
+
+const DEFAULT_CHANGES_PAGE = 1;
+const CHANGES_LIMIT = 5;
+
+interface UsePartnerProfileChangesFormParams {
+  organizationId: string;
+}
+
+export const usePartnerProfileChangesForm = ({
+  organizationId
+}: UsePartnerProfileChangesFormParams) => {
+  const postChangesMutation = usePostChangesMutation();
+
+  const getChangesInfiniteQuery = useGetChangesInfiniteQuery({
+    current: DEFAULT_CHANGES_PAGE,
+    limit: CHANGES_LIMIT,
+    criteria: organizationId
+  });
+
+  const addOrganizationChangeForm = useForm<AddPartnerProfileChangesSchema>({
+    mode: 'onSubmit',
+    resolver: zodResolver(addPartnerProfileChangesSchema),
+    defaultValues: { comment: '' }
+  });
+
+  const onSubmit = addOrganizationChangeForm.handleSubmit(async (values) => {
+    await postChangesMutation.mutateAsync({
+      params: {
+        criteria: organizationId,
+        new: { comment: values.comment },
+        action: 'comment'
+      }
+    });
+    addOrganizationChangeForm.reset();
+    getChangesInfiniteQuery.refetch();
+  });
+
+  return {
+    state: {
+      isLoading: postChangesMutation.isPending,
+      query: getChangesInfiniteQuery
+    },
+    form: addOrganizationChangeForm,
+    functions: { onSubmit }
+  };
+};
diff --git a/app/partner/profile/@changes/loading.tsx b/app/partner/profile/@changes/loading.tsx
new file mode 100644
index 00000000..ae447a7f
--- /dev/null
+++ b/app/partner/profile/@changes/loading.tsx
@@ -0,0 +1,50 @@
+import { Card } from '@/components/ui';
+import { Skeleton } from '@/components/ui/skeleton';
+
+const PartnerProfileChangesLoading = () => (
+  <Card className='w-full p-4'>
+    <div className='flex h-fit min-h-72 flex-1 flex-col space-y-3 rounded bg-background'>
+      <div className='space-y-7'>
+        <div className='flex items-end gap-3'>
+          <Skeleton className='h-20 w-full rounded-xl'>
+            <Skeleton className='m-3 h-7 w-32 rounded-xl bg-background' />
+          </Skeleton>
+          <Skeleton className='h-8 w-8 rounded-xl' />
+        </div>
+        <Skeleton className='h-7 w-32 rounded-xl' />
+      </div>
+
+      <div className='w-full'>
+        <div className='w-full space-y-4'>
+          <div className='flex gap-5'>
+            <Skeleton className='h-auto w-2 rounded-xl' />
+            <div className='w-full space-y-3 pb-10 pt-4'>
+              <Skeleton className='h-7 w-3/12 rounded-xl' />
+              <Skeleton className='h-10 w-full rounded-xl' />
+            </div>
+          </div>
+        </div>
+        <div className='w-full space-y-4'>
+          <div className='flex gap-5'>
+            <Skeleton className='h-auto w-2 rounded-xl' />
+            <div className='w-full space-y-3 pb-10 pt-4'>
+              <Skeleton className='h-7 w-3/12 rounded-xl' />
+              <Skeleton className='h-10 w-full rounded-xl' />
+            </div>
+          </div>
+        </div>
+        <div className='w-full space-y-4'>
+          <div className='flex gap-5'>
+            <Skeleton className='h-auto w-2 rounded-xl' />
+            <div className='w-full space-y-3 pb-10 pt-4'>
+              <Skeleton className='h-7 w-3/12 rounded-xl' />
+              <Skeleton className='h-10 w-full rounded-xl' />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </Card>
+);
+
+export default PartnerProfileChangesLoading;
diff --git a/app/partner/profile/@changes/page.tsx b/app/partner/profile/@changes/page.tsx
new file mode 100644
index 00000000..07dbdb8d
--- /dev/null
+++ b/app/partner/profile/@changes/page.tsx
@@ -0,0 +1,13 @@
+import { getOrganizationCurrent } from '@/utils/api';
+
+import { PartnerProfileChangesForm } from './components/PartnerProfileChangesForm/PartnerProfileChangesForm';
+
+const PartnerProfileChangesPage = async () => {
+  const getOrganizationCurrentResponse = await getOrganizationCurrent({
+    config: { cache: 'no-store' }
+  });
+
+  return <PartnerProfileChangesForm organizationId={getOrganizationCurrentResponse.id} />;
+};
+
+export default PartnerProfileChangesPage;
diff --git a/app/partner/profile/@statistics/loading.tsx b/app/partner/profile/@statistics/loading.tsx
new file mode 100644
index 00000000..53b14a6a
--- /dev/null
+++ b/app/partner/profile/@statistics/loading.tsx
@@ -0,0 +1,10 @@
+import { InfoCardSkeleton } from '@/components/ui';
+
+const PartnerProfileStatisticsLoading = () => (
+  <div className='flex flex-1 gap-6'>
+    <InfoCardSkeleton className='w-1/2' />
+    <InfoCardSkeleton className='w-1/2' />
+  </div>
+);
+
+export default PartnerProfileStatisticsLoading;
diff --git a/app/partner/profile/@statistics/page.tsx b/app/partner/profile/@statistics/page.tsx
new file mode 100644
index 00000000..d288b755
--- /dev/null
+++ b/app/partner/profile/@statistics/page.tsx
@@ -0,0 +1,61 @@
+import { NotebookTextIcon, TrendingUpIcon, UsersRoundIcon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  InfoCard,
+  InfoCardAction,
+  InfoCardContent,
+  InfoCardHeader,
+  InfoCardItem,
+  InfoCardItemDescription,
+  InfoCardItemTitle,
+  InfoCardTitle,
+  Typography
+} from '@/components/ui';
+
+const PartnerProfileStatisticsPage = () => (
+  <div className='flex flex-col gap-4 sm:flex-row'>
+    <InfoCard>
+      <InfoCardHeader className='p-5'>
+        <InfoCardTitle>
+          <Typography variant='sub1' tag='p'>
+            <I18nText path='organization.profile.members' />
+          </Typography>
+        </InfoCardTitle>
+        <InfoCardAction>
+          <UsersRoundIcon size={20} strokeWidth={1.5} />
+        </InfoCardAction>
+      </InfoCardHeader>
+      <InfoCardContent>
+        <InfoCardItem>
+          <InfoCardItemTitle>560</InfoCardItemTitle>
+          <InfoCardItemDescription className='flex gap-1'>
+            <TrendingUpIcon size={14} />
+            <Typography variant='body4' tag='p'>
+              +24 <I18nText path='infoCard.description.perMonth' />
+            </Typography>
+          </InfoCardItemDescription>
+        </InfoCardItem>
+      </InfoCardContent>
+    </InfoCard>
+    <InfoCard>
+      <InfoCardHeader className='p-5'>
+        <InfoCardTitle>
+          <Typography variant='sub1' tag='p'>
+            <I18nText path='organization.profile.entries' />
+          </Typography>
+        </InfoCardTitle>
+        <InfoCardAction>
+          <NotebookTextIcon size={20} strokeWidth={1.5} />
+        </InfoCardAction>
+      </InfoCardHeader>
+      <InfoCardContent>
+        <InfoCardItem>
+          <InfoCardItemTitle>560</InfoCardItemTitle>
+        </InfoCardItem>
+      </InfoCardContent>
+    </InfoCard>
+  </div>
+);
+
+export default PartnerProfileStatisticsPage;
diff --git a/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/EditOrganizationTariffDialog.tsx b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/EditOrganizationTariffDialog.tsx
new file mode 100644
index 00000000..5a24ba1e
--- /dev/null
+++ b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/EditOrganizationTariffDialog.tsx
@@ -0,0 +1,51 @@
+'use client';
+
+import { XIcon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+  ScrollArea,
+  Typography
+} from '@/components/ui';
+
+import { EditOrganizationTariffForm } from './components/EditOrganizationTariffForm/EditOrganizationTariffForm';
+import { useEditOrganizationTariffDialog } from './hooks/useEditOrganizationTariffDialog';
+
+interface EditOrganizationTariffDialogProps {
+  tariff: TariffResponse;
+  trigger: JSX.Element;
+}
+
+export const EditOrganizationTariffDialog = ({
+  tariff,
+  trigger
+}: EditOrganizationTariffDialogProps) => {
+  const { state, functions } = useEditOrganizationTariffDialog();
+
+  return (
+    <Dialog open={state.open} onOpenChange={functions.setOpen}>
+      <DialogTrigger asChild>{trigger}</DialogTrigger>
+      <DialogContent className='flex h-fit w-11/12 max-w-[713px] flex-col rounded-lg smx:max-h-[90%]'>
+        <DialogClose>
+          <XIcon className='h-6 w-6' />
+        </DialogClose>
+        <DialogHeader>
+          <DialogTitle asChild>
+            <Typography tag='h4' variant='h4' className='text-center'>
+              <I18nText path='dialog.editOrganizationTariff.title' />
+            </Typography>
+          </DialogTitle>
+        </DialogHeader>
+        <ScrollArea className='h-full overflow-y-auto rounded-lg border px-[77px] pb-[47px] pt-[30px] lgx:px-12 mdx:justify-center mdx:px-10 xsx:mb-[30px] xsx:px-3'>
+          <EditOrganizationTariffForm tariff={tariff} onEdited={functions.onEdited} />
+        </ScrollArea>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/EditOrganizationTariffForm.tsx b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/EditOrganizationTariffForm.tsx
new file mode 100644
index 00000000..abadd7ce
--- /dev/null
+++ b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/EditOrganizationTariffForm.tsx
@@ -0,0 +1,217 @@
+'use client';
+
+import { MinusIcon, PlusIcon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  Button,
+  Form,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  NumberFormatInput,
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+  Typography
+} from '@/components/ui';
+import { useI18n } from '@/utils/contexts';
+
+import { PERIOD_MONTH_OPTIONS } from './constants/periodMonthOptions';
+import { useEditOrganizationTariffForm } from './hooks/useEditOrganizationTariffForm';
+
+export interface EditOrganizationTariffFormProps {
+  tariff: TariffResponse;
+  onEdited: () => void;
+}
+
+export const EditOrganizationTariffForm = ({
+  onEdited,
+  tariff
+}: EditOrganizationTariffFormProps) => {
+  const i18n = useI18n();
+  const { form, functions, state } = useEditOrganizationTariffForm({
+    onEdited,
+    tariff
+  });
+
+  return (
+    <Form {...form}>
+      <form onSubmit={functions.onSubmit}>
+        <fieldset
+          disabled={state.isLoading}
+          className='grid grid-cols-2 gap-x-[100px] gap-y-[30px] lgx:gap-x-14 mdx:mx-auto mdx:w-[80%] mdx:grid-cols-1 xsx:w-[100%]'
+        >
+          <FormField
+            control={form.control}
+            name='freeActivity'
+            render={({ field }) => (
+              <FormItem className='flex flex-col justify-center'>
+                <div className='flex flex-col gap-3 px-1'>
+                  <FormLabel className='text-base font-bold mdx:text-center'>
+                    <I18nText path='field.freeActivity.label' />
+                  </FormLabel>
+                  <div className='flex items-center gap-3 mdx:justify-center'>
+                    <Button
+                      type='button'
+                      className='size-7 px-0 py-0'
+                      variant='outline'
+                      onClick={() => form.setValue('freeActivity', `${+field.value - 1}`)}
+                    >
+                      <MinusIcon className='size-4' />
+                    </Button>
+                    <NumberFormatInput
+                      {...field}
+                      className='w-14 text-center text-lg font-medium'
+                    />
+                    <Button
+                      type='button'
+                      className='size-7 px-0 py-0'
+                      variant='outline'
+                      onClick={() => form.setValue('freeActivity', `${+field.value + 1}`)}
+                    >
+                      <PlusIcon className='size-4' />
+                    </Button>
+                  </div>
+                </div>
+                <FormMessage className='mdx:text-center'>
+                  {form.formState?.errors?.freeActivity && (
+                    <I18nText
+                      path={form.formState.errors.freeActivity.message as LocaleMessageId}
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='paidActivity'
+            render={({ field }) => (
+              <FormItem>
+                <div className='flex flex-col gap-3 px-1'>
+                  <FormLabel className='text-base font-bold mdx:text-center'>
+                    <I18nText path='field.paidActivity.label' />
+                  </FormLabel>
+                  <div className='flex items-center gap-3 mdx:justify-center'>
+                    <Button
+                      type='button'
+                      className='size-7 px-0 py-0'
+                      variant='outline'
+                      onClick={() => form.setValue('paidActivity', `${+field.value - 1}`)}
+                    >
+                      <MinusIcon className='size-4' />
+                    </Button>
+                    <NumberFormatInput
+                      {...field}
+                      className='w-14 text-center text-lg font-medium'
+                    />
+                    <Button
+                      type='button'
+                      className='size-7 px-0 py-0'
+                      variant='outline'
+                      onClick={() => form.setValue('paidActivity', `${+field.value + 1}`)}
+                    >
+                      <PlusIcon className='size-4' />
+                    </Button>
+                  </div>
+                </div>
+                <FormMessage className='mdx:text-center'>
+                  {form.formState?.errors?.paidActivity && (
+                    <I18nText
+                      path={form.formState.errors.paidActivity.message as LocaleMessageId}
+                    />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='periodMonth'
+            render={({ field }) => (
+              <FormItem className='flex flex-col gap-3 px-1'>
+                <FormLabel className='text-base font-bold mdx:text-center'>
+                  <I18nText path='field.periodMonth.label' />
+                </FormLabel>
+                <Select {...field} onValueChange={field.onChange} value={field.value}>
+                  <SelectTrigger className='mx-auto w-full max-w-[200px]'>
+                    <SelectValue
+                      className='block w-full'
+                      placeholder={i18n.formatMessage({ id: 'field.periodMonth.placeholder' })}
+                    />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectGroup>
+                      {PERIOD_MONTH_OPTIONS.map((periodMonthOption) => (
+                        <SelectItem
+                          value={periodMonthOption.monthsAmount.toString()}
+                          className='block w-full'
+                        >
+                          <div className='flex items-center gap-4'>
+                            <Typography variant='body2' className='flex-grow'>
+                              <I18nText
+                                path='organization.profile.tariff.periodMonth'
+                                values={{ monthsAmount: periodMonthOption.monthsAmount }}
+                              />
+                            </Typography>
+                            <Typography variant='body3' className=''>
+                              <I18nText
+                                path='organization.profile.tariff.discount'
+                                values={{ discount: periodMonthOption.discount }}
+                              />
+                            </Typography>
+                          </div>
+                        </SelectItem>
+                      ))}
+                    </SelectGroup>
+                  </SelectContent>
+                </Select>
+                <FormMessage className='mdx:text-center'>
+                  {form.formState?.errors?.periodMonth && (
+                    <I18nText path={form.formState.errors.periodMonth.message as LocaleMessageId} />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+          <FormField
+            control={form.control}
+            name='totalPrice'
+            render={({ field }) => (
+              <FormItem className='flex flex-col gap-3 px-1'>
+                <FormLabel className='text-base font-bold mdx:text-center'>
+                  <I18nText path='field.totalPrice.label' />
+                </FormLabel>
+                <div className='flex items-center gap-2 mdx:mx-auto mdx:max-w-[200px]'>
+                  <NumberFormatInput {...field} />
+                  <Typography variant='body1' tag='p' className='line-through'>
+                    <I18nText path='common.rubles' values={{ amount: tariff.totalPrice }} />
+                  </Typography>
+                </div>
+                <FormMessage className='mdx:text-center'>
+                  {form.formState?.errors?.totalPrice && (
+                    <I18nText path={form.formState.errors.totalPrice.message as LocaleMessageId} />
+                  )}
+                </FormMessage>
+              </FormItem>
+            )}
+          />
+
+          <Button
+            type='submit'
+            variant='secondary'
+            className='col-end-3 mt-[47px] px-1 text-base font-bold mdx:col-end-auto mdx:mx-auto mdx:mt-5 mdx:w-[200px]'
+            loading={state.isLoading}
+          >
+            <I18nText path='button.updateTariff' />
+          </Button>
+        </fieldset>
+      </form>
+    </Form>
+  );
+};
diff --git a/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/constants/editOrganizationTariffSchema.ts b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/constants/editOrganizationTariffSchema.ts
new file mode 100644
index 00000000..325e2ca4
--- /dev/null
+++ b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/constants/editOrganizationTariffSchema.ts
@@ -0,0 +1,10 @@
+import * as z from 'zod';
+
+export const editOrganizationTariffSchema = z.object({
+  freeActivity: z.string().min(1, { message: 'validation.required' }),
+  paidActivity: z.string().min(1, { message: 'validation.required' }),
+  periodMonth: z.string().min(1, { message: 'validation.required' }),
+  totalPrice: z.string().min(1, { message: 'validation.required' })
+});
+
+export type EditOrganizationTariffSchema = z.infer<typeof editOrganizationTariffSchema>;
diff --git a/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/constants/periodMonthOptions.ts b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/constants/periodMonthOptions.ts
new file mode 100644
index 00000000..654e447f
--- /dev/null
+++ b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/constants/periodMonthOptions.ts
@@ -0,0 +1,6 @@
+export const PERIOD_MONTH_OPTIONS = [
+  { monthsAmount: 1, discount: 0 },
+  { monthsAmount: 3, discount: 10 },
+  { monthsAmount: 6, discount: 20 },
+  { monthsAmount: 12, discount: 40 }
+];
diff --git a/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/hooks/useEditOrganizationTariffForm.ts b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/hooks/useEditOrganizationTariffForm.ts
new file mode 100644
index 00000000..a61bda88
--- /dev/null
+++ b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/components/EditOrganizationTariffForm/hooks/useEditOrganizationTariffForm.ts
@@ -0,0 +1,58 @@
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useQueryClient } from '@tanstack/react-query';
+import { useRouter } from 'next/navigation';
+
+import { usePutTariffByIdMutation } from '@/utils/api';
+
+import {
+  type EditOrganizationTariffSchema,
+  editOrganizationTariffSchema
+} from '../constants/editOrganizationTariffSchema';
+
+interface UseEditOrganizationTariffFormParams {
+  tariff: TariffResponse;
+  onEdited: () => void;
+}
+
+export const useEditOrganizationTariffForm = ({
+  onEdited,
+  tariff
+}: UseEditOrganizationTariffFormParams) => {
+  const router = useRouter();
+  const queryClient = useQueryClient();
+  const editOrganizationForm = useForm<EditOrganizationTariffSchema>({
+    mode: 'onSubmit',
+    resolver: zodResolver(editOrganizationTariffSchema),
+    defaultValues: {
+      freeActivity: tariff.freeActivity.toString(),
+      paidActivity: tariff.paidActivity.toString(),
+      periodMonth: tariff.periodMonth ? tariff.periodMonth.toString() : '',
+      totalPrice: tariff.totalPrice
+    }
+  });
+
+  const putTariffByIdMutation = usePutTariffByIdMutation();
+
+  const onSubmit = editOrganizationForm.handleSubmit(async (values) => {
+    await putTariffByIdMutation.mutateAsync({
+      params: {
+        id: tariff.id,
+        freeActivity: +values.freeActivity,
+        paidActivity: +values.paidActivity,
+        periodMonth: +values.periodMonth,
+        totalPrice: values.totalPrice
+      }
+    });
+    router.refresh();
+    queryClient.invalidateQueries({ queryKey: ['getChanges'] });
+
+    onEdited();
+  });
+
+  return {
+    state: { isLoading: putTariffByIdMutation.isPending },
+    form: editOrganizationForm,
+    functions: { onSubmit }
+  };
+};
diff --git a/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/hooks/useEditOrganizationTariffDialog.ts b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/hooks/useEditOrganizationTariffDialog.ts
new file mode 100644
index 00000000..452786c3
--- /dev/null
+++ b/app/partner/profile/@tariff/components/EditOrganizationTariffDialog/hooks/useEditOrganizationTariffDialog.ts
@@ -0,0 +1,19 @@
+import React from 'react';
+import { toast } from 'sonner';
+
+import { useI18n } from '@/utils/contexts';
+
+export const useEditOrganizationTariffDialog = () => {
+  const i18n = useI18n();
+  const [open, setOpen] = React.useState(false);
+
+  const onEdited = () => {
+    setOpen(false);
+
+    toast.success(i18n.formatMessage({ id: 'toast.organizationTariffChanged' }), {
+      cancel: { label: 'Close' }
+    });
+  };
+
+  return { state: { open }, functions: { setOpen, onEdited } };
+};
diff --git a/app/partner/profile/@tariff/loading.tsx b/app/partner/profile/@tariff/loading.tsx
new file mode 100644
index 00000000..c97ec029
--- /dev/null
+++ b/app/partner/profile/@tariff/loading.tsx
@@ -0,0 +1,5 @@
+import { InfoCardSkeleton } from '@/components/ui';
+
+const PartnerProfileTariffLoading = () => <InfoCardSkeleton itemsCount={3} className='pt-6' />;
+
+export default PartnerProfileTariffLoading;
diff --git a/app/partner/profile/@tariff/page.tsx b/app/partner/profile/@tariff/page.tsx
new file mode 100644
index 00000000..e86088d4
--- /dev/null
+++ b/app/partner/profile/@tariff/page.tsx
@@ -0,0 +1,104 @@
+import * as fns from 'date-fns';
+import { InfinityIcon } from 'lucide-react';
+
+import { I18nText } from '@/components/common';
+import {
+  Button,
+  InfoCard,
+  InfoCardAction,
+  InfoCardContent,
+  InfoCardHeader,
+  InfoCardItem,
+  InfoCardItemDescription,
+  InfoCardItemTitle,
+  InfoCardTitle,
+  Typography
+} from '@/components/ui';
+import { getOrganizationCurrent, getTariffByLegalEntityId } from '@/utils/api';
+
+import { EditOrganizationTariffDialog } from './components/EditOrganizationTariffDialog/EditOrganizationTariffDialog';
+
+const PartnerProfileTariffPage = async () => {
+  const getOrganizationCurrentResponse = await getOrganizationCurrent({
+    config: { cache: 'no-store' }
+  });
+
+  const getTariffByLegalEntityIdResponse = await getTariffByLegalEntityId({
+    params: { legalEntityId: getOrganizationCurrentResponse.id },
+    config: {
+      cache: 'no-store'
+    }
+  });
+
+  return (
+    <InfoCard>
+      <InfoCardHeader className='p-5'>
+        <InfoCardTitle>
+          <Typography variant='h5' tag='p'>
+            <I18nText path='organization.profile.tariff.title' />{' '}
+            {getTariffByLegalEntityIdResponse.totalPrice !== '0' &&
+              getTariffByLegalEntityIdResponse.totalPrice}
+            {getTariffByLegalEntityIdResponse.totalPrice === '0' && (
+              <I18nText path='organization.profile.tariff.free' />
+            )}
+          </Typography>
+        </InfoCardTitle>
+        <InfoCardAction className='bg-transparent '>
+          <EditOrganizationTariffDialog
+            tariff={getTariffByLegalEntityIdResponse}
+            trigger={
+              <Button variant='ghost' className='p-2 text-muted-foreground'>
+                <I18nText path='button.updateTariff' />
+              </Button>
+            }
+          />
+        </InfoCardAction>
+      </InfoCardHeader>
+      <InfoCardContent className='mt-1 flex w-full justify-center'>
+        <InfoCardItem className='flex flex-col items-center border-none'>
+          <InfoCardItemTitle>
+            <Typography variant='h3' tag='h3'>
+              {getTariffByLegalEntityIdResponse.freeActivity +
+                getTariffByLegalEntityIdResponse.paidActivity}
+            </Typography>
+          </InfoCardItemTitle>
+          <InfoCardItemDescription className='flex'>
+            <Typography variant='body2' tag='p' className='text-muted-foreground'>
+              <I18nText path='organization.profile.tariff.activity' />
+            </Typography>
+          </InfoCardItemDescription>
+        </InfoCardItem>
+        <InfoCardItem className='flex flex-col items-center border-none'>
+          <InfoCardItemTitle>
+            <Typography variant='h3' tag='h3'>
+              {getTariffByLegalEntityIdResponse.paidActivity}
+            </Typography>
+          </InfoCardItemTitle>
+          <InfoCardItemDescription className='flex'>
+            <Typography variant='body2' tag='p' className='text-muted-foreground'>
+              <I18nText path='organization.profile.tariff.paid' />
+            </Typography>
+          </InfoCardItemDescription>
+        </InfoCardItem>
+        <InfoCardItem className='flex flex-col items-center justify-between border-none'>
+          <InfoCardItemTitle>
+            <Typography variant='h3' tag='h3'>
+              {!!getTariffByLegalEntityIdResponse.dateEnd &&
+                fns.format(getTariffByLegalEntityIdResponse.dateEnd, 'dd.MM.yy')}
+              {!getTariffByLegalEntityIdResponse.dateEnd && (
+                <InfinityIcon className='my-1 size-6' />
+              )}
+            </Typography>
+          </InfoCardItemTitle>
+          <InfoCardItemDescription className='flex'>
+            <Typography variant='body2' tag='p' className='text-muted-foreground'>
+              <I18nText path='organization.profile.tariff.valid' />
+            </Typography>
+          </InfoCardItemDescription>
+        </InfoCardItem>
+      </InfoCardContent>
+    </InfoCard>
+  );
+};
+
+export default PartnerProfileTariffPage;
diff --git a/app/partner/profile/layout.tsx b/app/partner/profile/layout.tsx
new file mode 100644
index 00000000..64f31c17
--- /dev/null
+++ b/app/partner/profile/layout.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+
+interface PartnerProfileLayoutProps {
+  children: React.ReactNode;
+  card: React.ReactNode;
+  changes: React.ReactNode;
+  statistics: React.ReactNode;
+  tariff: React.ReactNode;
+}
+
+const PartnerProfileLayout = ({ card, changes, statistics, tariff }: PartnerProfileLayoutProps) => (
+  <div className='flex flex-1 flex-col justify-center gap-4 lg:flex-row'>
+    <div className='flex-1'>{card}</div>
+    <div className='flex flex-1 flex-col gap-4'>
+      {tariff}
+      {statistics}
+      {changes}
+    </div>
+  </div>
+);
+
+export default PartnerProfileLayout;
diff --git a/middleware.ts b/middleware.ts
index be51c5a0..5419c9b7 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -28,8 +28,10 @@ export const middleware = (request: NextRequest) => {
   }
 
   const isOrg = request.url.includes(ROUTES.ORG.ORGANIZATIONS.ROOT);
-  if (!isAuthenticated && isOrg) {
-    console.log('@.2 !isAuthenticated && isOrg, org page requires auth');
+  const isPartner = request.url.includes(ROUTES.PARTNER.ROOT);
+
+  if (!isAuthenticated && (isOrg || isPartner)) {
+    console.log('@.2 !isAuthenticated && isOrg, org or partner page requires auth');
     return NextResponse.redirect(new URL(ROUTES.ORG.AUTH, request.url));
   }
 
diff --git a/mock-server.config.ts b/mock-server.config.ts
index c0489f87..88799392 100644
--- a/mock-server.config.ts
+++ b/mock-server.config.ts
@@ -11,7 +11,8 @@ const mockServerConfig: MockServerConfig = {
     credentials: true
   },
   interceptors: {
-    request: async ({ setDelay }) => {
+    request: async ({ setDelay, request }) => {
+      console.log('REQUEST:', request.method, request.originalUrl);
       await setDelay(1000);
     }
   },
diff --git a/mock/requests/auth/login/email/post.ts b/mock/requests/auth/login/email/post.ts
index 1b6bf3a3..369514dd 100644
--- a/mock/requests/auth/login/email/post.ts
+++ b/mock/requests/auth/login/email/post.ts
@@ -25,9 +25,9 @@ export const postAuthLoginEmailConfig: RestRequestConfig = {
       },
       interceptors: {
         response: (data, { setCookie }) => {
-          setCookie(COOKIES.SESSION_ID, COOKIES.SESSION_ID, {
+          setCookie(COOKIES.SESSION_ID, 'superadmin', {
             httpOnly: true,
-            maxAge: 360000,
+            maxAge: 36000000,
             path: '/'
           });
 
@@ -36,18 +36,20 @@ export const postAuthLoginEmailConfig: RestRequestConfig = {
       }
     },
     {
-      data: { message: 'Неверный пароль' },
+      data: {},
       entities: {
         body: {
-          email: 'superadmin@mail.ru',
-          password: {
-            checkMode: 'exists'
-          }
+          email: 'partner@mail.ru',
+          password: '123456'
         }
       },
       interceptors: {
-        response: (data, params) => {
-          params.setStatusCode(400);
+        response: (data, { setCookie }) => {
+          setCookie(COOKIES.SESSION_ID, 'partner', {
+            httpOnly: true,
+            maxAge: 36000000,
+            path: '/'
+          });
 
           return data;
         }
diff --git a/mock/requests/index.ts b/mock/requests/index.ts
index 25cf2a97..1b011faf 100644
--- a/mock/requests/index.ts
+++ b/mock/requests/index.ts
@@ -13,6 +13,7 @@ export * from './legal-address/id/get';
 export * from './legal-address/id/put';
 export * from './legal-address/post';
 export * from './legal-addresses/legalId/get';
+export * from './organization/current/get';
 export * from './organization/dashboard/get';
 export * from './organization/get';
 export * from './organization/id/employees/get';
diff --git a/mock/requests/organization/current/get.ts b/mock/requests/organization/current/get.ts
new file mode 100644
index 00000000..e5c34ea6
--- /dev/null
+++ b/mock/requests/organization/current/get.ts
@@ -0,0 +1,39 @@
+import type { RestRequestConfig } from 'mock-config-server';
+
+export const getOrganizationCurrentConfig: RestRequestConfig = {
+  path: '/organization/current',
+  method: 'get',
+  routes: [
+    {
+      data: {
+        contactName: 'Ольга',
+        phone: 79998887766,
+        email: 'abcdefjh1@mail.ru',
+        site: 'www.risovashki_nsk.ru',
+        social: ['https://wa.me/me', 'https://t.me/me', 'https://vk.com/me'],
+        background: '',
+        avatar: '',
+        locality: 'г. Новосибирск',
+        id: '1',
+        name: 'ООО Рисовашки',
+        description:
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididuntut labore',
+        information: {
+          postAddress: 'Иванов Иван Иванович г. Москва ул. Ленина, д. 10, кв. 20 101000',
+          fullNameOfTheLegalEntity: 'ООО “Рисовашки',
+          legalAddress: 'ООО “Рисовашки”',
+          inn: '563565286576',
+          kpp: '543565286',
+          ogrn: '1117746019885'
+        },
+        requisites: {
+          bank: 'ПАО Сбербанк',
+          bik: '044525225',
+          checkingAccount: '00055165739881705595'
+        },
+        stage: 'REQUEST',
+        type: 'PARTNER'
+      }
+    }
+  ]
+};
diff --git a/mock/requests/organization/id/get.ts b/mock/requests/organization/id/get.ts
index 2bc1c57d..41d38b8f 100644
--- a/mock/requests/organization/id/get.ts
+++ b/mock/requests/organization/id/get.ts
@@ -18,7 +18,6 @@ export const getOrganizationByIdConfig: RestRequestConfig = {
   routes: [
     {
       entities: { params: { id: 1 } },
-
       data: {
         contactName: 'Ольга',
         phone: 79998887766,
diff --git a/mock/requests/user/get.ts b/mock/requests/user/get.ts
index a3df612e..d319749f 100644
--- a/mock/requests/user/get.ts
+++ b/mock/requests/user/get.ts
@@ -1,10 +1,17 @@
 import type { RestRequestConfig } from 'mock-config-server';
 
+import { COOKIES } from '@/utils/constants/cookies';
+
 export const getUserMeConfig: RestRequestConfig = {
   path: '/user',
   method: 'get',
   routes: [
     {
+      entities: {
+        cookies: {
+          [COOKIES.SESSION_ID]: 'superadmin'
+        }
+      },
       data: {
         id: '77672e1e-f8cc-4e56-9f4b-9840a94dbbca',
         email: 'superadmin@mail.ru',
@@ -24,8 +31,8 @@ export const getUserMeConfig: RestRequestConfig = {
     },
     {
       entities: {
-        query: {
-          email: 'partner@mail.ru'
+        cookies: {
+          [COOKIES.SESSION_ID]: 'partner'
         }
       },
       data: {
diff --git a/src/components/dialogs/RegisterOrganizationDialog/RegisterOrganizationDialog.tsx b/src/components/dialogs/RegisterOrganizationDialog/RegisterOrganizationDialog.tsx
index 1c348a49..3cd390fd 100644
--- a/src/components/dialogs/RegisterOrganizationDialog/RegisterOrganizationDialog.tsx
+++ b/src/components/dialogs/RegisterOrganizationDialog/RegisterOrganizationDialog.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import { XIcon } from 'lucide-react';
 import Image from 'next/image';
 
-import treeBackground from '@/assets/images/background/trees.png';
+import treeBackgroundImage from '@/assets/images/background/trees.png';
 import { I18nText } from '@/components/common';
 import { Dialog, DialogClose, DialogContent, DialogTrigger, Typography } from '@/components/ui';
 
@@ -26,12 +26,12 @@ export const RegisterOrganizationDialog = ({ trigger }: RegisterOrganizationModa
           <XIcon className='h-6 w-6' />
         </DialogClose>
         <div className='flex items-center justify-center overflow-y-auto'>
-          <Image className='absolute' src={treeBackground} alt='' />
+          <Image className='absolute' src={treeBackgroundImage} alt='' />
           <div className='flex flex-col items-center'>
             <Typography variant='h2' tag='h2'>
               <I18nText path='dialog.registerOrganization.title' />
             </Typography>
-            <div className='round relative z-10 mt-16 border bg-background p-5 xsx:mt-7 xsx:w-full lg:mt-16 lg:p-10 sm:w-[450px]'>
+            <div className='round relative z-10 mt-16 border bg-background p-5 xsx:mt-7 xsx:w-full sm:w-[450px] lg:mt-16 lg:p-10'>
               <RegisterOrganizationForm onRegistered={functions.onRegistered} />
             </div>
           </div>
diff --git a/src/components/ui/info-card.tsx b/src/components/ui/info-card.tsx
index 9c9b42d9..5364f83a 100644
--- a/src/components/ui/info-card.tsx
+++ b/src/components/ui/info-card.tsx
@@ -4,7 +4,7 @@ import { Card, CardContent, CardHeader } from '@/components/ui';
 import { cn } from '@/lib/utils';
 
 const InfoCard = ({ className, ...props }: React.ComponentProps<typeof Card>) => (
-  <Card className={cn('flex-auto', className)} {...props} />
+  <Card className={cn('w-full', className)} {...props} />
 );
 InfoCard.displayName = 'InfoCard';
 
@@ -32,7 +32,7 @@ const InfoCardAction = React.forwardRef<HTMLDivElement, React.ComponentProps<'di
 InfoCardAction.displayName = 'InfoCardAction';
 
 const InfoCardContent = ({ className, ...props }: React.ComponentProps<typeof CardContent>) => (
-  <CardContent className={cn('mdx: flex flex-row justify-between px-2', className)} {...props} />
+  <CardContent className={cn('flex-row justify-between mdx:flex', className)} {...props} />
 );
 InfoCardContent.displayName = 'InfoCardHeader';
 
@@ -40,10 +40,7 @@ const InfoCardItem = React.forwardRef<HTMLDivElement, React.ComponentProps<'div'
   ({ className, ...props }, ref) => (
     <div
       ref={ref}
-      className={cn(
-        'flex-1 border-x border-l-0 border-secondary pl-5 last:border-r-0 mdx:pr-2',
-        className
-      )}
+      className={cn('flex-1 border-x border-l-0 border-secondary last:border-r-0', className)}
       {...props}
     />
   )
diff --git a/src/utils/api/api.d.ts b/src/utils/api/api.d.ts
index e101f89d..577028b5 100644
--- a/src/utils/api/api.d.ts
+++ b/src/utils/api/api.d.ts
@@ -414,7 +414,7 @@ interface CreateAddressDto {
   locality: string;
   street: string;
   workingHours: WorkingHourDto[];
-  legalId: string;
+  legalEntityId: string;
 }
 
 interface AddressResponseFixMe {
diff --git a/src/utils/api/requests/index.ts b/src/utils/api/requests/index.ts
index a24f96ab..cfd5b366 100644
--- a/src/utils/api/requests/index.ts
+++ b/src/utils/api/requests/index.ts
@@ -12,6 +12,7 @@ export * from './legal-address/id';
 export * from './legal-addresses/legalId';
 export * from './organization';
 export * from './organization/add-employee';
+export * from './organization/current';
 export * from './organization/dashboard';
 export * from './organization/delete-employee';
 export * from './organization/edit-employee';
diff --git a/src/utils/api/requests/organization/current/index.ts b/src/utils/api/requests/organization/current/index.ts
new file mode 100644
index 00000000..251ded88
--- /dev/null
+++ b/src/utils/api/requests/organization/current/index.ts
@@ -0,0 +1,6 @@
+import { api } from '@/utils/api/instance';
+
+export type GetOrganizationCurrentRequestConfig = RequestConfig | void;
+
+export const getOrganizationCurrent = async (requestConfig?: GetOrganizationCurrentRequestConfig) =>
+  api.get<OrganizationResponse>('organization/current', requestConfig?.config);
diff --git a/src/utils/constants/routes.ts b/src/utils/constants/routes.ts
index 30942a23..20a7c32e 100644
--- a/src/utils/constants/routes.ts
+++ b/src/utils/constants/routes.ts
@@ -21,6 +21,7 @@ export const ROUTES = {
     }
   },
   PARTNER: {
+    ROOT: '/partner',
     PROFILE: '/partner/profile',
     ADDRESSES: '/partner/addresses',
     EMPLOYEES: '/partner/employees',
diff --git a/static/locales/ru.json b/static/locales/ru.json
index c510c6ae..783ec0a6 100644
--- a/static/locales/ru.json
+++ b/static/locales/ru.json
@@ -10,7 +10,7 @@
   "partners.activities.title": "Активности",
   "partners.employees.title": "Сотрудники",
 
-  "org.auth.title": "Вход в личный кабинет",
+  "org.auth.title": "Вход в личный кабинет организатора",
   "org.auth.rememberMe": "Запомнить меня",
   "org.auth.footer.siteRules": "Правила пользования сайтом",
   "org.auth.footer.privacyPolicy": "Политика конфиденциальности",
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 8e471bc2..36853d8d 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -24,19 +24,20 @@ const config = {
       '2xsx': { max: '560px' },
       xsx: { max: '475px' },
       xxsx: { max: '375px' },
-      '4xl': { min: '2560px' },
-      '3xl': { min: '1750px' },
-      '2xl': { min: '1400px' },
-      xl: { min: '1280px' },
-      '2lg': { min: '1124px' },
-      lg: { min: '1024px' },
-      '2md': { min: '900px' },
-      md: { min: '768px' },
-      '2sm': { min: '600px' },
-      sm: { min: '640px' },
-      '2xs': { min: '560px' },
+
+      xxs: { min: '375px' },
       xs: { min: '475px' },
-      xxs: { min: '375px' }
+      '2xs': { min: '560px' },
+      sm: { min: '640px' },
+      '2sm': { min: '600px' },
+      md: { min: '768px' },
+      '2md': { min: '900px' },
+      lg: { min: '1024px' },
+      '2lg': { min: '1124px' },
+      xl: { min: '1280px' },
+      '2xl': { min: '1400px' },
+      '3xl': { min: '1750px' },
+      '4xl': { min: '2560px' }
     },
     container: {
       center: true,