diff --git a/__pycache__/app.cpython-314.pyc b/__pycache__/app.cpython-314.pyc
index a7d8794..27d5bbe 100644
Binary files a/__pycache__/app.cpython-314.pyc and b/__pycache__/app.cpython-314.pyc differ
diff --git a/templates/cabinets.html b/templates/cabinets.html
index c37cdee..e02c970 100644
--- a/templates/cabinets.html
+++ b/templates/cabinets.html
@@ -12,6 +12,12 @@
   .row-actions {
     background: #f8f9fa;
   }
+  .cabinet-floor-sep td {
+    background: #d0d0d0 !important;
+    font-weight: 700;
+    padding-top: 3px !important;
+    padding-bottom: 3px !important;
+  }
   .row-actions__inner {
     max-height: 0;
     opacity: 0;
@@ -215,22 +221,26 @@
   <table class="table table-striped">
     <tr>
       <th>Кабинет</th>
-      <th>Этаж</th>
-      <th>Здание</th>
     </tr>
+    {% set ns = namespace(current_floor='__INIT__') %}
     {% for row in rows %}
+    {% set floor_label = row.floor or 'Без этажа' %}
+    {% if ns.current_floor != floor_label %}
+    <tr class="cabinet-floor-sep">
+      <td>Этаж: {{ floor_label }}</td>
+    </tr>
+    {% set ns.current_floor = floor_label %}
+    {% endif %}
     <tr class="js-cabinet-row"
         data-id="{{ row.id }}"
         data-building="{{ row.building }}"
         data-floor="{{ row.floor }}"
         data-cabinet="{{ row.cabinet }}">
       <td>{{ row.cabinet }}</td>
-      <td>{{ row.floor or '—' }}</td>
-      <td>{{ row.building or '—' }}</td>
     </tr>
     {% else %}
     <tr>
-      <td colspan="3" class="text-muted">Кабинеты не добавлены.</td>
+      <td class="text-muted">Кабинеты не добавлены.</td>
     </tr>
     {% endfor %}
   </table>
@@ -644,7 +654,7 @@
       const rowId = row.getAttribute('data-id') || '';
       const actionRow = document.createElement('tr');
       actionRow.className = 'row-actions';
-      actionRow.innerHTML = `<td colspan="3">
+      actionRow.innerHTML = `<td colspan="1">
         <div class="row-actions__inner">
           <button type="button" class="btn btn-sm btn-outline-primary js-open-cabinet-modal">Редактировать</button>
           <form method="post" action="/cabinets/delete" class="d-inline ms-2" onsubmit="return confirm('Удалить кабинет?')">
diff --git a/templates/computers.html b/templates/computers.html
index 21bf201..cc112d3 100644
--- a/templates/computers.html
+++ b/templates/computers.html
@@ -98,6 +98,17 @@
     gap: 0.5rem;
     margin-top: 1rem;
   }
+  .specs-modal__name {
+    margin-bottom: 0.7rem;
+    font-weight: 600;
+  }
+  .specs-modal__list {
+    margin: 0;
+    padding-left: 1rem;
+  }
+  .specs-modal__list li {
+    margin-bottom: 0.2rem;
+  }
   .computer-add-card {
     position: relative;
   }
@@ -110,6 +121,7 @@
 <div class="computers-page">
 <div class="d-flex align-items-center justify-content-between mb-2">
   <h3 class="mb-0">Компьютеры / Ноутбуки</h3>
+  <a class="btn btn-success" href="/report/computers.xlsx">Экспорт в Excel</a>
 </div>
 
 {% if session.get('role') not in ('admin','storekeeper') %}
@@ -242,6 +254,18 @@
 
 <h5 class="mt-4">Ноутбуки</h5>
 <table class="table table-striped align-middle">
+  <colgroup>
+    <col style="width:155px">
+    <col style="width:120px">
+    <col style="width:200px">
+    <col style="width:150px">
+    <col style="width:120px">
+    <col style="width:200px">
+    <col style="width:300px">
+    <col style="width:150px">
+    <col style="width:110px">
+    <col style="width:110px">
+  </colgroup>
   <tr class="computer-row js-computer-row"
       data-id="{{ id }}"
       data-inventory-number="{{ inv }}"
@@ -263,10 +287,8 @@
     <th>Бренд</th>
     <th>Модель</th>
     <th>Серийный №</th>
-    <th>Тип</th>
     <th>ID RustDesk</th>
     <th>Пароль RustDesk</th>
