diff --git a/Changelog.md b/Changelog.md
index ed677e59d..c68b38c28 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -20,6 +20,7 @@
* Don't show hovercards for current user in comments [#3999](https://github.com/diaspora/diaspora/issues/3999)
* Replace mentions of out-of-aspect people with markdown links [#4161](https://github.com/diaspora/diaspora/pull/4161)
* Unify hide and ignore [#3828](https://github.com/diaspora/diaspora/issues/3828)
+* Remove alpha branding [#4196](https://github.com/diaspora/diaspora/issues/4196)
## Features
diff --git a/app/assets/images/branding/logo_large.png b/app/assets/images/branding/logo_large.png
deleted file mode 100644
index 7339202e5..000000000
Binary files a/app/assets/images/branding/logo_large.png and /dev/null differ
diff --git a/app/assets/images/branding/logo_small.png b/app/assets/images/branding/logo_small.png
deleted file mode 100644
index 0b22962be..000000000
Binary files a/app/assets/images/branding/logo_small.png and /dev/null differ
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 8727d08e9..262023718 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -153,10 +153,6 @@ header
:display inline-block
:margin-top 5px
- .branding-logo_small
- :height 16px
- :width 161px
-
a
:color #CCC
:color rgb(147,147,147)
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index f6eb1051e..bf5d4de8f 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 => 'branding-logo_small'), root_path
+ = link_to content_tag(:div, nil, :class => 'diaspora_header_logo branding-header-logo'), root_path
%ul#landing_nav
%li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
diff --git a/public/500.html b/public/500.html
index 1e0706125..d90787b1d 100644
--- a/public/500.html
+++ b/public/500.html
@@ -34,7 +34,7 @@
- 
+ 