diff --git a/app/assets/images/admin_avatar.png b/app/assets/images/admin_avatar.png
deleted file mode 100644
index 28ea4a143..000000000
Binary files a/app/assets/images/admin_avatar.png and /dev/null differ
diff --git a/app/assets/images/auth_logo.png b/app/assets/images/auth_logo.png
deleted file mode 100644
index bc7b1408b..000000000
Binary files a/app/assets/images/auth_logo.png and /dev/null differ
diff --git a/app/assets/images/avatar_admin.png b/app/assets/images/avatar_admin.png
new file mode 100644
index 000000000..4f4d23c06
Binary files /dev/null and b/app/assets/images/avatar_admin.png differ
diff --git a/app/assets/images/collective_avatar.png b/app/assets/images/avatar_collective.png
similarity index 100%
rename from app/assets/images/collective_avatar.png
rename to app/assets/images/avatar_collective.png
diff --git a/app/assets/images/avatar_moderator.png b/app/assets/images/avatar_moderator.png
new file mode 100644
index 000000000..c56a5de60
Binary files /dev/null and b/app/assets/images/avatar_moderator.png differ
diff --git a/app/assets/images/header_logo_madrid.png b/app/assets/images/header_logo_madrid.png
deleted file mode 100644
index 50e388cad..000000000
Binary files a/app/assets/images/header_logo_madrid.png and /dev/null differ
diff --git a/app/assets/images/header_print_proposals.jpg b/app/assets/images/header_print_proposals.jpg
index 4d2eb18a5..6e8531c08 100644
Binary files a/app/assets/images/header_print_proposals.jpg and b/app/assets/images/header_print_proposals.jpg differ
diff --git a/app/assets/images/logo_email.png b/app/assets/images/logo_email.png
new file mode 100644
index 000000000..ca2d6d54d
Binary files /dev/null and b/app/assets/images/logo_email.png differ
diff --git a/app/assets/images/logo_email_gobierno_abierto.png b/app/assets/images/logo_email_gobierno_abierto.png
deleted file mode 100644
index 5c865e102..000000000
Binary files a/app/assets/images/logo_email_gobierno_abierto.png and /dev/null differ
diff --git a/app/assets/images/logo_header.png b/app/assets/images/logo_header.png
new file mode 100644
index 000000000..ef5c4f6ff
Binary files /dev/null and b/app/assets/images/logo_header.png differ
diff --git a/app/assets/images/logo_madrid_white.png b/app/assets/images/logo_madrid_white.png
deleted file mode 100644
index 927514733..000000000
Binary files a/app/assets/images/logo_madrid_white.png and /dev/null differ
diff --git a/app/assets/images/moderator_avatar.png b/app/assets/images/moderator_avatar.png
deleted file mode 100644
index 1c726e57b..000000000
Binary files a/app/assets/images/moderator_avatar.png and /dev/null differ
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 4c0830234..0e88614c5 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -10,14 +10,14 @@
         <% end %>
       <% else %>
         <% if comment.as_administrator? %>
-          <%= image_tag("admin_avatar.png", size: 32, class: "admin-avatar float-left") %>
+          <%= image_tag("avatar_admin.png", size: 32, class: "admin-avatar float-left") %>
         <% elsif comment.as_moderator? %>
-          <%= image_tag("moderator_avatar.png", size: 32, class: "moderator-avatar float-left") %>
+          <%= image_tag("avatar_moderator.png", size: 32, class: "moderator-avatar float-left") %>
         <% else %>
         <% if comment.user.hidden? || comment.user.erased? %>
             <span class="icon-deleted user-deleted"></span>
           <% elsif comment.user.organization? %>
-            <%= image_tag("collective_avatar.png", size: 32, class: "avatar float-left") %>
+            <%= image_tag("avatar_collective.png", size: 32, class: "avatar float-left") %>
           <% else %>
             <%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "float-left") %>
           <% end %>
diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb
index 9d4943ca2..43f84534a 100644
--- a/app/views/layouts/_admin_header.html.erb
+++ b/app/views/layouts/_admin_header.html.erb
@@ -18,7 +18,7 @@
       <div id="responsive-menu">
         <div class="top-bar-title">
           <%= link_to root_path, class: "hide-for-small-only" do %>
-            <%= image_tag('header_logo_madrid.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
+            <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
             <%= Setting['org_name'] %>
             &nbsp;|&nbsp;<%= t("admin.dashboard.index.title") %>
           <% end %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 921532119..16c81fb50 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -15,7 +15,7 @@
       <div id="responsive-menu">
         <div class="top-bar-title">
           <%= link_to root_path, class: "hide-for-small-only", accesskey: "/" do %>
-            <%= image_tag('header_logo_madrid.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
+            <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
             <% if opendata_page? %>
               <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}") %> <span>|</span>
               <span class="logo-site"><%= t("layouts.header.open_data") %></span>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index 0296073db..4ef57dc4f 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -17,7 +17,7 @@
         <div class="small-12 medium-8 large-5 column small-centered margin-top">
           <h1>
             <%= link_to root_path do %>
-              <%= image_tag('header_logo_madrid.png', class: 'show-for-medium float-left', size: '96x96', alt: t("layouts.header.logo")) %>
+              <%= image_tag('logo_header.png', class: 'show-for-medium float-left', size: '96x96', alt: t("layouts.header.logo")) %>
               <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %>
             <% end %>
           </h1>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 548636c82..e0533ca50 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -14,7 +14,7 @@
           <tr>
             <td style="border-bottom: 1px solid #dadfe1; padding: 20px 0;">
               <a href="#" target="_blank">
-                <%= image_tag('logo_email_gobierno_abierto.png',  style: "border: 0; display: block; width: 100%;max-width: 370px", alt: setting['org_name']) %>
+                <%= image_tag('logo_email.png',  style: "border: 0; display: block; width: 100%;max-width: 370px", alt: setting['org_name']) %>
               </a>
             </td>
           </tr>
diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb
index 6561573ee..b79cb5f41 100644
--- a/app/views/layouts/management.html.erb
+++ b/app/views/layouts/management.html.erb
@@ -35,7 +35,7 @@
           <div id="responsive-menu">
             <div class="top-bar-title">
               <%= link_to management_root_path, class: "hide-for-small-only" do %>
-                <%= image_tag('header_logo_madrid.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
+                <%= image_tag('logo_header.png', class: 'hide-for-small-only float-left', size: '80x80', alt: t("layouts.header.logo")) %>
                 <%= Setting['org_name'] %>
                 &nbsp;|&nbsp;<%= t("management.dashboard.index.title") %>
               <% end %>