-    <th>Характеристики</th>
     <th>Кабинет</th>
     <th>Примечание</th>
     <th>Дата ввода</th>
@@ -358,40 +380,12 @@
       <td>{{ brand or '' }}</td>
       <td>{{ model or '' }}</td>
       <td>{{ sn or '' }}</td>
-      <td>Ноутбук</td>
       <td>{{ rustdesk_id or '' }}</td>
       <td>{{ rustdesk_password or '' }}</td>
-      <td class="small">
-        {% set has_specs = cpu_brand or cpu_model or gpu_model or mem_size or mem_type or storage_size or motherboard or os_name %}
-        {% set mem_text = mem_size %}
-        {% if mem_size %}
-          {% set mem_lower = (mem_size|string)|lower %}
-          {% if 'гб' not in mem_lower and 'gb' not in mem_lower %}
-            {% set mem_text = mem_size ~ ' ГБ' %}
-          {% endif %}
-        {% endif %}
-        {% set storage_text = storage_size %}
-        {% if storage_size %}
-          {% set storage_lower = (storage_size|string)|lower %}
-          {% if 'гб' not in storage_lower and 'gb' not in storage_lower %}
-            {% set storage_text = storage_size ~ ' ГБ' %}
-          {% endif %}
-        {% endif %}
-        {% if has_specs %}
-          {% if cpu_brand or cpu_model %}<div>CPU: {{ cpu_brand or '' }} {{ cpu_model or '' }}</div>{% endif %}
-          {% if gpu_model %}<div>GPU: {{ gpu_model }}</div>{% endif %}
-          {% if mem_text or mem_type %}<div>Память: {{ mem_text or '' }} {{ mem_type or '' }}</div>{% endif %}
-          {% if storage_text %}<div>Накопитель: {{ storage_text }}</div>{% endif %}
-          {% if motherboard %}<div>Материнская плата: {{ motherboard }}</div>{% endif %}
-          {% if os_name %}<div>ОС: {{ os_name }}</div>{% endif %}
-        {% else %}
-          <span class="text-muted">—</span>
-        {% endif %}
-      </td>
     <td>{{ cab_name or '' }}</td>
     <td>{{ note or '' }}</td>
     <td>{{ date_in_operation or '' }}</td>
-    <td>{{ date_added }}</td>
+    <td>{{ date_added.strftime('%Y-%m-%d') if date_added and date_added.strftime else (date_added|string)[:10] if date_added else '' }}</td>
     {% endif %}
   </tr>
   {% endfor %}
@@ -399,15 +393,25 @@
 
 <h5 class="mt-4">Персональные компьютеры</h5>
 <table class="table table-striped align-middle">
+  <colgroup>
+    <col style="width:155px">
+    <col style="width:120px">
+    <col style="width:200px">
+    <col style="width:150px">
+    <col style="width:120px">
+    <col style="width:200px">
+    <col style="width:300px">
+    <col style="width:150px">
+    <col style="width:110px">
+    <col style="width:110px">
+  </colgroup>
   <tr class="computer-row">
     <th>Инв. №</th>
     <th>Бренд</th>
     <th>Модель</th>
     <th>Серийный №</th>
-    <th>Тип</th>
     <th>ID RustDesk</th>
     <th>Пароль RustDesk</th>
-    <th>Характеристики</th>
     <th>Кабинет</th>
     <th>Примечание</th>
     <th>Дата ввода</th>
@@ -499,40 +503,12 @@
       <td>{{ brand or '' }}</td>
       <td>{{ model or '' }}</td>
       <td>{{ sn or '' }}</td>
-      <td>ПК</td>
       <td>{{ rustdesk_id or '' }}</td>
       <td>{{ rustdesk_password or '' }}</td>
