diff --git a/wp-content/themes/cosmopet/templates/pet-card.twig b/wp-content/themes/cosmopet/templates/profile/pet-card.twig
similarity index 84%
rename from wp-content/themes/cosmopet/templates/pet-card.twig
rename to wp-content/themes/cosmopet/templates/profile/pet-card.twig
index b0c76fc..5ad0646 100644
--- a/wp-content/themes/cosmopet/templates/pet-card.twig
+++ b/wp-content/themes/cosmopet/templates/profile/pet-card.twig
@@ -3,21 +3,21 @@
         <div class="cabinet-card__pet">
             <div class="cabinet-card-pet__icon">
                 <div class="cabinet-card-pet-icon__content">
-                    <img src="{{ function('get_template_directory_uri') }}/static/img/pet/mini-{{ function('get_field', 'type', pet_id) }}.png" alt="">
+                    <img src="{{ function('get_template_directory_uri') }}/static/img/pet/mini-{{ function('get_field', 'type', item.id) }}.png" alt="">
                 </div>
             </div>
-            <p class="cabinet-card-pet__name">{{ function('get_the_title', pet_id) }}</p>
+            <p class="cabinet-card-pet__name">{{ function('get_the_title', item.id) }}</p>
         </div>
 
         <div class="cabinet-card__element">
             <p class="cabinet-card__label">{{ fn('pll_e', 'Breed') }}:</p>
-            <p class="cabinet-card__text">{{ function('get_field', 'breed', pet_id) }}</p>
+            <p class="cabinet-card__text">{{ function('get_field', 'breed', item.id) }}</p>
         </div>
         
         <div class="cabinet-card__element">
             <p class="cabinet-card__label">{{ fn('pll_e','Weight') }}:</p>
             <p class="cabinet-card__text">
-                {% set weight_key = function('get_field', 'weight', pet_id) %}
+                {% set weight_key = function('get_field', 'weight', item.id) %}
                 {% if weight_key == 'below_1_5' %}{{ fn('pll_e', 'from 0,5 kg to 1,5 kg') }}
                 {% elseif weight_key == '1_5-3' %}{{ fn('pll_e', 'from 1.5 to 3 kg') }}
                 {% elseif weight_key == '3-5' %}{{ fn('pll_e', 'from 3 to 5 kg') }}
@@ -32,11 +32,11 @@
             </p>
         </div>
         
-        {% if function('get_field', 'old', pet_id) %}
+        {% if function('get_field', 'old', item.id) %}
             <div class="cabinet-card__element">
                 <p class="cabinet-card__label">{{ fn('pll_e', 'Age') }}:</p>
                 <p class="cabinet-card__text">
-                    {% set age_key = function('get_field', 'old', pet_id) %}
+                    {% set age_key = function('get_field', 'old', item.id) %}
                     {% if age_key == 'normal' %}{{ fn('pll_e', 'Adult (from 1 year to 7 years)') }}
                     {% elseif age_key == 'old' %}{{ fn('pll_e', 'Elderly (from 7 to 12 years)') }}
                     {% elseif age_key == 'very_old' %}{{ fn('pll_e', 'Aging (12 years and older)') }}
@@ -45,12 +45,12 @@
                 </p>
             </div>
         {% else %}
-            {% set month = function('get_field', 'month', pet_id) %}
+            {% set month = function('get_field', 'month', item.id) %}
             {% set zero = month < 10 ? '0' : '' %}
             <div class="cabinet-card__element">
                 <p class="cabinet-card__label">{{ fn('pll_e', 'Birthday') }}:</p>
                 <p class="cabinet-card__text">
-                    {{ function('get_field', 'day', pet_id) }}.{{ zero }}{{ month }}.{{ function('get_field', 'year', pet_id) }}
+                    {{ function('get_field', 'day', item.id) }}.{{ zero }}{{ month }}.{{ function('get_field', 'year', item.id) }}
                 </p>
             </div>
         {% endif %}
@@ -58,7 +58,7 @@
         <div class="cabinet-card__element">
             <p class="cabinet-card__label">{{ fn('pll_e', 'Activity') }}:</p>
             <p class="cabinet-card__text">
-                {% set activity_key = function('get_field', 'activity', pet_id) %}
+                {% set activity_key = function('get_field', 'activity', item.id) %}
                 {% if activity_key == 'low' %}{{ fn('pll_e', 'Low') }}
                 {% elseif activity_key == 'moderate' %}{{ fn('pll_e', 'Moderate') }}
                 {% elseif activity_key == 'high' %}{{ fn('pll_e', 'High') }}
