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/COPYRIGHT b/COPYRIGHT
index b150ae948..eb065c404 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -21,3 +21,8 @@ exception to your version of the file(s), but you are not obligated to
 do so.  If you do not wish to do so, delete this exception statement from your
 version.  If you delete this exception statement from all source files in the
 program, then also delete it here.
+
+Social Media Icons
+------------------
+Some icons are used from https://github.com/paulrobertlloyd/socialmediaicons
+Licensed under a Creative Commons Attribution-Share Alike 3.0 license
diff --git a/Changelog.md b/Changelog.md
index f8066b7d3..414360265 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -35,6 +35,7 @@ Ruby 2.0 is no longer officially supported.
 * 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/add_contact_button.png b/app/assets/images/add_contact_button.png
deleted file mode 100644
index 750046092..000000000
Binary files a/app/assets/images/add_contact_button.png and /dev/null differ
diff --git a/app/assets/images/ajax-loader_inverted.gif b/app/assets/images/ajax-loader_inverted.gif
deleted file mode 100644
index 31a6f5448..000000000
Binary files a/app/assets/images/ajax-loader_inverted.gif and /dev/null differ
diff --git a/app/assets/images/asterisk_white.png b/app/assets/images/asterisk_white.png
deleted file mode 100644
index 308299ecf..000000000
Binary files a/app/assets/images/asterisk_white.png and /dev/null differ
diff --git a/app/assets/images/branding/asterisk.png b/app/assets/images/branding/asterisk.png
deleted file mode 100644
index 0aac946d0..000000000
Binary files a/app/assets/images/branding/asterisk.png and /dev/null differ
diff --git a/app/assets/images/branding/asterisk_white.png b/app/assets/images/branding/asterisk_white.png
deleted file mode 100644
index 308299ecf..000000000
Binary files a/app/assets/images/branding/asterisk_white.png and /dev/null differ
diff --git a/app/assets/images/branding/ball_small.png b/app/assets/images/branding/ball_small.png
deleted file mode 100644
index 4d30835c8..000000000
Binary files a/app/assets/images/branding/ball_small.png and /dev/null differ
diff --git a/app/assets/images/branding/logo_white.png b/app/assets/images/branding/logo_white.png
deleted file mode 100644
index 17b10633a..000000000
Binary files a/app/assets/images/branding/logo_white.png and /dev/null differ
diff --git a/app/assets/images/branding/logo_white2x.png b/app/assets/images/branding/logo_white2x.png
deleted file mode 100644
index fa0aafb95..000000000
Binary files a/app/assets/images/branding/logo_white2x.png and /dev/null differ
diff --git a/app/assets/images/branding/logo_white4x.png b/app/assets/images/branding/logo_white4x.png
deleted file mode 100644
index 2f559c1ba..000000000
Binary files a/app/assets/images/branding/logo_white4x.png and /dev/null differ
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/branding/white_on_grey.png b/app/assets/images/branding/white_on_grey.png
deleted file mode 100644
index ea342d12a..000000000
Binary files a/app/assets/images/branding/white_on_grey.png and /dev/null differ
diff --git a/app/assets/images/buttons/back_hov@2x.png b/app/assets/images/buttons/back_hov@2x.png
deleted file mode 100644
index 5a419f7a7..000000000
Binary files a/app/assets/images/buttons/back_hov@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/bday@2x-white.png b/app/assets/images/buttons/bday@2x-white.png
deleted file mode 100644
index ab5940c25..000000000
Binary files a/app/assets/images/buttons/bday@2x-white.png and /dev/null differ
diff --git a/app/assets/images/buttons/bday@2x.png b/app/assets/images/buttons/bday@2x.png
deleted file mode 100644
index 18a0a2ca1..000000000
Binary files a/app/assets/images/buttons/bday@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/close@2x.png b/app/assets/images/buttons/close@2x.png
deleted file mode 100644
index cf95da280..000000000
Binary files a/app/assets/images/buttons/close@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/delete.png b/app/assets/images/buttons/delete.png
deleted file mode 100644
index f1035eab0..000000000
Binary files a/app/assets/images/buttons/delete.png and /dev/null differ
diff --git a/app/assets/images/buttons/delete_hover.png b/app/assets/images/buttons/delete_hover.png
deleted file mode 100644
index 89be6fd52..000000000
Binary files a/app/assets/images/buttons/delete_hover.png and /dev/null differ
diff --git a/app/assets/images/buttons/done_hov@2x.png b/app/assets/images/buttons/done_hov@2x.png
deleted file mode 100644
index a03f24c03..000000000
Binary files a/app/assets/images/buttons/done_hov@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/edit2@2x.png b/app/assets/images/buttons/edit2@2x.png
deleted file mode 100644
index 818ce2b29..000000000
Binary files a/app/assets/images/buttons/edit2@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/facebook_hov@2x.png b/app/assets/images/buttons/facebook_hov@2x.png
deleted file mode 100644
index c43fa51db..000000000
Binary files a/app/assets/images/buttons/facebook_hov@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/next_hov@2x.png b/app/assets/images/buttons/next_hov@2x.png
deleted file mode 100644
index 232494acc..000000000
Binary files a/app/assets/images/buttons/next_hov@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/fb@2x-white.png b/app/assets/images/buttons/service-icons/fb@2x-white.png
deleted file mode 100644
index 2fb0b930c..000000000
Binary files a/app/assets/images/buttons/service-icons/fb@2x-white.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/fb@2x.png b/app/assets/images/buttons/service-icons/fb@2x.png
deleted file mode 100644
index fd582a21e..000000000
Binary files a/app/assets/images/buttons/service-icons/fb@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/tumblr@2x-white.png b/app/assets/images/buttons/service-icons/tumblr@2x-white.png
deleted file mode 100644
index 48ce0dc3c..000000000
Binary files a/app/assets/images/buttons/service-icons/tumblr@2x-white.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/tumblr@2x.png b/app/assets/images/buttons/service-icons/tumblr@2x.png
deleted file mode 100644
index 727615c46..000000000
Binary files a/app/assets/images/buttons/service-icons/tumblr@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/twitter@2x-white.png b/app/assets/images/buttons/service-icons/twitter@2x-white.png
deleted file mode 100644
index 7b6aec6a0..000000000
Binary files a/app/assets/images/buttons/service-icons/twitter@2x-white.png and /dev/null differ
diff --git a/app/assets/images/buttons/service-icons/twitter@2x.png b/app/assets/images/buttons/service-icons/twitter@2x.png
deleted file mode 100644
index d01096565..000000000
Binary files a/app/assets/images/buttons/service-icons/twitter@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/templates/Fridge@2x.png b/app/assets/images/buttons/templates/Fridge@2x.png
deleted file mode 100644
index 8b084f3d7..000000000
Binary files a/app/assets/images/buttons/templates/Fridge@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/templates/Typist@2x.png b/app/assets/images/buttons/templates/Typist@2x.png
deleted file mode 100644
index 533d0bc31..000000000
Binary files a/app/assets/images/buttons/templates/Typist@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/templates/Vanilla@2x.png b/app/assets/images/buttons/templates/Vanilla@2x.png
deleted file mode 100644
index 404255b51..000000000
Binary files a/app/assets/images/buttons/templates/Vanilla@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/templates/Wallpaper@2x.png b/app/assets/images/buttons/templates/Wallpaper@2x.png
deleted file mode 100644
index b134b15ab..000000000
Binary files a/app/assets/images/buttons/templates/Wallpaper@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/tumblr_hov@2x.png b/app/assets/images/buttons/tumblr_hov@2x.png
deleted file mode 100644
index a0ab89d68..000000000
Binary files a/app/assets/images/buttons/tumblr_hov@2x.png and /dev/null differ
diff --git a/app/assets/images/buttons/twitter_hov@2x.png b/app/assets/images/buttons/twitter_hov@2x.png
deleted file mode 100644
index 575450c44..000000000
Binary files a/app/assets/images/buttons/twitter_hov@2x.png and /dev/null differ
diff --git a/app/assets/images/down-tick-inset.png b/app/assets/images/down-tick-inset.png
deleted file mode 100644
index f3375c1c7..000000000
Binary files a/app/assets/images/down-tick-inset.png and /dev/null differ
diff --git a/app/assets/images/icons/arrow_down.png b/app/assets/images/icons/arrow_down.png
deleted file mode 100644
index 440b4c6f9..000000000
Binary files a/app/assets/images/icons/arrow_down.png and /dev/null differ
diff --git a/app/assets/images/icons/back_white.png b/app/assets/images/icons/back_white.png
deleted file mode 100644
index 67fef69ba..000000000
Binary files a/app/assets/images/icons/back_white.png and /dev/null differ
diff --git a/app/assets/images/icons/bookmark.png b/app/assets/images/icons/bookmark.png
deleted file mode 100644
index b0800f7ef..000000000
Binary files a/app/assets/images/icons/bookmark.png and /dev/null differ
diff --git a/app/assets/images/icons/check_yes_ok_lighter.png b/app/assets/images/icons/check_yes_ok_lighter.png
deleted file mode 100644
index f52a99f77..000000000
Binary files a/app/assets/images/icons/check_yes_ok_lighter.png and /dev/null differ
diff --git a/app/assets/images/icons/check_yes_ok_white.png b/app/assets/images/icons/check_yes_ok_white.png
deleted file mode 100644
index 8102575b1..000000000
Binary files a/app/assets/images/icons/check_yes_ok_white.png and /dev/null differ
diff --git a/app/assets/images/icons/coffee.png b/app/assets/images/icons/coffee.png
deleted file mode 100644
index 978cd2a38..000000000
Binary files a/app/assets/images/icons/coffee.png and /dev/null differ
diff --git a/app/assets/images/icons/comment_mobile_grey.png b/app/assets/images/icons/comment_mobile_grey.png
deleted file mode 100644
index 9053269aa..000000000
Binary files a/app/assets/images/icons/comment_mobile_grey.png and /dev/null differ
diff --git a/app/assets/images/icons/compose_mobile2.png b/app/assets/images/icons/compose_mobile2.png
deleted file mode 100644
index 90c0db535..000000000
Binary files a/app/assets/images/icons/compose_mobile2.png and /dev/null differ
diff --git a/app/assets/images/icons/create_participation.png b/app/assets/images/icons/create_participation.png
deleted file mode 100644
index 7496495b9..000000000
Binary files a/app/assets/images/icons/create_participation.png and /dev/null differ
diff --git a/app/assets/images/icons/deletelabel.png b/app/assets/images/icons/deletelabel.png
deleted file mode 100644
index b3e53ee3a..000000000
Binary files a/app/assets/images/icons/deletelabel.png and /dev/null differ
diff --git a/app/assets/images/icons/destroy_participation.png b/app/assets/images/icons/destroy_participation.png
deleted file mode 100644
index f13d187a6..000000000
Binary files a/app/assets/images/icons/destroy_participation.png and /dev/null differ
diff --git a/app/assets/images/icons/globe.png b/app/assets/images/icons/globe.png
deleted file mode 100644
index 6e8cdb50d..000000000
Binary files a/app/assets/images/icons/globe.png and /dev/null differ
diff --git a/app/assets/images/icons/heart.png b/app/assets/images/icons/heart.png
deleted file mode 100644
index 4e28f1220..000000000
Binary files a/app/assets/images/icons/heart.png and /dev/null differ
diff --git a/app/assets/images/icons/home_grey.png b/app/assets/images/icons/home_grey.png
deleted file mode 100644
index 91a8ef28d..000000000
Binary files a/app/assets/images/icons/home_grey.png and /dev/null differ
diff --git a/app/assets/images/icons/ignoreuser.png b/app/assets/images/icons/ignoreuser.png
deleted file mode 100644
index b02d62923..000000000
Binary files a/app/assets/images/icons/ignoreuser.png and /dev/null differ
diff --git a/app/assets/images/icons/list_white.png b/app/assets/images/icons/list_white.png
deleted file mode 100644
index 828528c18..000000000
Binary files a/app/assets/images/icons/list_white.png and /dev/null differ
diff --git a/app/assets/images/icons/mail.png b/app/assets/images/icons/mail.png
deleted file mode 100644
index 44b5eeea4..000000000
Binary files a/app/assets/images/icons/mail.png and /dev/null differ
diff --git a/app/assets/images/icons/mail_big.png b/app/assets/images/icons/mail_big.png
deleted file mode 100644
index c3e181789..000000000
Binary files a/app/assets/images/icons/mail_big.png and /dev/null differ
diff --git a/app/assets/images/icons/marker.png b/app/assets/images/icons/marker.png
deleted file mode 100644
index 992865329..000000000
Binary files a/app/assets/images/icons/marker.png and /dev/null differ
diff --git a/app/assets/images/icons/mention.png b/app/assets/images/icons/mention.png
deleted file mode 100644
index 234f7c2df..000000000
Binary files a/app/assets/images/icons/mention.png and /dev/null differ
diff --git a/app/assets/images/icons/message.png b/app/assets/images/icons/message.png
deleted file mode 100644
index a1f852f0c..000000000
Binary files a/app/assets/images/icons/message.png and /dev/null differ
diff --git a/app/assets/images/icons/monotone_add_plus.png b/app/assets/images/icons/monotone_add_plus.png
deleted file mode 100644
index ba6920a77..000000000
Binary files a/app/assets/images/icons/monotone_add_plus.png and /dev/null differ
diff --git a/app/assets/images/icons/monotone_check_yes.png b/app/assets/images/icons/monotone_check_yes.png
deleted file mode 100644
index 7bc542e46..000000000
Binary files a/app/assets/images/icons/monotone_check_yes.png and /dev/null differ
diff --git a/app/assets/images/icons/monotone_close_exit_delete.png b/app/assets/images/icons/monotone_close_exit_delete.png
deleted file mode 100644
index 097fe640c..000000000
Binary files a/app/assets/images/icons/monotone_close_exit_delete.png and /dev/null differ
diff --git a/app/assets/images/icons/monotone_email_letter_round.png b/app/assets/images/icons/monotone_email_letter_round.png
deleted file mode 100644
index a450fe25f..000000000
Binary files a/app/assets/images/icons/monotone_email_letter_round.png and /dev/null differ
diff --git a/app/assets/images/icons/monotone_pen_write.png b/app/assets/images/icons/monotone_pen_write.png
deleted file mode 100644
index 34a2fdffc..000000000
Binary files a/app/assets/images/icons/monotone_pen_write.png and /dev/null differ
diff --git a/app/assets/images/icons/monotone_plus_add_round.png b/app/assets/images/icons/monotone_plus_add_round.png
deleted file mode 100644
index 6b37aa3c2..000000000
Binary files a/app/assets/images/icons/monotone_plus_add_round.png and /dev/null differ
diff --git a/app/assets/images/icons/monotone_question.png b/app/assets/images/icons/monotone_question.png
deleted file mode 100644
index c7ffbe941..000000000
Binary files a/app/assets/images/icons/monotone_question.png and /dev/null differ
diff --git a/app/assets/images/icons/monotone_wrench_settings.png b/app/assets/images/icons/monotone_wrench_settings.png
deleted file mode 100644
index d8b8b26c0..000000000
Binary files a/app/assets/images/icons/monotone_wrench_settings.png and /dev/null differ
diff --git a/app/assets/images/icons/my_activity.png b/app/assets/images/icons/my_activity.png
deleted file mode 100644
index cba2cee8d..000000000
Binary files a/app/assets/images/icons/my_activity.png and /dev/null differ
diff --git a/app/assets/images/icons/padlock-closed.png b/app/assets/images/icons/padlock-closed.png
deleted file mode 100644
index 86a86a2d4..000000000
Binary files a/app/assets/images/icons/padlock-closed.png and /dev/null differ
diff --git a/app/assets/images/icons/padlock-open.png b/app/assets/images/icons/padlock-open.png
deleted file mode 100644
index c6e03924a..000000000
Binary files a/app/assets/images/icons/padlock-open.png and /dev/null differ
diff --git a/app/assets/images/icons/pencil.png b/app/assets/images/icons/pencil.png
deleted file mode 100644
index d2687a2eb..000000000
Binary files a/app/assets/images/icons/pencil.png and /dev/null differ
diff --git a/app/assets/images/icons/pencil_mobile_grey_mobile.png b/app/assets/images/icons/pencil_mobile_grey_mobile.png
deleted file mode 100644
index 5d4147ea0..000000000
Binary files a/app/assets/images/icons/pencil_mobile_grey_mobile.png and /dev/null differ
diff --git a/app/assets/images/icons/photo.png b/app/assets/images/icons/photo.png
deleted file mode 100644
index 6032a0cd0..000000000
Binary files a/app/assets/images/icons/photo.png and /dev/null differ
diff --git a/app/assets/images/icons/plus.png b/app/assets/images/icons/plus.png
deleted file mode 100644
index dfcbef3eb..000000000
Binary files a/app/assets/images/icons/plus.png and /dev/null differ
diff --git a/app/assets/images/icons/question.png b/app/assets/images/icons/question.png
deleted file mode 100644
index 93b34f1df..000000000
Binary files a/app/assets/images/icons/question.png and /dev/null differ
diff --git a/app/assets/images/icons/report.png b/app/assets/images/icons/report.png
deleted file mode 100644
index 9c5967969..000000000
Binary files a/app/assets/images/icons/report.png and /dev/null differ
diff --git a/app/assets/images/icons/search_grey.png b/app/assets/images/icons/search_grey.png
deleted file mode 100644
index e1b2b3b8b..000000000
Binary files a/app/assets/images/icons/search_grey.png and /dev/null differ
diff --git a/app/assets/images/icons/search_white.png b/app/assets/images/icons/search_white.png
deleted file mode 100644
index 7f35bc54a..000000000
Binary files a/app/assets/images/icons/search_white.png and /dev/null differ
diff --git a/app/assets/images/icons/user_grey.png b/app/assets/images/icons/user_grey.png
deleted file mode 100644
index 77af0b564..000000000
Binary files a/app/assets/images/icons/user_grey.png and /dev/null differ
diff --git a/app/assets/images/icons/users.png b/app/assets/images/icons/users.png
deleted file mode 100644
index a6558de97..000000000
Binary files a/app/assets/images/icons/users.png and /dev/null differ
diff --git a/app/assets/images/invalid_fat@2x.png b/app/assets/images/invalid_fat@2x.png
deleted file mode 100644
index cd69f1f9e..000000000
Binary files a/app/assets/images/invalid_fat@2x.png and /dev/null differ
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/landing/github.png b/app/assets/images/landing/github.png
deleted file mode 100644
index 4add94e4a..000000000
Binary files a/app/assets/images/landing/github.png and /dev/null differ
diff --git a/app/assets/images/landing/lock.png b/app/assets/images/landing/lock.png
deleted file mode 100644
index f6ffd4415..000000000
Binary files a/app/assets/images/landing/lock.png and /dev/null differ
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/landing/title.png b/app/assets/images/landing/title.png
deleted file mode 100644
index e34508b36..000000000
Binary files a/app/assets/images/landing/title.png and /dev/null differ
diff --git a/app/assets/images/landing/world.png b/app/assets/images/landing/world.png
deleted file mode 100644
index 0845b17e3..000000000
Binary files a/app/assets/images/landing/world.png and /dev/null differ
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/images/mocks/bp.jpeg b/app/assets/images/mocks/bp.jpeg
deleted file mode 100644
index 62221c6df..000000000
Binary files a/app/assets/images/mocks/bp.jpeg and /dev/null differ
diff --git a/app/assets/images/mocks/user_pic.jpeg b/app/assets/images/mocks/user_pic.jpeg
deleted file mode 100644
index dbb41e89c..000000000
Binary files a/app/assets/images/mocks/user_pic.jpeg and /dev/null differ
diff --git a/app/assets/images/pen_white.png b/app/assets/images/pen_white.png
deleted file mode 100644
index 54b5ab7c1..000000000
Binary files a/app/assets/images/pen_white.png and /dev/null differ
diff --git a/app/assets/images/services/facebook_sign_in.png b/app/assets/images/services/facebook_sign_in.png
deleted file mode 100644
index f3fb3d8ef..000000000
Binary files a/app/assets/images/services/facebook_sign_in.png and /dev/null differ
diff --git a/app/assets/images/services/twitter_sign_in.png b/app/assets/images/services/twitter_sign_in.png
deleted file mode 100644
index 89712f2b7..000000000
Binary files a/app/assets/images/services/twitter_sign_in.png and /dev/null differ
diff --git a/app/assets/images/signupimages@2x_mini.jpg b/app/assets/images/signupimages@2x_mini.jpg
deleted file mode 100644
index f437a34a2..000000000
Binary files a/app/assets/images/signupimages@2x_mini.jpg and /dev/null differ
diff --git a/app/assets/images/social_media_logos/Readme.txt b/app/assets/images/social_media_logos/Readme.txt
new file mode 100644
index 000000000..808890142
--- /dev/null
+++ b/app/assets/images/social_media_logos/Readme.txt
@@ -0,0 +1,3 @@
+Social Media Icons from https://github.com/paulrobertlloyd/socialmediaicons
+
+Licensed under a Creative Commons Attribution-Share Alike 3.0 license
diff --git a/app/assets/images/social_media_logos/email-16x16.png b/app/assets/images/social_media_logos/email-16x16.png
deleted file mode 100644
index 8cd731610..000000000
Binary files a/app/assets/images/social_media_logos/email-16x16.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/email-24x24.png b/app/assets/images/social_media_logos/email-24x24.png
deleted file mode 100644
index b52e19ed4..000000000
Binary files a/app/assets/images/social_media_logos/email-24x24.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/email-32x32.png b/app/assets/images/social_media_logos/email-32x32.png
deleted file mode 100644
index 8172cc530..000000000
Binary files a/app/assets/images/social_media_logos/email-32x32.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/email-48x48.png b/app/assets/images/social_media_logos/email-48x48.png
deleted file mode 100644
index a14a01ba5..000000000
Binary files a/app/assets/images/social_media_logos/email-48x48.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/facebook-48x48.png b/app/assets/images/social_media_logos/facebook-48x48.png
deleted file mode 100644
index 848b0d248..000000000
Binary files a/app/assets/images/social_media_logos/facebook-48x48.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/feed-16x16.png b/app/assets/images/social_media_logos/feed-16x16.png
deleted file mode 100644
index 5e34c13ad..000000000
Binary files a/app/assets/images/social_media_logos/feed-16x16.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/feed-24x24.png b/app/assets/images/social_media_logos/feed-24x24.png
deleted file mode 100644
index 9a621cf9f..000000000
Binary files a/app/assets/images/social_media_logos/feed-24x24.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/feed-32x32.png b/app/assets/images/social_media_logos/feed-32x32.png
deleted file mode 100644
index 04a1f090b..000000000
Binary files a/app/assets/images/social_media_logos/feed-32x32.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/feed-48x48.png b/app/assets/images/social_media_logos/feed-48x48.png
deleted file mode 100644
index 67d7b95cf..000000000
Binary files a/app/assets/images/social_media_logos/feed-48x48.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/tumblr-48x48.png b/app/assets/images/social_media_logos/tumblr-48x48.png
deleted file mode 100644
index 001556f37..000000000
Binary files a/app/assets/images/social_media_logos/tumblr-48x48.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/twitter-48x48.png b/app/assets/images/social_media_logos/twitter-48x48.png
deleted file mode 100644
index c1145e772..000000000
Binary files a/app/assets/images/social_media_logos/twitter-48x48.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/website-16x16.png b/app/assets/images/social_media_logos/website-16x16.png
deleted file mode 100644
index 76a9be1b1..000000000
Binary files a/app/assets/images/social_media_logos/website-16x16.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/website-24x24.png b/app/assets/images/social_media_logos/website-24x24.png
deleted file mode 100644
index 05062e6bf..000000000
Binary files a/app/assets/images/social_media_logos/website-24x24.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/website-32x32.png b/app/assets/images/social_media_logos/website-32x32.png
deleted file mode 100644
index c655f9b41..000000000
Binary files a/app/assets/images/social_media_logos/website-32x32.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/website-48x48.png b/app/assets/images/social_media_logos/website-48x48.png
deleted file mode 100644
index 0d33b7adf..000000000
Binary files a/app/assets/images/social_media_logos/website-48x48.png and /dev/null differ
diff --git a/app/assets/images/social_media_logos/wordpress-48x48.png b/app/assets/images/social_media_logos/wordpress-48x48.png
deleted file mode 100644
index 2a70897a8..000000000
Binary files a/app/assets/images/social_media_logos/wordpress-48x48.png and /dev/null differ
diff --git a/app/assets/images/texture/hatched-dark.png b/app/assets/images/texture/hatched-dark.png
deleted file mode 100644
index 1ab8861c9..000000000
Binary files a/app/assets/images/texture/hatched-dark.png and /dev/null differ
diff --git a/app/assets/images/texture/light-bg.png b/app/assets/images/texture/light-bg.png
deleted file mode 100644
index a21195356..000000000
Binary files a/app/assets/images/texture/light-bg.png and /dev/null differ
diff --git a/app/assets/images/texture/paper.jpg b/app/assets/images/texture/paper.jpg
deleted file mode 100644
index 4343fd866..000000000
Binary files a/app/assets/images/texture/paper.jpg and /dev/null differ
diff --git a/app/assets/images/texture/typist.png b/app/assets/images/texture/typist.png
deleted file mode 100644
index c0486789e..000000000
Binary files a/app/assets/images/texture/typist.png and /dev/null differ
diff --git a/app/assets/images/texture/vanilla.jpg b/app/assets/images/texture/vanilla.jpg
deleted file mode 100644
index 0d0c9746c..000000000
Binary files a/app/assets/images/texture/vanilla.jpg and /dev/null differ
diff --git a/app/assets/images/tipsy.gif b/app/assets/images/tipsy.gif
deleted file mode 100644
index 74eebae2d..000000000
Binary files a/app/assets/images/tipsy.gif and /dev/null differ
diff --git a/app/assets/images/up-tick-inset.png b/app/assets/images/up-tick-inset.png
deleted file mode 100644
index cef889e20..000000000
Binary files a/app/assets/images/up-tick-inset.png and /dev/null differ
diff --git a/app/assets/images/user/angela.jpg b/app/assets/images/user/angela.jpg
deleted file mode 100644
index ee7516050..000000000
Binary files a/app/assets/images/user/angela.jpg and /dev/null differ
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"