-      <td class="small">
-        {% set has_specs = cpu_brand or cpu_model or gpu_model or mem_size or mem_type or storage_size or motherboard or os_name %}
-        {% set mem_text = mem_size %}
-        {% if mem_size %}
-          {% set mem_lower = (mem_size|string)|lower %}
-          {% if 'гб' not in mem_lower and 'gb' not in mem_lower %}
-            {% set mem_text = mem_size ~ ' ГБ' %}
-          {% endif %}
-        {% endif %}
-        {% set storage_text = storage_size %}
-        {% if storage_size %}
-          {% set storage_lower = (storage_size|string)|lower %}
-          {% if 'гб' not in storage_lower and 'gb' not in storage_lower %}
-            {% set storage_text = storage_size ~ ' ГБ' %}
-          {% endif %}
-        {% endif %}
-        {% if has_specs %}
-          {% if cpu_brand or cpu_model %}<div>CPU: {{ cpu_brand or '' }} {{ cpu_model or '' }}</div>{% endif %}
-          {% if gpu_model %}<div>GPU: {{ gpu_model }}</div>{% endif %}
-          {% if mem_text or mem_type %}<div>Память: {{ mem_text or '' }} {{ mem_type or '' }}</div>{% endif %}
-          {% if storage_text %}<div>Накопитель: {{ storage_text }}</div>{% endif %}
-          {% if motherboard %}<div>Материнская плата: {{ motherboard }}</div>{% endif %}
-          {% if os_name %}<div>ОС: {{ os_name }}</div>{% endif %}
-        {% else %}
-          <span class="text-muted">—</span>
-        {% endif %}
-      </td>
     <td>{{ cab_name or '' }}</td>
     <td>{{ note or '' }}</td>
     <td>{{ date_in_operation or '' }}</td>
-    <td>{{ date_added }}</td>
+    <td>{{ date_added.strftime('%Y-%m-%d') if date_added and date_added.strftime else (date_added|string)[:10] if date_added else '' }}</td>
     {% endif %}
   </tr>
   {% endfor %}
@@ -642,6 +618,16 @@
     </form>
   </div>
 </div>
+<div class="edit-modal" id="computerSpecsModal" aria-hidden="true">
+  <div class="edit-modal__dialog">
+    <div class="edit-modal__header">
+      <h4 class="edit-modal__title">Характеристики устройства</h4>
+      <button type="button" class="btn btn-sm btn-outline-secondary" data-specs-close>Закрыть</button>
+    </div>
+    <div id="computerSpecsName" class="specs-modal__name"></div>
+    <ul id="computerSpecsList" class="specs-modal__list"></ul>
+  </div>
+</div>
 {% endif %}
 
 <script>
@@ -728,7 +714,10 @@
     if (!rows.length) return;
     const modal = document.getElementById('computerEditModal');
     const form = document.getElementById('computerEditForm');
-    if (!modal || !form) return;
+    const specsModal = document.getElementById('computerSpecsModal');
+    const specsName = document.getElementById('computerSpecsName');
+    const specsList = document.getElementById('computerSpecsList');
+    if (!modal || !form || !specsModal || !specsName || !specsList) return;
     const modalFields = {
       id: document.getElementById('computerModalId'),
       inventory_number: document.getElementById('computerModalInv'),
@@ -762,12 +751,64 @@
       modal.classList.add('show');
       modal.setAttribute('aria-hidden', 'false');
     }
+    function closeSpecsModal() {
+      specsModal.classList.remove('show');
+      specsModal.setAttribute('aria-hidden', 'true');
+    }
+    function openSpecsModal() {
+      specsModal.classList.add('show');
+      specsModal.setAttribute('aria-hidden', 'false');
+    }
 
     modal.addEventListener('click', (e) => {
       if (e.target === modal || e.target.hasAttribute('data-modal-close')) {
         closeModal();
       }
     });
