diff --git a/shopping_app/routes_secondary.py b/shopping_app/routes_secondary.py
index 0b52be2..5149f2d 100644
--- a/shopping_app/routes_secondary.py
+++ b/shopping_app/routes_secondary.py
@@ -441,9 +441,9 @@ def shared_list(token=None, list_id=None):
     ]
 
     for item in items:
-        if item.added_by != shopping_list.owner_id:
+        if item.added_by and item.added_by != shopping_list.owner_id:
             item.added_by_display = (
-                item.added_by_user.username if item.added_by_user else "?"
+                item.added_by_user.username if item.added_by_user else None
             )
         else:
             item.added_by_display = None
diff --git a/shopping_app/static/css/style.css b/shopping_app/static/css/style.css
index 01ec2fc..6b6f747 100644
--- a/shopping_app/static/css/style.css
+++ b/shopping_app/static/css/style.css
@@ -4135,6 +4135,16 @@ input[type="checkbox"].form-check-input,
   display: inline;
 }
 
+.shopping-item-text .item-added-by-meta {
+  color: currentColor;
+  opacity: .72;
+  font-size: .92em;
+}
+
+.shopping-item-text .item-added-by-meta b {
+  font-weight: 600;
+}
+
 .shopping-item-name,
 .shopping-item-text .info-line {
   overflow-wrap: break-word;
diff --git a/shopping_app/static/js/functions.js b/shopping_app/static/js/functions.js
index d3d9d5c..74b8148 100644
--- a/shopping_app/static/js/functions.js
+++ b/shopping_app/static/js/functions.js
@@ -350,9 +350,12 @@ function renderItem(item, isShare = window.IS_SHARE, optionsOrShowEditOnly = fal
   if (item.not_purchased_reason) {
     infoParts.push(`<span class="text-dark">[ <b>Powód: ${escapeHtml(item.not_purchased_reason)}</b> ]</span>`);
   }
-  const addedByDisplay = item.added_by_display;
-  if (addedByDisplay) {
-    infoParts.push(`<span class="text-info">[ Dodał/a: <b>${escapeHtml(addedByDisplay)}</b> ]</span>`);
+  const addedByDisplay = item.added_by_display || (isShare ? item.added_by : '');
+  const addedById = item.added_by_id != null ? Number(item.added_by_id) : null;
+  const ownerId = item.owner_id != null ? Number(item.owner_id) : null;
+  const shouldShowAddedBy = !!addedByDisplay && (addedById === null || ownerId === null || addedById !== ownerId);
+  if (shouldShowAddedBy) {
+    infoParts.push(`<span class="item-added-by-meta">· dodał/a: <b>${escapeHtml(addedByDisplay)}</b></span>`);
   }
   const infoHtml = infoParts.length
     ? `<span class="info-line small" id="info-${item.id}">${infoParts.join(' ')}</span>`
@@ -375,7 +378,7 @@ function renderItem(item, isShare = window.IS_SHARE, optionsOrShowEditOnly = fal
 
   if (item.not_purchased) {
     actionButtons += `
-      <button type="button" class="${wideBtn}" ${isArchived ? 'disabled' : `onclick="unmarkNotPurchased(${item.id})"`}>✅ Przywróć</button>`;
+      <button type="button" class="${wideBtn}" ${isArchived ? 'disabled' : `onclick="unmarkNotPurchased(${item.id})"`}>Przywróć</button>`;
   } else if (!isShare || canShowShareActions || isOwner) {
     actionButtons += `
       <button type="button" class="${iconBtn}" ${canMarkNotPurchased ? `onclick="markNotPurchasedModal(event, ${item.id})"` : 'disabled'}>⚠️</button>`;
diff --git a/shopping_app/templates/base.html b/shopping_app/templates/base.html
index 4bca44b..f721010 100644
--- a/shopping_app/templates/base.html
+++ b/shopping_app/templates/base.html
@@ -132,9 +132,8 @@
         <p class="mb-1">
           <a href="https://git.linuxiarz.pl/gru/lista_zakupowa_live" target="_blank" class="link-success text-decoration-none">
             source code
-          </a>
+          </a> · v{{ APP_VERSION }}
         </p>
-        <div class="small">v{{ APP_VERSION }}</div>
       </div>
     </div>
   </footer>
diff --git a/shopping_app/templates/list.html b/shopping_app/templates/list.html
index bd8fed9..4bb1259 100644
--- a/shopping_app/templates/list.html
+++ b/shopping_app/templates/list.html
@@ -121,7 +121,7 @@
             {% set info_parts = [] %}
             {% if item.note %}{% set _ = info_parts.append('<span class="text-danger">[ <b>' ~ item.note ~ '</b> ]</span>') %}{% endif %}
             {% if item.not_purchased_reason %}{% set _ = info_parts.append('<span class="text-dark">[ <b>Powód: ' ~ item.not_purchased_reason ~ '</b> ]</span>') %}{% endif %}
-            {% if item.added_by_display %}{% set _ = info_parts.append('<span class="text-info">[ Dodał/a: <b>' ~ item.added_by_display ~ '</b> ]</span>') %}{% endif %}
+            {% if item.added_by_display %}{% set _ = info_parts.append('<span class="item-added-by-meta">· dodał/a: <b>' ~ item.added_by_display ~ '</b></span>') %}{% endif %}
             {% if info_parts %}
             <span class="info-line small" id="info-{{ item.id }}">{{ info_parts | join(' ') | safe }}</span>
             {% endif %}
@@ -136,7 +136,7 @@
 
       {% if item.not_purchased %}
       <button type="button" class="btn btn-outline-light btn-sm shopping-action-btn shopping-action-btn--wide" {% if list.is_archived %}disabled{% else
-        %}onclick="unmarkNotPurchased({{ item.id }})" {% endif %}>✅ Przywróć</button>
+        %}onclick="unmarkNotPurchased({{ item.id }})" {% endif %}>Przywróć</button>
       {% elif not item.not_purchased %}
       <button type="button" class="btn btn-outline-light btn-sm shopping-action-btn" {% if list.is_archived %}disabled{% else
         %}onclick="markNotPurchasedModal(event, {{ item.id }})" {% endif %}>⚠️</button>
diff --git a/shopping_app/templates/list_share.html b/shopping_app/templates/list_share.html
index ae8d033..1d7f650 100644
--- a/shopping_app/templates/list_share.html
+++ b/shopping_app/templates/list_share.html
@@ -59,7 +59,7 @@
             {% set info_parts = [] %}
             {% if item.note %}{% set _ = info_parts.append('<span class="text-danger">[ <b>' ~ item.note ~ '</b> ]</span>') %}{% endif %}
             {% if item.not_purchased_reason %}{% set _ = info_parts.append('<span class="text-dark">[ <b>Powód: ' ~ item.not_purchased_reason ~ '</b> ]</span>') %}{% endif %}
-            {% if item.added_by_display %}{% set _ = info_parts.append('<span class="text-info">[ Dodał/a: <b>' ~ item.added_by_display ~ '</b> ]</span>') %}{% endif %}
+            {% if item.added_by_display %}{% set _ = info_parts.append('<span class="item-added-by-meta">· dodał/a: <b>' ~ item.added_by_display ~ '</b></span>') %}{% endif %}
             {% if info_parts %}
             <span class="info-line small" id="info-{{ item.id }}">{{ info_parts | join(' ') | safe }}</span>
             {% endif %}
@@ -68,7 +68,7 @@
       {% if item.not_purchased %}
       <button type="button" class="btn btn-outline-light btn-sm shopping-action-btn shopping-action-btn--wide" {% if list.is_archived %}disabled{% else %}
         onclick="unmarkNotPurchased({{ item.id }})" {% endif %}>
-        ✅ Przywróć
+        Przywróć
       </button>
       {% else %}
       <button type="button" class="btn btn-outline-light btn-sm shopping-action-btn" {% if list.is_archived %}disabled{% else %}