diff --git a/docs/source/_static/favicon.png b/docs/source/_static/favicon.png
index c8498b9..bac2794 100644
Binary files a/docs/source/_static/favicon.png and b/docs/source/_static/favicon.png differ
diff --git a/docs/source/_static/jdav_logo.png b/docs/source/_static/jdav_logo.png
deleted file mode 100644
index 87e1400..0000000
Binary files a/docs/source/_static/jdav_logo.png and /dev/null differ
diff --git a/docs/source/conf.py b/docs/source/conf.py
index c4c7f60..f261b16 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -35,8 +35,8 @@ html_static_path = ['_static']
 # -- Sphinxawsome-theme options ------------------------------------------------
 # https://sphinxawesome.xyz/how-to/configure/
 
-html_logo = "_static/favicon2.png"
-html_favicon  = "_static/favicon2.png"
+html_logo = "_static/favicon.png"
+html_favicon  = "_static/favicon.png"
 
 html_sidebars = {
   "about": ["sidebar_main_nav_links.html"],
diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index 9a9a7b1..f8a8005 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -394,7 +394,7 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
             level = 4
         else:
             level = 5
-        return format_html(level*'<img height=20px src="{}"/>&nbsp;'.format("/static/admin/images/climber.png"))
+        return format_html(level*'<img height=20px src="{}"/>&nbsp;'.format("/static/admin/img/climber.png"))
     activity_score.admin_order_field = '_activity_score'
     activity_score.short_description = _('activity')
 
diff --git a/jdav_web/members/templates/members/crisis_intervention_list.tex b/jdav_web/members/templates/members/crisis_intervention_list.tex
index 917fa58..f6e9e68 100644
--- a/jdav_web/members/templates/members/crisis_intervention_list.tex
+++ b/jdav_web/members/templates/members/crisis_intervention_list.tex
@@ -43,7 +43,7 @@
 }
 \begin{document}
 % HEADER RIGHT
-\picpos{4.5cm}{11.5cm}{0cm}{/app/jdav_web/static/general/img/dav_logo_hd.png}
+\picpos{4.5cm}{11.5cm}{0cm}{/app/jdav_web/static/general/img/dav_logo_sektion.png}
 \begin{textblock*}{5cm}(11.5cm, 2.3cm)
     \begin{flushright}
         \small
diff --git a/jdav_web/members/templates/members/seminar_report.tex b/jdav_web/members/templates/members/seminar_report.tex
index 9098150..1183bce 100644
--- a/jdav_web/members/templates/members/seminar_report.tex
+++ b/jdav_web/members/templates/members/seminar_report.tex
@@ -49,7 +49,7 @@
 }
 \begin{document}
 % HEADER RIGHT
-\picpos{4.5cm}{11.5cm}{0cm}{/app/jdav_web/static/general/img/dav_logo_hd.png}
+\picpos{4.5cm}{11.5cm}{0cm}{/app/jdav_web/static/general/img/dav_logo_sektion.png}
 \begin{textblock*}{5cm}(11.5cm, 2.3cm)
     \begin{flushright}
         \small