+    specsModal.addEventListener('click', (e) => {
+      if (e.target === specsModal || e.target.hasAttribute('data-specs-close')) {
+        closeSpecsModal();
+      }
+    });
+
+    function appendSpecItem(label, value) {
+      const cleaned = (value || '').trim();
+      if (!cleaned) return;
+      const li = document.createElement('li');
+      li.textContent = `${label}: ${cleaned}`;
+      specsList.appendChild(li);
+    }
+    function normalizeSize(rawValue) {
+      const cleaned = (rawValue || '').trim();
+      if (!cleaned) return '';
+      const lower = cleaned.toLowerCase();
+      if (lower.includes('гб') || lower.includes('gb')) return cleaned;
+      return `${cleaned} ГБ`;
+    }
+    function openSpecsFromRow(row) {
+      const inv = (row.getAttribute('data-inventory-number') || '').trim();
+      const brand = (row.getAttribute('data-brand') || '').trim();
+      const modelName = (row.getAttribute('data-model') || '').trim();
+      const type = row.getAttribute('data-type') === 'laptop' ? 'Ноутбук' : 'Компьютер';
+      const title = [type, inv ? `№${inv}` : '', [brand, modelName].filter(Boolean).join(' ')].filter(Boolean).join(' ');
+      specsName.textContent = title || 'Устройство';
+      specsList.innerHTML = '';
+
+      const cpuBrand = row.getAttribute('data-cpu-brand') || '';
+      const cpuModel = row.getAttribute('data-cpu-model') || '';
+      appendSpecItem('CPU', `${cpuBrand} ${cpuModel}`.trim());
+      appendSpecItem('GPU', row.getAttribute('data-gpu-model') || '');
+      appendSpecItem('Память', `${normalizeSize(row.getAttribute('data-memory-size') || '')} ${(row.getAttribute('data-memory-type') || '').trim()}`.trim());
+      appendSpecItem('Накопитель', normalizeSize(row.getAttribute('data-storage-size') || ''));
+      appendSpecItem('Материнская плата', row.getAttribute('data-motherboard') || '');
+      appendSpecItem('ОС', row.getAttribute('data-os') || '');
+      if (!specsList.children.length) {
+        const li = document.createElement('li');
+        li.textContent = 'Характеристики не заполнены';
+        specsList.appendChild(li);
+      }
+      openSpecsModal();
+    }
 
     function fillModalFromRow(row) {
       const map = [
@@ -845,8 +886,9 @@
       const rowId = row.getAttribute('data-id') || '';
       const actionRow = document.createElement('tr');
       actionRow.className = 'row-actions';
-      actionRow.innerHTML = `<td colspan="12">
+      actionRow.innerHTML = `<td colspan="10">
         <div class="row-actions__inner">
+          <button type="button" class="btn btn-sm btn-outline-secondary js-open-computer-specs">Характеристики</button>
           <button type="button" class="btn btn-sm btn-outline-primary js-open-computer-modal">Редактировать</button>
           <form method="post" action="/computers/delete" class="d-inline ms-2">
             <input type="hidden" name="id" value="${rowId}">
@@ -855,7 +897,11 @@
         </div>
       </td>`;
       row.insertAdjacentElement('afterend', actionRow);
+      const specsBtn = actionRow.querySelector('.js-open-computer-specs');
       const btn = actionRow.querySelector('.js-open-computer-modal');
+      specsBtn.addEventListener('click', () => {
+        openSpecsFromRow(row);
+      });
       btn.addEventListener('click', () => {
         if (fillModalFromRow(row)) openModal();
       });
diff --git a/templates/home.html b/templates/home.html
index 9406c58..dfb6c83 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -566,6 +566,11 @@
     grid-template-columns: repeat(auto-fill, minmax(110px, 1fr));
     gap: 10px;
   }
+  .home-computers-manage-item {
+    display: grid;
+    gap: 4px;
+    align-content: start;
+  }
   .home-computers-manage-group + .home-computers-manage-group {
     margin-top: 14px;
     padding-top: 10px;
@@ -933,21 +938,32 @@
       <div class="home-computers-manage-group__floor">Этаж: {{ floor_group.floor }}</div>
       <div class="home-computers-manage-grid">
         {% for comp in floor_group.computers %}
-        <button
-          class="home-computers-manage-btn js-open-rustdesk"
-          type="button"
-          data-rustdesk-id="{{ comp.rustdesk_id }}"
-          data-rustdesk-password="{{ comp.rustdesk_password }}"
-          data-cabinet="{{ comp.cabinet_name }}"
-          data-inventory-number="{{ comp.inventory_number }}"
-          data-computer-name="{{ comp.computer_name }}"
-        >
-          <img
-            src="{{ url_for('static', filename='Desktop_computers.png' if comp.type == 'laptop' else 'Desktop_computers_remove.png') }}"
-            alt="{{ 'Ноутбук' if comp.type == 'laptop' else 'Персональный компьютер' }}"
+        <div class="home-computers-manage-item">
+          <button
+            class="home-computers-manage-btn js-open-rustdesk"
+            type="button"
+            data-rustdesk-id="{{ comp.rustdesk_id }}"
+            data-rustdesk-password="{{ comp.rustdesk_password }}"
+            data-cabinet="{{ comp.cabinet_name }}"
+            data-inventory-number="{{ comp.inventory_number }}"
+            data-computer-name="{{ comp.computer_name }}"
+            data-computer-id="{{ comp.id }}"
+            data-icon-label="{{ comp.icon_label }}"
           >
-          <span class="home-computers-manage-btn__label">{{ comp.cabinet_name }}</span>
-        </button>
+            <img
+              src="{{ url_for('static', filename='Desktop_computers.png' if comp.type == 'laptop' else 'Desktop_computers_remove.png') }}"
+              alt="{{ 'Ноутбук' if comp.type == 'laptop' else 'Персональный компьютер' }}"
+            >
+            <span class="home-computers-manage-btn__label">{{ comp.icon_label }}</span>
+          </button>
+          {% if session.get('role') in ('admin','storekeeper') %}
+          <form method="post" action="/computers/manage-icon-label" class="d-none js-manage-icon-rename-form" data-computer-id="{{ comp.id }}">
+            <input type="hidden" name="computer_id" value="{{ comp.id }}">
+            <input type="hidden" name="icon_label" value="{{ comp.icon_label }}">
+            <input type="hidden" name="next" value="{{ request.full_path if request.query_string else request.path }}">
+          </form>
+          {% endif %}
+        </div>
         {% endfor %}
       </div>
       {% endfor %}
@@ -1892,6 +1908,7 @@
     const rustdeskConnectingText = document.getElementById('rustdeskConnectingText');
     const rustdeskCancelBtn = document.getElementById('rustdeskCancelBtn');
     const rustdeskIconButtons = computersModal ? computersModal.querySelectorAll('.js-open-rustdesk') : [];
+    const manageIconRenameForms = computersModal ? computersModal.querySelectorAll('.js-manage-icon-rename-form') : [];
     const rustdeskConnectTemplate = {{ ('rustdesk://{id}?password={password}')|tojson }};
     const projectorsBtn = document.getElementById('homeProjectBtn');
     const projectorsModal = document.getElementById('homeProjectorsModal');
@@ -2770,9 +2787,66 @@
     if (rustdeskCancelBtn) {
       rustdeskCancelBtn.addEventListener('click', () => hideRustdeskConnecting());
     }
+    const renameFormsByComputerId = new Map();
+    if (manageIconRenameForms && manageIconRenameForms.length) {
+      manageIconRenameForms.forEach((formEl) => {
+        const compId = (formEl.getAttribute('data-computer-id') || '').trim();
+        if (compId) renameFormsByComputerId.set(compId, formEl);
+      });
+    }
+    function submitIconRename(btn) {
+      if (!btn) return;
+      const compId = (btn.getAttribute('data-computer-id') || '').trim();
+      if (!compId) return;
+      const formEl = renameFormsByComputerId.get(compId);
+      if (!formEl) return;
+      const labelField = formEl.querySelector('input[name="icon_label"]');
+      const currentLabel = labelField ? (labelField.value || '').trim() : (btn.getAttribute('data-icon-label') || '').trim();
+      const nextLabel = window.prompt(
+        'Введите новое имя иконки (пустое значение вернет имя по умолчанию):',
+        currentLabel,
+      );
+      if (nextLabel === null) return;
+      if (labelField) labelField.value = nextLabel.trim();
+      formEl.submit();
+    }
     if (rustdeskIconButtons && rustdeskIconButtons.length) {
       rustdeskIconButtons.forEach((btn) => {
-        btn.addEventListener('click', () => openRustdeskForButton(btn));
+        const canRename = renameFormsByComputerId.has((btn.getAttribute('data-computer-id') || '').trim());
+        let longPressTimer = null;
+        let longPressTriggered = false;
+        const LONG_PRESS_MS = 650;
+        const startLongPress = (event) => {
+          if (!canRename) return;
+          if (event.type === 'mousedown' && event.button !== 0) return;
+          longPressTriggered = false;
+          if (longPressTimer) window.clearTimeout(longPressTimer);
+          longPressTimer = window.setTimeout(() => {
+            longPressTimer = null;
+            longPressTriggered = true;
+            submitIconRename(btn);
+          }, LONG_PRESS_MS);
+        };
+        const cancelLongPress = () => {
+          if (!longPressTimer) return;
+          window.clearTimeout(longPressTimer);
+          longPressTimer = null;
+        };
+        btn.addEventListener('mousedown', startLongPress);
+        btn.addEventListener('touchstart', startLongPress, { passive: true });
+        btn.addEventListener('mouseup', cancelLongPress);
+        btn.addEventListener('mouseleave', cancelLongPress);
+        btn.addEventListener('touchend', cancelLongPress);
+        btn.addEventListener('touchcancel', cancelLongPress);
+        btn.addEventListener('click', (e) => {
+          if (longPressTriggered) {
+            e.preventDefault();
+            e.stopPropagation();
+            longPressTriggered = false;
+            return;
+          }
+          openRustdeskForButton(btn);
+        });
       });
     }
     if (projectorsBtn) {