diff --git a/blueprints/public/routes_company_edit.py b/blueprints/public/routes_company_edit.py
index 15a4bf6..aa8f45a 100644
--- a/blueprints/public/routes_company_edit.py
+++ b/blueprints/public/routes_company_edit.py
@@ -237,7 +237,8 @@ def _save_description(db, company):
     else:
         company.category_id = None
 
-    # Logo upload
+    # Logo upload — save as static/img/companies/{slug}.{ext}
+    # company_detail.html expects logo at this path with webp→svg fallback
     logo_file = request.files.get('logo_file')
     if logo_file and logo_file.filename:
         import os
@@ -246,12 +247,15 @@ def _save_description(db, company):
         allowed = {'png', 'jpg', 'jpeg', 'svg', 'webp'}
         ext = logo_file.filename.rsplit('.', 1)[-1].lower() if '.' in logo_file.filename else ''
         if ext in allowed:
-            filename = secure_filename(f"company_{company.id}_logo.{ext}")
-            upload_dir = os.path.join('static', 'uploads', 'logos')
-            os.makedirs(upload_dir, exist_ok=True)
-            filepath = os.path.join(upload_dir, filename)
+            logo_dir = os.path.join('static', 'img', 'companies')
+            os.makedirs(logo_dir, exist_ok=True)
+            # Remove old logo files for this company (different extensions)
+            for old_ext in allowed:
+                old_path = os.path.join(logo_dir, f"{company.slug}.{old_ext}")
+                if os.path.exists(old_path):
+                    os.remove(old_path)
+            filepath = os.path.join(logo_dir, f"{company.slug}.{ext}")
             logo_file.save(filepath)
-            company.logo_dark_bg = os.path.join('uploads', 'logos', filename)
             logger.info(f"Logo uploaded for company {company.id}: {filepath}")
 
 
diff --git a/templates/company_edit.html b/templates/company_edit.html
index 8c534bf..558c5d3 100644
--- a/templates/company_edit.html
+++ b/templates/company_edit.html
@@ -841,15 +841,11 @@
                     <div class="form-group">
                         <label class="form-label">Logo firmy</label>
                         <div style="display: flex; align-items: center; gap: 16px; margin-bottom: 8px;">
-                            {% if company.logo_dark_bg %}
-                            <div style="width: 80px; height: 80px; border-radius: 8px; border: 1px solid var(--border, #e0e4eb); overflow: hidden; display: flex; align-items: center; justify-content: center; background: #fff;">
-                                <img src="{{ url_for('static', filename=company.logo_dark_bg) }}" alt="Logo" style="max-width: 100%; max-height: 100%; object-fit: contain;">
+                            <div id="logoPreview" style="width: 80px; height: 80px; border-radius: 8px; border: 1px solid var(--border, #e0e4eb); overflow: hidden; display: flex; align-items: center; justify-content: center; background: #fff;">
+                                <img src="{{ url_for('static', filename='img/companies/' ~ company.slug ~ '.webp') }}" alt="Logo"
+                                     style="max-width: 100%; max-height: 100%; object-fit: contain;"
+                                     onerror="if(!this.dataset.triedSvg){this.dataset.triedSvg='1';this.src=this.src.replace('.webp','.svg')}else{this.parentElement.innerHTML='<span style=\'color:var(--text-secondary,#999);font-size:12px\'>Brak logo</span>'}">
                             </div>
-                            {% else %}
-                            <div style="width: 80px; height: 80px; border-radius: 8px; border: 2px dashed var(--border, #e0e4eb); display: flex; align-items: center; justify-content: center; color: var(--text-secondary, #999); font-size: 12px; text-align: center;">
-                                Brak logo
-                            </div>
-                            {% endif %}
                             <div style="flex: 1;">
                                 <input type="file" id="logo_file" name="logo_file" accept="image/png,image/jpeg,image/svg+xml,image/webp" class="form-input" style="padding: 8px;">
                                 <p class="form-help" style="margin-top: 4px;">PNG, JPG, SVG lub WebP. Zalecany rozmiar: min. 200x200px.</p>