From 604ffb445a6c922972feba918744d57e34ab6c7a Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Fri, 29 May 2015 02:38:57 +0200
Subject: [PATCH] optimized sprites

- move mobile icons to mobile-folder, so they aren't included in the
  icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
  big other branding-images
- delete duplicate images

closes #6004
---
 .gitignore                                      |   1 +
 Changelog.md                                    |   1 +
 app/assets/images/branding/asterisk.png         | Bin 2353 -> 0 bytes
 .../images/{ => branding/logos}/asterisk.png    | Bin
 .../images/branding/{ => logos}/header-logo.png | Bin
 .../branding/{ => logos}/header-logo2x.png      | Bin
 .../branding/{ => logos}/header-logo_hover.png  | Bin
 app/assets/images/branding/{ => logos}/logo.png | Bin
 .../images/branding/{ => logos}/logo_small.png  | Bin
 .../{ => logos}/powered_by_diaspora.png         | Bin
 .../images/branding/{ => logos}/white2x.png     | Bin
 app/assets/images/icons/deletelabel.png         | Bin 203 -> 0 bytes
 app/assets/images/{icons => landing}/cog.png    | Bin
 .../images/{icons => landing}/pen_write.png     | Bin
 .../{icons => landing}/smiley_laughing.png      | Bin
 app/assets/images/{ => mobile}/arrow-left.png   | Bin
 app/assets/images/{ => mobile}/arrow-right.png  | Bin
 .../{icons => mobile}/arrow_down_small.png      | Bin
 .../images/{icons => mobile}/arrow_up_small.png | Bin
 .../{icons => mobile}/asterisk_white_mobile.png | Bin
 app/assets/images/{icons => mobile}/camera.png  | Bin
 .../images/{icons => mobile}/check_yes_ok.png   | Bin
 .../images/{icons => mobile}/compose_mobile.png | Bin
 app/assets/images/{ => mobile}/deletelabel.png  | Bin
 .../{texture => mobile}/hatched-light.jpg       | Bin
 .../{icons => mobile}/heart_mobile_grey.png     | Bin
 .../{icons => mobile}/heart_mobile_red.png      | Bin
 .../images/{icons => mobile}/mail_white.png     | Bin
 app/assets/images/{icons => mobile}/menu.png    | Bin
 .../{icons => mobile}/notifications_white.png   | Bin
 .../{icons => mobile}/pencil_mobile_grey.png    | Bin
 .../pencil_mobile_grey_active.png               | Bin
 .../images/{icons => mobile}/reshare_mobile.png | Bin
 .../{icons => mobile}/reshare_mobile_active.png | Bin
 app/assets/stylesheets/footer.scss              |   2 +-
 app/assets/stylesheets/mobile/mobile.scss       |  16 ++++++++--------
 app/assets/stylesheets/new_styles/_login.scss   |   2 +-
 app/assets/stylesheets/sprites.scss             |   4 ++--
 app/assets/templates/header_tpl.jst.hbs         |   2 +-
 app/helpers/open_graph_helper.rb                |   9 ++++-----
 app/views/comments/_comment.mobile.haml         |   2 +-
 app/views/conversations/_show.mobile.haml       |   2 +-
 app/views/devise/passwords/edit.haml            |   2 +-
 app/views/devise/passwords/new.haml             |   2 +-
 app/views/errors/error_500.haml                 |   2 +-
 app/views/home/default.haml                     |   8 ++++----
 app/views/layouts/_footer.html.haml             |   2 +-
 app/views/layouts/_header.html.haml             |   2 +-
 app/views/layouts/application.mobile.haml       |  10 +++++-----
 app/views/layouts/notifier.html.erb             |   2 +-
 app/views/photos/show.mobile.haml               |   4 ++--
 app/views/publisher/_publisher.mobile.haml      |   4 ++--
 app/views/registrations/new.mobile.haml         |   2 +-
 app/views/sessions/new.html.haml                |   2 +-
 app/views/sessions/new.mobile.haml              |   2 +-
 app/views/shared/_post_info.mobile.haml         |   2 +-
 app/views/shared/_post_stats.mobile.haml        |   8 ++++----
 app/views/users/getting_started.mobile.haml     |   4 ++--
 58 files changed, 50 insertions(+), 49 deletions(-)
 delete mode 100644 app/assets/images/branding/asterisk.png
 rename app/assets/images/{ => branding/logos}/asterisk.png (100%)
 rename app/assets/images/branding/{ => logos}/header-logo.png (100%)
 rename app/assets/images/branding/{ => logos}/header-logo2x.png (100%)
 rename app/assets/images/branding/{ => logos}/header-logo_hover.png (100%)
 rename app/assets/images/branding/{ => logos}/logo.png (100%)
 rename app/assets/images/branding/{ => logos}/logo_small.png (100%)
 rename app/assets/images/branding/{ => logos}/powered_by_diaspora.png (100%)
 rename app/assets/images/branding/{ => logos}/white2x.png (100%)
 delete mode 100644 app/assets/images/icons/deletelabel.png
 rename app/assets/images/{icons => landing}/cog.png (100%)
 rename app/assets/images/{icons => landing}/pen_write.png (100%)
 rename app/assets/images/{icons => landing}/smiley_laughing.png (100%)
 rename app/assets/images/{ => mobile}/arrow-left.png (100%)
 rename app/assets/images/{ => mobile}/arrow-right.png (100%)
 rename app/assets/images/{icons => mobile}/arrow_down_small.png (100%)
 rename app/assets/images/{icons => mobile}/arrow_up_small.png (100%)
 rename app/assets/images/{icons => mobile}/asterisk_white_mobile.png (100%)
 rename app/assets/images/{icons => mobile}/camera.png (100%)
 rename app/assets/images/{icons => mobile}/check_yes_ok.png (100%)
 rename app/assets/images/{icons => mobile}/compose_mobile.png (100%)
 rename app/assets/images/{ => mobile}/deletelabel.png (100%)
 rename app/assets/images/{texture => mobile}/hatched-light.jpg (100%)
 rename app/assets/images/{icons => mobile}/heart_mobile_grey.png (100%)
 rename app/assets/images/{icons => mobile}/heart_mobile_red.png (100%)
 rename app/assets/images/{icons => mobile}/mail_white.png (100%)
 rename app/assets/images/{icons => mobile}/menu.png (100%)
 rename app/assets/images/{icons => mobile}/notifications_white.png (100%)
 rename app/assets/images/{icons => mobile}/pencil_mobile_grey.png (100%)
 rename app/assets/images/{icons => mobile}/pencil_mobile_grey_active.png (100%)
 rename app/assets/images/{icons => mobile}/reshare_mobile.png (100%)
 rename app/assets/images/{icons => mobile}/reshare_mobile_active.png (100%)

