diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md
index e796cd36a9b03b2bbcb7a41cf9a12335027d687a..89008f532e18cba070c755c8cd95128557320f33 100644
--- a/.gitlab/issue_templates/bug.md
+++ b/.gitlab/issue_templates/bug.md
@@ -1,28 +1,24 @@
-/label ~BUG
-
-### What's happening?
+# What's happening?
 
-*Describe in a few words what's happening*
+Describe in a few words what's happening
 
-### Steps to reproduce
+## Steps to reproduce
 
-*How one can reproduce the issue - this is very important*
+How one can reproduce the issue - this is very important
 
 1. Step 1
 2. Step 2
 3. Step 3
 
-### Relevant logs and/or screenshots
+## Relevant logs and/or screenshots
 
-*If possible, please add a screenshot.*
+If possible, please add a screenshot.
 
-### Your Environment
+## Your Environment
 
 (Include relevant details about the environment you experienced the bug in)
 
 * Browser name and version:
 * Operating System and version (desktop or mobile):
 
-
-
-
+/label ~BUG
diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md
index 3f8fa19d755b9a1380d14608abfd1346f74d3d16..f9544309777a4890439d337796109c8b8823aea5 100644
--- a/.gitlab/issue_templates/feature.md
+++ b/.gitlab/issue_templates/feature.md
@@ -1,16 +1,12 @@
-## What needs to be done?
-
-/label ~Feature request
-
+# What needs to be done
 
 ## Technical details
 
-*Are there any technical details worth mentioning?*
-
+Are there any technical details worth mentioning?
 
 ## Test cases
 
-*Describe here the tests needed in order to validate this feature*
+Describe here the tests needed in order to validate this feature
 
 1. Step 1
 2. Step 2
@@ -20,3 +16,5 @@
 
 1. Link to user story in wiki
 2. other related Gitlab issues
+
+/label ~Feature request
diff --git a/.gitlab/issue_templates/new_instance.md b/.gitlab/issue_templates/new_instance.md
index a93fe19d536d740ba99da01eb33da9cc63a28a7e..2cf64a0227b7d7858ffbf1cb82b050eea4522451 100644
--- a/.gitlab/issue_templates/new_instance.md
+++ b/.gitlab/issue_templates/new_instance.md
@@ -1,40 +1,16 @@
-/label ~"New Instance"
-
-# Please fill all these info:
+# Please fill all these info
 
 ## General info
 
-- Name of the instance: 
-- Domain:
-
-## Settings:
-
-- Does the instance allow people to sign up? **Yes / No**
-- Does the instance want new people to get a welcome email? **Yes / No**
-
-## Federation:
+- Name of the instance:
+- Domain: .hubl.world
 
-- Which current instance should see this new instance data? **Please provide the info module by module and include the instance itself.**
-- Do those current instances agree to share their public data with this new instance? **Yes / No**
-
-Example:
+## Cosmetics
 
-- *Instance G is the new kid in town*
-- *Instance G wants to only see their dashboard, but want to access the circles of A, B, C, D, E & F.*
-- *Instance G wants to be able to chat with users from A, B, C, D, E & F.*
-- *Instance G wants to be able to see A and B job offers*
+- Logo:
 
-Let's say every instances agree to this scenario, the issue should describe the following: 
+- Favicon:
 
-- Dashboard: G
-- Circles: A, B, C, D, E, F & G
-- Job offers: A, B, F, G
-- Users: A, B, C, D, E, F & G
-- Profile directory: A, B, C, D, E, F & G
-- G agrees that any new instance can see their public data.
+- 4 Colors:
 
-## Cosmetics
-
-- Logo: 
-- Favicon: 
-- 4 Colors: 
\ No newline at end of file
+/label ~"New Instance"
diff --git a/.gitlab/merge_request_templates/checklist_before_merging.md b/.gitlab/merge_request_templates/checklist_before_merging.md
index edd506b07458afbc3d567f8be5b4bcc173cd0ca2..c92dfae887c454093e537b72f1d3f6e1218090ac 100644
--- a/.gitlab/merge_request_templates/checklist_before_merging.md
+++ b/.gitlab/merge_request_templates/checklist_before_merging.md
@@ -1,4 +1,4 @@
-## Checklist
+# Checklist
 
 <!---
 Please, make sure you have changed the topic and also
