diff --git a/.gitignore b/.gitignore
index 1e6cf62bc..c6384487a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 #trademark sillyness
 app/views/home/_show.html.haml
 app/views/home/_show.mobile.haml
-#
+public/images/ball_small.png
+public/images/ball.png
 # Configuration files
 config/app_config.yml
 config/fb_config.yml
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 715afaffe..5055c4013 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -5,9 +5,9 @@
 .container#head{:style => "position:relative;"}
 
   - if current_user
-    = link_to image_tag('diaspora_logo_small.png', :height => "16px", :width => "161px", :class => "diaspora_header_logo"), root_path
+    = link_to image_tag('logo_small.png', :height => "16px", :width => "161px", :class => "diaspora_header_logo"), root_path
   - else
-    = link_to image_tag('diaspora_logo_large.png', :height => "32px", :width => "321px", :class => "diaspora_header_logo"), root_path
+    = link_to image_tag('logo_large.png', :height => "32px", :width => "321px", :class => "diaspora_header_logo"), root_path
 
   - if !current_user 
     .right
diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml
index bf82adc4d..48eff6949 100644
--- a/app/views/layouts/application.mobile.haml
+++ b/app/views/layouts/application.mobile.haml
@@ -21,6 +21,6 @@
 
   %body
     %div{:data => {:role => 'header', :nobackbtn => 'true'}}
-      = link_to image_tag('diaspora_logo_large.png', :height => "32px", :width => "321px", :class => "diaspora_header_logo"), root_path
+      = link_to image_tag('logo_large.png', :height => "32px", :width => "321px", :class => "diaspora_header_logo"), root_path
     #content{:data => {:role => 'page', :theme => "b"}}
-      = yield
\ No newline at end of file
+      = yield
diff --git a/public/images/logo_caps.png b/public/images/logo_caps.png
new file mode 100644
index 000000000..139adaec0
Binary files /dev/null and b/public/images/logo_caps.png differ
diff --git a/public/images/logo_large.png b/public/images/logo_large.png
new file mode 100644
index 000000000..54a843a0f
Binary files /dev/null and b/public/images/logo_large.png differ
diff --git a/public/images/logo_small.png b/public/images/logo_small.png
new file mode 100644
index 000000000..606e1edeb
Binary files /dev/null and b/public/images/logo_small.png differ
diff --git a/public/images/white.png b/public/images/white.png
new file mode 100644
index 000000000..2a7260ea4
Binary files /dev/null and b/public/images/white.png differ
diff --git a/public/images/white_on_grey.png b/public/images/white_on_grey.png
new file mode 100644
index 000000000..6213e0671
Binary files /dev/null and b/public/images/white_on_grey.png differ