diff --git a/.gitignore b/.gitignore
index 87b17afd9..1e6da2c17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ public/500.html
 
 # Sprites
 app/assets/images/branding-*.png
+app/assets/images/branding/logos-*.png
 app/assets/images/icons-*.png
 app/assets/images/social_media_logos-*.png
 
diff --git a/Changelog.md b/Changelog.md
index 790489e19..5ea4158c1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,7 @@
 * Improve the logging of Eyes output [#5989](https://github.com/diaspora/diaspora/pull/5989)
 * Gracefully handle XML parse errors within federation [#5991](https://github.com/diaspora/diaspora/pull/5991)
 * Remove zip-zip workaround gem [#6001](https://github.com/diaspora/diaspora/pull/6001)
+* Cleanup and reorganize image assets [#6004](https://github.com/diaspora/diaspora/pull/6004)
 
 ## Bug fixes
 * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)
diff --git a/app/assets/images/branding/asterisk.png b/app/assets/images/branding/asterisk.png
deleted file mode 100644
index 0aac946d0c5b150e9bd7b5c2bf4f199967cff5b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2353
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
P3IUw#khX0XG3oyRN10)s

diff --git a/app/assets/images/asterisk.png b/app/assets/images/branding/logos/asterisk.png
similarity index 100%
rename from app/assets/images/asterisk.png
rename to app/assets/images/branding/logos/asterisk.png
diff --git a/app/assets/images/branding/header-logo.png b/app/assets/images/branding/logos/header-logo.png
similarity index 100%
rename from app/assets/images/branding/header-logo.png
rename to app/assets/images/branding/logos/header-logo.png
diff --git a/app/assets/images/branding/header-logo2x.png b/app/assets/images/branding/logos/header-logo2x.png
similarity index 100%
rename from app/assets/images/branding/header-logo2x.png
rename to app/assets/images/branding/logos/header-logo2x.png
diff --git a/app/assets/images/branding/header-logo_hover.png b/app/assets/images/branding/logos/header-logo_hover.png
similarity index 100%
rename from app/assets/images/branding/header-logo_hover.png
rename to app/assets/images/branding/logos/header-logo_hover.png
diff --git a/app/assets/images/branding/logo.png b/app/assets/images/branding/logos/logo.png
similarity index 100%
rename from app/assets/images/branding/logo.png
rename to app/assets/images/branding/logos/logo.png
diff --git a/app/assets/images/branding/logo_small.png b/app/assets/images/branding/logos/logo_small.png
similarity index 100%
rename from app/assets/images/branding/logo_small.png
rename to app/assets/images/branding/logos/logo_small.png
diff --git a/app/assets/images/branding/powered_by_diaspora.png b/app/assets/images/branding/logos/powered_by_diaspora.png
similarity index 100%
rename from app/assets/images/branding/powered_by_diaspora.png
rename to app/assets/images/branding/logos/powered_by_diaspora.png
diff --git a/app/assets/images/branding/white2x.png b/app/assets/images/branding/logos/white2x.png
similarity index 100%
rename from app/assets/images/branding/white2x.png
rename to app/assets/images/branding/logos/white2x.png
diff --git a/app/assets/images/icons/deletelabel.png b/app/assets/images/icons/deletelabel.png
deleted file mode 100644
index b3e53ee3a767e955a4e48b6e83edc8287d8d5ab2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xawj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwIhlyK9ydW*;8&D|1)5S4F<9u?0#3qL+jg5)=%*@SV
zlV<2KGauGlA>+4UdSl~5dmu-91zW7fZ~G8Fb%(GYT)k_(PwYG~t1v4`>C*dp&yBq*
q%O}ZNY<O|OwfJb9(?!D$Muyex3VFYaj}`&#VDNPHb6Mw<&;$UI-ah~U

diff --git a/app/assets/images/icons/cog.png b/app/assets/images/landing/cog.png
similarity index 100%
rename from app/assets/images/icons/cog.png
rename to app/assets/images/landing/cog.png
diff --git a/app/assets/images/icons/pen_write.png b/app/assets/images/landing/pen_write.png
similarity index 100%
rename from app/assets/images/icons/pen_write.png
rename to app/assets/images/landing/pen_write.png
diff --git a/app/assets/images/icons/smiley_laughing.png b/app/assets/images/landing/smiley_laughing.png
similarity index 100%
rename from app/assets/images/icons/smiley_laughing.png
rename to app/assets/images/landing/smiley_laughing.png
diff --git a/app/assets/images/arrow-left.png b/app/assets/images/mobile/arrow-left.png
similarity index 100%
rename from app/assets/images/arrow-left.png
rename to app/assets/images/mobile/arrow-left.png
diff --git a/app/assets/images/arrow-right.png b/app/assets/images/mobile/arrow-right.png
similarity index 100%
rename from app/assets/images/arrow-right.png
rename to app/assets/images/mobile/arrow-right.png
diff --git a/app/assets/images/icons/arrow_down_small.png b/app/assets/images/mobile/arrow_down_small.png
similarity index 100%
rename from app/assets/images/icons/arrow_down_small.png
rename to app/assets/images/mobile/arrow_down_small.png
diff --git a/app/assets/images/icons/arrow_up_small.png b/app/assets/images/mobile/arrow_up_small.png
similarity index 100%
rename from app/assets/images/icons/arrow_up_small.png
rename to app/assets/images/mobile/arrow_up_small.png
diff --git a/app/assets/images/icons/asterisk_white_mobile.png b/app/assets/images/mobile/asterisk_white_mobile.png
similarity index 100%
rename from app/assets/images/icons/asterisk_white_mobile.png
rename to app/assets/images/mobile/asterisk_white_mobile.png
diff --git a/app/assets/images/icons/camera.png b/app/assets/images/mobile/camera.png
similarity index 100%
rename from app/assets/images/icons/camera.png
rename to app/assets/images/mobile/camera.png
diff --git a/app/assets/images/icons/check_yes_ok.png b/app/assets/images/mobile/check_yes_ok.png
similarity index 100%
rename from app/assets/images/icons/check_yes_ok.png
rename to app/assets/images/mobile/check_yes_ok.png
diff --git a/app/assets/images/icons/compose_mobile.png b/app/assets/images/mobile/compose_mobile.png
similarity index 100%
rename from app/assets/images/icons/compose_mobile.png
rename to app/assets/images/mobile/compose_mobile.png
diff --git a/app/assets/images/deletelabel.png b/app/assets/images/mobile/deletelabel.png
similarity index 100%
rename from app/assets/images/deletelabel.png
rename to app/assets/images/mobile/deletelabel.png
diff --git a/app/assets/images/texture/hatched-light.jpg b/app/assets/images/mobile/hatched-light.jpg
similarity index 100%
rename from app/assets/images/texture/hatched-light.jpg
rename to app/assets/images/mobile/hatched-light.jpg
diff --git a/app/assets/images/icons/heart_mobile_grey.png b/app/assets/images/mobile/heart_mobile_grey.png
similarity index 100%
rename from app/assets/images/icons/heart_mobile_grey.png
rename to app/assets/images/mobile/heart_mobile_grey.png
diff --git a/app/assets/images/icons/heart_mobile_red.png b/app/assets/images/mobile/heart_mobile_red.png
similarity index 100%
rename from app/assets/images/icons/heart_mobile_red.png
rename to app/assets/images/mobile/heart_mobile_red.png
diff --git a/app/assets/images/icons/mail_white.png b/app/assets/images/mobile/mail_white.png
similarity index 100%
rename from app/assets/images/icons/mail_white.png
rename to app/assets/images/mobile/mail_white.png
diff --git a/app/assets/images/icons/menu.png b/app/assets/images/mobile/menu.png
similarity index 100%
rename from app/assets/images/icons/menu.png
rename to app/assets/images/mobile/menu.png
diff --git a/app/assets/images/icons/notifications_white.png b/app/assets/images/mobile/notifications_white.png
similarity index 100%
rename from app/assets/images/icons/notifications_white.png
rename to app/assets/images/mobile/notifications_white.png
diff --git a/app/assets/images/icons/pencil_mobile_grey.png b/app/assets/images/mobile/pencil_mobile_grey.png
similarity index 100%
rename from app/assets/images/icons/pencil_mobile_grey.png
rename to app/assets/images/mobile/pencil_mobile_grey.png
diff --git a/app/assets/images/icons/pencil_mobile_grey_active.png b/app/assets/images/mobile/pencil_mobile_grey_active.png
similarity index 100%
rename from app/assets/images/icons/pencil_mobile_grey_active.png
rename to app/assets/images/mobile/pencil_mobile_grey_active.png
diff --git a/app/assets/images/icons/reshare_mobile.png b/app/assets/images/mobile/reshare_mobile.png
similarity index 100%
rename from app/assets/images/icons/reshare_mobile.png
rename to app/assets/images/mobile/reshare_mobile.png
diff --git a/app/assets/images/icons/reshare_mobile_active.png b/app/assets/images/mobile/reshare_mobile_active.png
similarity index 100%
rename from app/assets/images/icons/reshare_mobile_active.png
rename to app/assets/images/mobile/reshare_mobile_active.png
diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss
index 9d057029d..2fc0168a5 100644
--- a/app/assets/stylesheets/footer.scss
+++ b/app/assets/stylesheets/footer.scss
@@ -11,7 +11,7 @@ footer {
     border-top: 1px solid $border-grey;
   }
 
-  .branding-powered_by_diaspora {
+  .logos-powered_by_diaspora {
     display: inline-block;
     margin-top: 3px;
     height: 11px;
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index 1f10e11ec..d6d056beb 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -20,7 +20,7 @@ code {
 
 body {
   background: {
-    image: image-url('texture/hatched-light.jpg');
+    image: image-url("mobile/hatched-light.jpg");
     position: fixed;
     /* scale background image down for iOS retina display */
     size: 200px;
@@ -398,7 +398,7 @@ h3 {
         right: 14px;
       }
       background: {
-        image: image-url("icons/arrow_down_small.png");
+        image: image-url("mobile/arrow_down_small.png");
         position: center right;
         repeat: no-repeat;
       }
@@ -486,23 +486,23 @@ h3 {
 }
 
 .reshare_action {
-  background-image: image-url("icons/reshare_mobile.png");
+  background-image: image-url("mobile/reshare_mobile.png");
   &.active {
-    background-image: image-url("icons/reshare_mobile_active.png");
+    background-image: image-url("mobile/reshare_mobile_active.png");
   }
 }
 
 .like_action {
-  background-image: image-url("icons/heart_mobile_grey.png");
+  background-image: image-url("mobile/heart_mobile_grey.png");
   &.active {
-    background-image: image-url("icons/heart_mobile_red.png");
+    background-image: image-url("mobile/heart_mobile_red.png");
   }
 }
 
 .comment_action.image_link {
-  background-image: image-url("icons/pencil_mobile_grey_active.png");
+  background-image: image-url("mobile/pencil_mobile_grey_active.png");
   &.inactive {
-    background-image: image-url("icons/pencil_mobile_grey.png");
+    background-image: image-url("mobile/pencil_mobile_grey.png");
   }
 }
 
diff --git a/app/assets/stylesheets/new_styles/_login.scss b/app/assets/stylesheets/new_styles/_login.scss
index a538a15e0..d0da96428 100644
--- a/app/assets/stylesheets/new_styles/_login.scss
+++ b/app/assets/stylesheets/new_styles/_login.scss
@@ -3,7 +3,7 @@
 #reset_password {
   padding-top: 25px;
 
-  .branding-asterisk {
+  .logos-asterisk {
     margin: auto;
     width: 154px;
     height: 154px;
diff --git a/app/assets/stylesheets/sprites.scss b/app/assets/stylesheets/sprites.scss
index 686161f75..e78a5c3d9 100644
--- a/app/assets/stylesheets/sprites.scss
+++ b/app/assets/stylesheets/sprites.scss
@@ -1,7 +1,7 @@
 /* ===== sprites ===== */
 @import 'icons/*.png';
-@import 'branding/*.png';
+@import 'branding/logos/*.png';
 @import 'social_media_logos/*.png';
 @include all-icons-sprites;
-@include all-branding-sprites;
+@include all-logos-sprites;
 @include all-social_media_logos-sprites;
diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
index 3922d6b5d..92ed903fc 100644
--- a/app/assets/templates/header_tpl.jst.hbs
+++ b/app/assets/templates/header_tpl.jst.hbs
@@ -1,7 +1,7 @@
 <div class="container" style="position:relative;">
 
   <a href="/stream">
-    <div alt="Logo_small" class="diaspora_header_logo branding-header-logo">
+    <div alt="logo" class="diaspora_header_logo logos-header-logo">
     </div>
   </a>
 
diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb
index 8fa72e378..b68dc3a96 100644
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -52,7 +52,6 @@ module OpenGraphHelper
   def og_page_post_tags(post)
     tags = og_common_tags
 
-    
     if post.message
       tags.concat [
         *tags,
@@ -63,7 +62,7 @@ module OpenGraphHelper
         og_description(post.message.plain_text_without_markdown truncate: 1000)
       ]
     end
-    
+
     tags.join("\n").html_safe
   end
 
@@ -96,10 +95,10 @@ module OpenGraphHelper
 
   # This method compensates for hosting assets off of s3
   def default_image_url
-    if image_path('asterisk.png').include?("http")
-      image_path('asterisk.png')
+    if image_path("branding/logos/asterisk.png").include?("http")
+      image_path("branding/logos/asterisk.png")
     else
-      "#{root_url.chop}#{image_path('asterisk.png')}"
+      "#{root_url.chop}#{image_path('branding/logos/asterisk.png')}"
     end
   end
 end
diff --git a/app/views/comments/_comment.mobile.haml b/app/views/comments/_comment.mobile.haml
index abe2dddbf..24b5fc98b 100644
--- a/app/views/comments/_comment.mobile.haml
+++ b/app/views/comments/_comment.mobile.haml
@@ -7,7 +7,7 @@
     .remove_comment
       .right
         - if user_signed_in? && comment.author == current_user.person
-          = link_to(image_tag('deletelabel.png'), comment_path(comment), :method => :delete, :data => { :confirm => "#{t('are_you_sure')}" }, :class => "remove")
+          = link_to(image_tag("mobile/deletelabel.png"), comment_path(comment), method: :delete, data: { confirm: "#{t('are_you_sure')}" }, class: "remove")
     .from
       = person_image_link(comment.author)
       = person_link(comment.author)
diff --git a/app/views/conversations/_show.mobile.haml b/app/views/conversations/_show.mobile.haml
index 907c4c423..2a8a574e9 100644
--- a/app/views/conversations/_show.mobile.haml
+++ b/app/views/conversations/_show.mobile.haml
@@ -4,7 +4,7 @@
 
 .conversation_participants
   .right
-    = link_to(image_tag('deletelabel.png'), conversation_visibility_path(conversation), :method => 'delete', :data => { :confirm => "#{t('.delete')}?" }, :class => "remove")
+    = link_to(image_tag("mobile/deletelabel.png"), conversation_visibility_path(conversation), method: :delete, data: { confirm: "#{t('.delete')}?" }, class: "remove")
 
   %h3{ :class => direction_for(conversation.subject) }
     = conversation.subject
diff --git a/app/views/devise/passwords/edit.haml b/app/views/devise/passwords/edit.haml
index 779b9be0a..732ffa90f 100644
--- a/app/views/devise/passwords/edit.haml
+++ b/app/views/devise/passwords/edit.haml
@@ -4,7 +4,7 @@
 #reset_password
   .container-fluid
     .text-center
-      .branding-asterisk
+      .logos-asterisk
       %h1
         = AppConfig.settings.pod_name
 
diff --git a/app/views/devise/passwords/new.haml b/app/views/devise/passwords/new.haml
index 286a29d50..9486f5035 100644
--- a/app/views/devise/passwords/new.haml
+++ b/app/views/devise/passwords/new.haml
@@ -4,7 +4,7 @@
 #forgot_password
   .container-fluid
     .text-center
-      .branding-asterisk
+      .logos-asterisk
       %h1
         = AppConfig.settings.pod_name
 
diff --git a/app/views/errors/error_500.haml b/app/views/errors/error_500.haml
index c7bee9257..25e744d3c 100644
--- a/app/views/errors/error_500.haml
+++ b/app/views/errors/error_500.haml
@@ -2,7 +2,7 @@
   We're sorry, but something went wrong (500)
 
 %header
-  = image_tag "branding/white2x.png", id: "diaspora_logo"
+  = image_tag "branding/logos/white2x.png", id: "diaspora_logo"
 
 %h1
   500: Internal server error.
diff --git a/app/views/home/default.haml b/app/views/home/default.haml
index e2ba79087..919a81185 100644
--- a/app/views/home/default.haml
+++ b/app/views/home/default.haml
@@ -4,7 +4,7 @@
 #page.container
   %header#header
     %a#login-link.btn{href: "login"} Log In
-    = image_tag "branding/logo.png"
+    = image_tag "branding/logos/logo.png"
 
   #banner.row
     %h1 Welcome, friend.
@@ -15,7 +15,7 @@
       %h2
         Configure your
         %abbr.helpful{title: "A Diaspora installation"} pod
-      = image_tag "icons/cog.png"
+      = image_tag "landing/cog.png"
 
       %p
       Look at
@@ -28,7 +28,7 @@
 
     .span4
       %h2 Try it out
-      = image_tag "icons/smiley_laughing.png"
+      = image_tag "landing/smiley_laughing.png"
 
       %p
         Start by
@@ -36,7 +36,7 @@
 
     .span4
       %h2 Make a contribution!
-      = image_tag "icons/pen_write.png"
+      = image_tag "landing/pen_write.png"
 
       %p
         Make Diaspora even better! Fork the project on
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index 4897358e2..12236d956 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -1,5 +1,5 @@
 %footer
   .container
-    .branding-powered_by_diaspora
+    .logos-powered_by_diaspora
     %ul#footer_nav
       = render :partial =>'shared/links'
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index d9a1b079e..654dececb 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -5,7 +5,7 @@
 %header
   - unless current_user
     .container{style: "position:relative;"}
-      = link_to content_tag(:div, nil, class: 'diaspora_header_logo branding-header-logo'), root_path
+      = link_to content_tag(:div, nil, class: 'diaspora_header_logo logos-header-logo'), root_path
 
       %ul#landing_nav
         - if AppConfig.settings.enable_registrations? && !current_page?(controller: '/registrations', action: :new)
diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml
index 60e2d2605..405e27201 100644
--- a/app/views/layouts/application.mobile.haml
+++ b/app/views/layouts/application.mobile.haml
@@ -54,21 +54,21 @@
           #nav_badges
             -# Notifications
             = link_to notifications_path, class: "badge", id: "notification_badge" do
-              = image_tag('icons/notifications_white.png')
+              = image_tag("mobile/notifications_white.png")
               - if current_user.unread_notifications.size > 0
                 %span.badge_count{id: "notification"}
                   = current_user.unread_notifications.size
             -# Conversations
             = link_to conversations_path, class: "badge", id: "conversations_badge" do
-              = image_tag('icons/mail_white.png', id: 'conversation_icon')
+              = image_tag("mobile/mail_white.png", id: "conversation_icon")
               - if current_user.unread_message_count > 0
                 %span.badge_count{id: "conversation"}
                   = current_user.unread_message_count
             -# Publisher
-            = link_to(image_tag('icons/compose_mobile.png'), new_status_message_path, class: "badge", id: "compose_badge")
+            = link_to(image_tag("mobile/compose_mobile.png"), new_status_message_path, class: "badge", id: "compose_badge")
             -# Menu
-            = link_to(image_tag('icons/menu.png'), "#", id: "menu_badge", class: "badge")
-          = link_to(image_tag('icons/asterisk_white_mobile.png'), stream_path, id: 'header_title')
+            = link_to(image_tag("mobile/menu.png"), "#", id: "menu_badge", class: "badge")
+          = link_to(image_tag("mobile/asterisk_white_mobile.png"), stream_path, id: "header_title")
 
       - if user_signed_in?
         #drawer
diff --git a/app/views/layouts/notifier.html.erb b/app/views/layouts/notifier.html.erb
index 2019125a0..bf5bcabe6 100644
--- a/app/views/layouts/notifier.html.erb
+++ b/app/views/layouts/notifier.html.erb
@@ -28,7 +28,7 @@
   <table cellspacing="0" cellpadding="0" border="0" align="center" width="100%" style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:14px;color:#333;">
     <tr>
       <td style="text-align:center;padding:30px;">
-        <img src="<%=AppConfig.pod_uri.to_s %>assets/branding/logo_small.png" alt="diaspora*" width="59px" height="14px"/>
+        <img src="<%=AppConfig.pod_uri.to_s %>assets/branding/logos/logo_small.png" alt="diaspora*" width="59px" height="14px"/>
       </td>
     </tr>
   </table>
diff --git a/app/views/photos/show.mobile.haml b/app/views/photos/show.mobile.haml
index c3bf5bd6a..4b5c3a3ea 100644
--- a/app/views/photos/show.mobile.haml
+++ b/app/views/photos/show.mobile.haml
@@ -24,8 +24,8 @@
     %tr
       %td
         - if previous_photo != additional_photos.last
-          = link_to(image_tag('arrow-left.png', :id => 'arrow-left'), person_photo_path(previous_photo.author, previous_photo), :rel => 'prefetch', :class => 'arrow', :id => 'left')
+          = link_to(image_tag("mobile/arrow-left.png", id: "arrow-left"), person_photo_path(previous_photo.author, previous_photo), rel: "prefetch", class: "arrow", id: "left")
       %td{:width => '100%'}
       %td
         - if next_photo == additional_photos[additional_photos.index(photo)+1]
-          = link_to(image_tag('arrow-right.png', :id => 'arrow-right'), person_photo_path(next_photo.author, next_photo), :rel => 'prefetch', :class => 'arrow', :id => 'right')
+          = link_to(image_tag("mobile/arrow-right.png", id: "arrow-right"), person_photo_path(next_photo.author, next_photo), rel: "prefetch", class: "arrow", id: "right")
diff --git a/app/views/publisher/_publisher.mobile.haml b/app/views/publisher/_publisher.mobile.haml
index 6a1d72f78..df36515d5 100644
--- a/app/views/publisher/_publisher.mobile.haml
+++ b/app/views/publisher/_publisher.mobile.haml
@@ -22,14 +22,14 @@
       - current_user.aspects.each do |aspect|
         %option{:value => aspect.id}
           = "· #{aspect.name}"
-    
+
     .clear
     #publisher_textarea_wrapper
       %ul#photodropzone
     #fileInfo-publisher
 
     #file-upload-publisher{:title => t('shared.publisher.upload_photos'), :class => 'btn'}
-      = image_tag 'icons/camera.png', alt: t('shared.publisher.upload_photos').titleize
+      = image_tag "mobile/camera.png", alt: t("shared.publisher.upload_photos").titleize
     #publisher_mobile
       = submit_tag t('shared.publisher.share'), :class => 'btn primary', :id => "submit_new_message"
 
diff --git a/app/views/registrations/new.mobile.haml b/app/views/registrations/new.mobile.haml
index 3813a6625..8be870e29 100644
--- a/app/views/registrations/new.mobile.haml
+++ b/app/views/registrations/new.mobile.haml
@@ -17,7 +17,7 @@
       = form_for(resource, :as => resource_name, :html => {:class => 'new_user_form'}, :url => registration_path(resource_name)) do |f|
         %fieldset
           %legend
-            = image_tag('branding/header-logo2x.png', :height => 40, :width => 40)
+            = image_tag("branding/logos/header-logo2x.png", height: 40, width: 40)
             = t('aspects.aspect_stream.make_something')
 
           .control-group
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index 97d6a67f1..41c251400 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -3,7 +3,7 @@
 
 .container-fluid#login
   .text-center
-    .branding-asterisk
+    .logos-asterisk
     %h1
       = AppConfig.settings.pod_name
 
diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml
index 02a680339..0aa5e2284 100644
--- a/app/views/sessions/new.mobile.haml
+++ b/app/views/sessions/new.mobile.haml
@@ -21,7 +21,7 @@
         = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
           %fieldset
             %legend
-              = image_tag('branding/header-logo2x.png', :height => 40, :width => 40)
+              = image_tag("branding/logos/header-logo2x.png", height: 40, width: 40)
               = t('devise.sessions.new.login')
 
             .control-group
diff --git a/app/views/shared/_post_info.mobile.haml b/app/views/shared/_post_info.mobile.haml
index 1d7408752..cff91d25a 100644
--- a/app/views/shared/_post_info.mobile.haml
+++ b/app/views/shared/_post_info.mobile.haml
@@ -8,7 +8,7 @@
 
   .remove_post
     - if user_signed_in? && post.author == current_user.person
-      = link_to(image_tag('deletelabel.png'), post_path(post), :method => :delete, :data => { :confirm => "#{t('are_you_sure')}" }, :class => "remove")
+      = link_to(image_tag("mobile/deletelabel.png"), post_path(post), method: :delete, data: { confirm: "#{t('are_you_sure')}" }, class: "remove")
 
   .info
     %span
diff --git a/app/views/shared/_post_stats.mobile.haml b/app/views/shared/_post_stats.mobile.haml
index f4dd8390b..eaa514266 100644
--- a/app/views/shared/_post_stats.mobile.haml
+++ b/app/views/shared/_post_stats.mobile.haml
@@ -15,7 +15,7 @@
 
     %li.comment.add_comment_bottom_link_container
       = link_to "#", class: "show_comments bottom_collapse active" do
-        = image_tag "icons/arrow_up_small.png"
-        
-      - if user_signed_in? 
-        = link_to t("comments.new_comment.comment"), new_post_comment_path(@post), class: "add_comment_bottom_link btn comment_action inactive"
\ No newline at end of file
+        = image_tag "mobile/arrow_up_small.png"
+
+      - if user_signed_in?
+        = link_to t("comments.new_comment.comment"), new_post_comment_path(@post), class: "add_comment_bottom_link btn comment_action inactive"
diff --git a/app/views/users/getting_started.mobile.haml b/app/views/users/getting_started.mobile.haml
index 7f68d9c84..c1e008bf1 100644
--- a/app/views/users/getting_started.mobile.haml
+++ b/app/views/users/getting_started.mobile.haml
@@ -61,7 +61,7 @@
         = text_field_tag 'profile[first_name]', current_user.first_name
         = image_tag 'ajax-loader.gif', :id => "gs-name-form-spinner", :class => "hidden"
         %span.saved{:class => "hidden"}
-          = image_tag 'icons/check_yes_ok.png'
+          = image_tag "mobile/check_yes_ok.png"
           = t(".saved")
 
         = label_tag :your_photo, t('profiles.edit.your_photo'), :class => "bootstrapped"
@@ -77,7 +77,7 @@
       %fieldset
         = label_tag 'follow_tags', t('.hashtag_suggestions'), :class => "bootstrapped"
         = text_field_tag 'follow_tags', nil, :class => "nostrap"
-    
+
     .center
       = link_to "#{t('.awesome_take_me_to_diaspora')} »", stream_path, :id => "awesome_button", :class => "button creation"