diff --git a/jdav_web/startpage/templates/startpage/navigation.html b/jdav_web/startpage/templates/startpage/navigation.html
index 74dc605..04391ea 100644
--- a/jdav_web/startpage/templates/startpage/navigation.html
+++ b/jdav_web/startpage/templates/startpage/navigation.html
@@ -39,7 +39,7 @@ window.onclick = function(event) {
 
 <div class="navigation">
     <div id="myNavbar" class="navbar">
-        <a href="/"><img style="margin: 0; padding: 0;"src="{% static 'startpage/img/jdav_logo.png' %}"></a>
+        <a href="/"><img style="margin: 0; padding: 0;"src="{% static 'general/img/jdav_logo_sektion.png' %}"></a>
         <div>
         <button onclick="myFunction()"class="dropbtn">Menü</button>
         <a class="nav" href="/kompass">Login</a>
diff --git a/jdav_web/static/admin/images/favicon.png b/jdav_web/static/admin/images/favicon.png
deleted file mode 100644
index c8498b9..0000000
Binary files a/jdav_web/static/admin/images/favicon.png and /dev/null differ
diff --git a/jdav_web/static/admin/images/favicon2.png b/jdav_web/static/admin/images/favicon2.png
deleted file mode 100644
index bac2794..0000000
Binary files a/jdav_web/static/admin/images/favicon2.png and /dev/null differ
diff --git a/jdav_web/static/admin/images/favicon_tilted.png b/jdav_web/static/admin/images/favicon_tilted.png
deleted file mode 100644
index 882c3ae..0000000
Binary files a/jdav_web/static/admin/images/favicon_tilted.png and /dev/null differ
diff --git a/jdav_web/static/admin/images/jdav_logo.png b/jdav_web/static/admin/images/jdav_logo.png
deleted file mode 100644
index 87e1400..0000000
Binary files a/jdav_web/static/admin/images/jdav_logo.png and /dev/null differ
diff --git a/jdav_web/static/admin/images/jdav_logo_small.png b/jdav_web/static/admin/images/jdav_logo_small.png
deleted file mode 100644
index b24e45e..0000000
Binary files a/jdav_web/static/admin/images/jdav_logo_small.png and /dev/null differ
diff --git a/jdav_web/static/admin/images/jdav_logo_transparent.png b/jdav_web/static/admin/images/jdav_logo_transparent.png
deleted file mode 100644
index d3ef7b7..0000000
Binary files a/jdav_web/static/admin/images/jdav_logo_transparent.png and /dev/null differ
diff --git a/jdav_web/static/admin/images/climber.png b/jdav_web/static/admin/img/climber.png
similarity index 100%
rename from jdav_web/static/admin/images/climber.png
rename to jdav_web/static/admin/img/climber.png
diff --git a/docs/source/_static/favicon2.png b/jdav_web/static/admin/img/favicon.png
similarity index 100%
rename from docs/source/_static/favicon2.png
rename to jdav_web/static/admin/img/favicon.png
diff --git a/docs/source/_static/jdav_logo_transparent.png b/jdav_web/static/admin/img/jdav_logo_transparent.png
similarity index 100%
rename from docs/source/_static/jdav_logo_transparent.png
rename to jdav_web/static/admin/img/jdav_logo_transparent.png
diff --git a/jdav_web/static/general/img/dav_logo.png b/jdav_web/static/general/img/dav_logo.png
deleted file mode 100644
index 8039b16..0000000
Binary files a/jdav_web/static/general/img/dav_logo.png and /dev/null differ
diff --git a/jdav_web/static/general/img/dav_logo_hd.png b/jdav_web/static/general/img/dav_logo_sektion.png
similarity index 100%
rename from jdav_web/static/general/img/dav_logo_hd.png
rename to jdav_web/static/general/img/dav_logo_sektion.png
diff --git a/jdav_web/static/startpage/img/jdav_logo.png b/jdav_web/static/general/img/jdav_logo_sektion.png
similarity index 100%
rename from jdav_web/static/startpage/img/jdav_logo.png
rename to jdav_web/static/general/img/jdav_logo_sektion.png
diff --git a/jdav_web/static/general/img/logo_dav.png b/jdav_web/static/general/img/logo_dav.png
deleted file mode 100644
index 893d9cc..0000000
Binary files a/jdav_web/static/general/img/logo_dav.png and /dev/null differ
diff --git a/jdav_web/templates/admin/base_site.html b/jdav_web/templates/admin/base_site.html
index e1e6ba7..6fc7db6 100644
--- a/jdav_web/templates/admin/base_site.html
+++ b/jdav_web/templates/admin/base_site.html
@@ -2,7 +2,7 @@
 {% load static i18n %}
 
 {# Setup favicon #}
-{% block extrahead %}<link rel="shortcut icon" type="image/png" href="{% static 'admin/images/favicon2.png' %}"/>{% endblock %}
+{% block extrahead %}<link rel="shortcut icon" type="image/png" href="{% static 'admin/img/favicon.png' %}"/>{% endblock %}
 
 {# Setup browser tab label #}
 {% block title %}{{ title }} | KOMPASS {% endblock %}
@@ -12,7 +12,7 @@
     <h1 id="site-name">
         <a href="{% url 'admin:index' %}">
             {# Your logo here #}
-            <img src="{% static 'admin/images/jdav_logo_transparent.png' %}" alt="Your Company Name" height="50%" width="50%">
+            <img src="{% static 'admin/img/jdav_logo_transparent.png' %}" alt="Your Company Name" height="50%" width="50%">
             <br><br>
             </span> KOMPASS
         </a>