@@ -12,8 +12,6 @@ I have done ...
 - [ ] Tests for the changes have been added
 - [ ] Docs have been added or updated
 - [ ] I have assigned my architect to review this merge request
-- [ ] I have checked how to create a [merge request]()
-
 
 ## Issues
 
@@ -25,7 +23,6 @@ Format is: Closes #X or Refs #Y
 Docs: https://docs.gitlab.com/ee/user/project/issues/closing_issues.html#via-merge-request
 -->
 
-
 ## Time spent
 
 <!---
@@ -38,7 +35,6 @@ Docs: https://docs.gitlab.com/ee/workflow/time_tracking.html
 
 /spend Xh
 
-
 ## Assignee
 
 <!---
@@ -49,7 +45,6 @@ Docs: https://docs.gitlab.com/ee/user/project/quick_actions.html
 
 /assign
 
-
 ## Feedback
 
 <!---
@@ -57,5 +52,4 @@ Did you encounter any other problems you want to share with us?
 Optional. Feel free to remove this section if you don't have any feedback.
 -->
 
-
 <!--- Thank you for you contribution! -->
diff --git a/README.md b/README.md
index e451ea0db738e6963c4e190f5a887e2909ffb84c..cd851b45115adcc3b46c9d69e01c82c4919fea81 100644
--- a/README.md
+++ b/README.md
@@ -108,8 +108,8 @@ On `config.json`:
 
 ```json
   "clientName": "Hubl",
-  "clientFavicon": "/images/favicon.png",
-  "clientLogo": "/images/logo.png",
+  "clientFavicon": "/images/favicon.webp",
+  "clientLogo": "/images/logo.webp",
   "clientLogoHeight": "32px",
   "clientCSS": "/path/to/custom.css",
   "authorityName": "djangoldp-server-name"
diff --git a/src/header.pug b/src/header.pug
index defd80bc4e6554c91d6f416d645c535758ca0aa5..bee875f78ef88b3bfd97b7a2bbb9ac1df3363260 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -1,7 +1,7 @@
 .header-left
   .logo
     solid-link(next='dashboard')
-      img(src=`${clientLogo || '/images/logo.png'}` style=`max-height:${clientLogoHeight || '74px'}`)
+      img(src=`${clientLogo || '/images/logo.webp'}` style=`max-height:${clientLogoHeight || '74px'}`)
 
   span.beta-tag(data-trans='header.beta')
 
diff --git a/src/images/favicon.png b/src/images/favicon.png
deleted file mode 100644
index 6243641d6e1e5e0c6035f1d278e6162453a44615..0000000000000000000000000000000000000000
Binary files a/src/images/favicon.png and /dev/null differ
diff --git a/src/images/favicon.webp b/src/images/favicon.webp
new file mode 100644
index 0000000000000000000000000000000000000000..d16fe6821d0788692196b255eae5132c5b0cb775
Binary files /dev/null and b/src/images/favicon.webp differ
diff --git a/src/images/logo.png b/src/images/logo.png
deleted file mode 100644
index ddb5076eec9feaf9a847cda8498c4dd1cd8cc864..0000000000000000000000000000000000000000
Binary files a/src/images/logo.png and /dev/null differ
diff --git a/src/images/logo.webp b/src/images/logo.webp
new file mode 100644
index 0000000000000000000000000000000000000000..a7f0c09c09ef1ef5f9f454c68ec8b3bb5678e48e
Binary files /dev/null and b/src/images/logo.webp differ
diff --git a/src/index.pug b/src/index.pug
index a891ad420962e5bbac4ccb0b774b986827799458..a597ff5bf293dee96bec4b3f71b8b63d1f36ba3c 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -9,7 +9,7 @@ html(lang="en")
     if clientFavicon
       link(rel="icon" type="image/png" href=`${clientFavicon}`)
     else
-      link(rel="icon" type="image/png" href="/images/favicon.png")
+      link(rel="icon" type="image/webp" href="/images/favicon.webp")
     include dependencies.pug
     if clientCSS
       link(rel='stylesheet', href=`${clientCSS}`)