@@ -66,14 +66,14 @@
             </p>
         </div>
         
-        {% if function('get_field', 'type', pet_id) == 'cat' and function('get_field', 'sterilized', pet_id) %}
+        {% if function('get_field', 'type', item.id) == 'cat' and function('get_field', 'sterilized', item.id) %}
             <div class="cabinet-card__element">
                 <p class="cabinet-card__label">{{ fn('pll_e', 'Sterilized') }}</p>
             </div>
         {% endif %}
         
         <div class="cabinet-card__element">
-            <button class="cabinet-card__button" data-edit="{{ pet_id }}">
+            <button class="cabinet-card__button" data-edit="{{ item.id }}">
                 {{ fn('pll_e', 'Edit') }}
             </button>
         </div>
diff --git a/wp-content/themes/cosmopet/templates/profile/pet-edit-card.twig b/wp-content/themes/cosmopet/templates/profile/pet-edit-card.twig
new file mode 100644
index 0000000..81b9ad5
--- /dev/null
+++ b/wp-content/themes/cosmopet/templates/profile/pet-edit-card.twig
@@ -0,0 +1,223 @@
+<div class="modalProfile" id="pet_edit_{{ item.ID }}">
+    <div class="popup-wrap">
+        <div class="modal-form form__full-mobile modal-form--white modal-form--height-100-phone form-pet active">
+            <button class="modal-form__close"></button>
+            <p class="modal-form__title">{{ fn('pll_e', 'Редактировать питомца') }} {{ item.title }}</p>
+
+            <form class="modal-form__content edit-pet-form" method="post" action="">
+                <input type="hidden" name="nonce" value="{{ fn('wp_create_nonce', 'edit_pet_nonce') }}">
+                <input type="hidden" name="action" value="edit_pet">
+                <input type="hidden" name="pet_id" value="{{ item.ID }}">
+
+                <div class="modal-form-content__line">
+                    <label class="label-name">{{ fn('pll_e', 'Вид животного') }}</label>
+                    <div class="form-input__tabs">
+                        <label class="form-input-tabs__button {% if item.meta('type') == 'cat' %}active{% endif %}">
+                            {{ fn('pll_e', 'Кошка') }}
+                            <input type="radio" value="cat" name="pet" class="form-input-tabs__input" {% if item.meta('type') == 'cat' %}checked{% endif %}>
+                        </label>
+                        <label class="form-input-tabs__button {% if item.meta('type') == 'dog' %}active{% endif %}">
+                            {{ fn('pll_e', 'Собака') }}
+                            <input type="radio" value="dog" name="pet" class="form-input-tabs__input" {% if item.meta('type') == 'dog' %}checked{% endif %}>
+                        </label>
+                    </div>
+                </div>
+
+                <div class="modal-form-content__line sterilized" {% if item.meta('type') == 'dog' %}style="display: none;"{% endif %}>
+                    <label class="label-name">{{ fn('pll_e', 'Стерелизован') }}</label>
+                    <div class="form-input__tabs">
+                        <label class="form-input-tabs__button {% if item.meta('sterilized') %}active{% endif %}">
+                            {{ fn('pll_e', 'Да') }}
+                            <input type="radio" value="1" name="sterilized" class="form-input-tabs__input" {% if item.meta('sterilized') %}checked{% endif %}>
+                        </label>
+                        <label class="form-input-tabs__button {% if not item.meta('sterilized') %}active{% endif %}">
+                            {{ fn('pll_e', 'Нет') }}
+                            <input type="radio" value="0" name="sterilized" class="form-input-tabs__input" {% if not item.meta('sterilized') %}checked{% endif %}>
+                        </label>
+                    </div>
+                </div>
+
+                <div class="modal-form-content__line">
+                    <div class="modal-form-content-line__element">
+                        <label class="label-name">{{ fn('pll_e', 'Порода') }}</label>
+                        <input class="form__input" type="text" name="breed" value="{{ item.meta('breed')|e }}" placeholder="{{ fn('pll_e', 'Порода вашего питомца') }}" required>
+                    </div>
+                </div>
+
+                <div class="modal-form-content__line">
+                    <label class="label-name">{{ fn('pll_e', 'Пол вашего питомца') }}</label>
+                    <div class="form-input__tabs">
+                        <label class="form-input-tabs__button {% if item.meta('sex') == 'male' %}active{% endif %}">
+                            {{ fn('pll_e', 'Мальчик') }}
+                            <input type="radio" value="male" name="sex" class="form-input-tabs__input" {% if item.meta('sex') == 'male' %}checked{% endif %}>
+                        </label>
+                        <label class="form-input-tabs__button {% if item.meta('sex') == 'female' %}active{% endif %}">
+                            {{ fn('pll_e', 'Девочка') }}
+                            <input type="radio" value="female" name="sex" class="form-input-tabs__input" {% if item.meta('sex') == 'female' %}checked{% endif %}>
+                        </label>
+                    </div>
+                </div>
+
+                <div class="modal-form-content__line modal-form-content__line--two">
+                    <div class="modal-form-content-line__element">
+                        <label class="label-name">{{ fn('pll_e', 'Вид активности') }}</label>
+                        <div class="form-input__list">
+                            <div class="form-input-list__input">
+                                {% if item.meta('activity') == 'low' %}
+                                    {{ fn('pll_e', 'Низкая') }}
+                                {% elseif item.meta('activity') == 'moderate' %}
+                                    {{ fn('pll_e', 'Средняя') }}
+                                {% elseif item.meta('activity') == 'high' %}
+                                    {{ fn('pll_e', 'Высокая') }}
+                                {% else %}
+                                    {{ fn('pll_e', 'Выберите из списка') }}
+                                {% endif %}
+                            </div>
+                            <div class="form-input-list__block-content" style="height: 0px;">
+                                <div class="form-input-list__content">
+                                    {% set activities = {
+                                        'low': 'Низкая',
+                                        'moderate': 'Средняя',
+                                        'high': 'Высокая'
+                                    } %}
+                                    {% for value, label in activities %}
+                                        <label class="form-input-list__item {% if item.meta('activity') == value %}active{% endif %}">
+                                            <p class="form-input-list-item__text">{{ fn('pll_e', label) }}</p>
+                                            <input type="radio" required name="activity" value="{{ value }}" class="v-hidden" {% if item.meta('activity') == value %}checked{% endif %}>
+                                            <div class="form-input-list-item__box">
+                                                <div class="form-input-list-item-box__content">
+                                                    <img src="{{ theme.link }}/static/img/svg/main/arrow-selected-white.svg" alt="">
+                                                </div>
+                                            </div>
+                                        </label>
+                                    {% endfor %}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="modal-form-content-line__element">
+                        <label class="label-name">{{ fn('pll_e', 'Вес') }}</label>
+                        <div class="form-input__list">
+                            <div class="form-input-list__input">
+                                {% set weight_options = {
+                                    'below_1_5': '1-1.5 кг',
+                                    '1_5-3': '1.5-3 кг',
+                                    '3-5': '3-5 кг',
+                                    '5-8': '5-8 кг',
+                                    '8-11': '8-11 кг',
+                                    '11-15': '11-15 кг',
+                                    '15-20': '10-20кг',
+                                    '20-25': '20-25кг',
+                                    '25-35': '25-35 кг',
+                                    'more_35': 'Более 35 кг'
+                                } %}
+                                {{ fn('pll_e', weight_options[item.meta('weight')] ?? 'Выберите из списка') }}
+                            </div>
+                            <div class="form-input-list__block-content" style="height: 0px;">
+                                <div class="form-input-list__content">
+                                    {% for value, label in weight_options %}
+                                        <label class="form-input-list__item {% if item.meta('weight') == value %}active{% endif %}">
+                                            <p class="form-input-list-item__text">{{ fn('pll_e', label) }}</p>
+                                            <input type="radio" required name="weight" value="{{ value }}" class="v-hidden" {% if item.meta('weight') == value %}checked{% endif %}>
+                                            <div class="form-input-list-item__box">
+                                                <div class="form-input-list-item-box__content">
+                                                    <img src="{{ theme.link }}/static/img/svg/main/arrow-selected-white.svg" alt="">
+                                                </div>
+                                            </div>
+                                        </label>
+                                    {% endfor %}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="rm">
+                    <div class="modal-form-content__line">
+                        <label class="label-name">{{ fn('pll_e', 'Возраст питомца') }}</label>
+                        <div class="form-input__tabs form-input__remote-control" data-content="modal__age">
+                            <label class="form-input-tabs__button active" data-rm="0">
+                                {{ fn('pll_e', 'Примерный') }}
+                                <input type="radio" value="ex" name="old_type" class="form-input-tabs__input" checked>
+                            </label>
+                            <label class="form-input-tabs__button" data-rm="1">
+                                {{ fn('pll_e', 'Точный') }}
+                                <input type="radio" value="acc" name="old_type" class="form-input-tabs__input">
+                            </label>
+                        </div>
+                    </div>
+
+                    <div class="modal__age">
+                        <div class="form-input__radio remote-control__item active" data-rmcont="0">
+                            {% set age_options = {
+                                'baby': ['Малыш', '(от 0 до 1 года)'],
+                                'normal': ['Взрослый', '(от 1 года до 7 лет)'],
+                                'old': ['Пожилой', '(от 7 до 12 лет)'],
+                                'very_old': ['Стареющий', '(от 12 лет и старше)']
+                            } %}
+                            {% for value, label in age_options %}
+                                <label class="form-input-radio__item {% if item.meta('old') == value %}active{% endif %}">
+                                    <input type="radio" name="old" value="{{ value }}" class="v-hidden" {% if item.meta('old') == value %}checked{% endif %}>
+                                    <div class="form-input-radio__circle"><div class="form-input-radio-circle__content"></div></div>
+                                    <p class="form-input-radio__title">{{ fn('pll_e', label[0]) }} <span>{{ fn('pll_e', label[1]) }}</span></p>
+                                </label>
+                            {% endfor %}
+                        </div>
+
+                        <div class="modal-form-content__line remote-control__item modal-form-content__line--three modal-form-content__line--margin-top-16" data-rmcont="1">
+                            <div class="modal-form-content-line__element">
+                                <label class="label-name">{{ fn('pll_e', 'День') }}</label>
+                                <input class="form__input form__input--center" maxlength="2" type="text" name="day" value="{{ item.meta('day') }}" placeholder="{{ fn('pll_e', 'ДД') }}">
+                            </div>
+                            <div class="modal-form-content-line__element">
+                                <label class="label-name">{{ fn('pll_e', 'Месяц') }}</label>
+                               {% set selected_month = item.meta('month')|default('') %}
+{% set month_names = [
+    '', 'Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь',
+    'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'
+] %}
+
+<div class="form-input__list">
+    <div class="form-input-list__input">
+        {% if selected_month and month_names[selected_month] is defined %}
+            {{ fn('pll_e', month_names[selected_month]) }}
+        {% else %}
+            {{ fn('pll_e', 'Месяц') }}
+        {% endif %}
+    </div>
+    <div class="form-input-list__block-content">
+        <div class="form-input-list__content">
+            {% for i in 1..12 %}
+                <label class="form-input-list__item">
+                    <p class="form-input-list-item__text">{{ fn('pll_e', month_names[i]) }}</p>
+                    <input type="radio" name="month" value="{{ i }}" class="v-hidden" {% if selected_month == i %}checked{% endif %}>
+                    <div class="form-input-list-item__box">
+                        <div class="form-input-list-item-box__content">
+                            <img src="{{ theme.link }}/static/img/svg/main/arrow-selected-white.svg" alt="">
+                        </div>
+                    </div>
+                </label>
+            {% endfor %}
+        </div>
+    </div>
+</div>
+
+                            </div>
+                            <div class="modal-form-content-line__element">
+                                <label class="label-name">{{ fn('pll_e', 'Год') }}</label>
+                                <input class="form__input form__input--center" maxlength="4" type="text" name="year" value="{{ item.meta('year') }}" placeholder="{{ fn('pll_e', 'ГГГГ') }}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="modal-form__buttons">
+                    <button class="button button--gradient button--high button--100-perc" type="submit">
+                        {{ fn('pll_e', 'Сохранить') }}
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/wp-content/themes/cosmopet/templates/profile/profile-base.twig b/wp-content/themes/cosmopet/templates/profile/profile-base.twig
index 47d7ae6..c6e0162 100644
--- a/wp-content/themes/cosmopet/templates/profile/profile-base.twig
+++ b/wp-content/themes/cosmopet/templates/profile/profile-base.twig
@@ -127,7 +127,7 @@
 
         {% if pets %}
             {% for pet in pets %}
-                {% include 'pet-card.twig' with { 'item': pet } %}
+                {% include 'profile/pet-card.twig' with { 'item': pet } %}
             {% endfor %}
         {% endif %}
 
@@ -612,4 +612,10 @@
     </div>
 </div>
 
+{% if pets %}
+    {% for pet in pets %}
+        {% include 'profile/pet-edit-card.twig' with { 'item': pet } %}
+    {% endfor %}
+{% endif %}
+
 {% endblock %}
\ No newline at end of file