diff --git a/myproject/products/templates/products/product_import_status.html b/myproject/products/templates/products/product_import_status.html
index c4e71fb..1a8ef57 100644
--- a/myproject/products/templates/products/product_import_status.html
+++ b/myproject/products/templates/products/product_import_status.html
@@ -91,7 +91,7 @@
                         <a href="{% url 'products:product-import' %}" class="btn btn-secondary">
                             <i class="bi bi-arrow-left"></i> Назад к импорту
                         </a>
-                        <a href="{% url 'products:all-products' %}" class="btn btn-primary" id="view-products-btn" style="display: none;">
+                        <a href="{% url 'products:products-list' %}" class="btn btn-primary" id="view-products-btn" style="display: none;">
                             <i class="bi bi-list"></i> Посмотреть товары
                         </a>
                     </div>
diff --git a/myproject/products/views/productkit_views.py b/myproject/products/views/productkit_views.py
index 11e425a..2dff15c 100644
--- a/myproject/products/views/productkit_views.py
+++ b/myproject/products/views/productkit_views.py
@@ -78,7 +78,7 @@ class ProductKitListView(LoginRequiredMixin, ManagerOwnerRequiredMixin, ListView
             })
 
         action_buttons.append({
-            'url': reverse_lazy('products:product-list'),
+            'url': reverse_lazy('products:products-list'),
             'text': 'К товарам',
             'class': 'btn-outline-primary',
             'icon': 'box'
@@ -489,7 +489,7 @@ class ProductKitDeleteView(LoginRequiredMixin, ManagerOwnerRequiredMixin, Delete
 
     def get_success_url(self):
         messages.success(self.request, f'Комплект "{self.object.name}" успешно удален!')
-        return reverse_lazy('products:productkit-list')
+        return reverse_lazy('products:products-list')
 
 
 class ProductKitMakePermanentView(LoginRequiredMixin, ManagerOwnerRequiredMixin, UpdateView):
diff --git a/myproject/templates/components/category_filter_buttons.html b/myproject/templates/components/category_filter_buttons.html
index 40bf92a..01f73f9 100644
--- a/myproject/templates/components/category_filter_buttons.html
+++ b/myproject/templates/components/category_filter_buttons.html
@@ -17,8 +17,8 @@
         {% if show_type_filters|default:True %}
         <div class="mb-3">
             <div class="btn-group btn-group-sm" role="group" aria-label="Фильтр по типу">
-                <a href="{% url 'products:all-products' %}"
-                   class="btn {% if request.resolver_match.url_name == 'all-products' %}btn-primary{% else %}btn-outline-primary{% endif %}">
+                <a href="{% url 'products:products-list' %}"
+                   class="btn {% if request.resolver_match.url_name == 'products-list' and not request.GET.type %}btn-primary{% else %}btn-outline-primary{% endif %}">
                     <i class="bi bi-grid"></i> Все товары
                 </a>
                 <a href="{% url 'products:products-list' %}?type=products"
diff --git a/myproject/templates/navbar.html b/myproject/templates/navbar.html
index f9573a6..a97c222 100644
--- a/myproject/templates/navbar.html
+++ b/myproject/templates/navbar.html
@@ -25,7 +25,7 @@
                                 📦 Товары
                             </a>
                             <ul class="dropdown-menu" aria-labelledby="productsDropdown">
-                                <li><a class="dropdown-item" href="{% url 'products:all-products' %}">Все товары</a></li>
+                                <li><a class="dropdown-item" href="{% url 'products:products-list' %}">Все товары</a></li>
                                 <li><a class="dropdown-item" href="{% url 'products:catalog' %}"><i class="bi bi-grid-3x3-gap"></i> Каталог</a></li>
                                 <li><a class="dropdown-item" href="{% url 'products:configurableproduct-list' %}">Вариативные товары</a></li>
                                 <li><hr class="dropdown-divider"></li>