diff --git a/Changelog.md b/Changelog.md
index ed677e59d1a9fcd1b821ff071f758b6a7d966824..c68b38c28245a6f49d5bce81c9143b6fbfe0df3f 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 7339202e57483635758ddb1dc3868cd2c76287b9..0000000000000000000000000000000000000000
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 0b22962be06ae905faabde36ffde7843b3fb7510..0000000000000000000000000000000000000000
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 8727d08e9ba3ecd017b3510bd37d5e7b68f9ea08..2620237185134011577025a744175d7e5ea7c0ec 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 f6eb1051e9195d710ff46fcc94c1958fe8d849ac..bf5d4de8f4611933c0e0b3625a970d9b92e0297d 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 1e07061251f0ddc1bfdce94b4c55f616e6d18974..d90787b1de0c0d14e5adca5f5939e75f76d26050 100644
--- a/public/500.html
+++ b/public/500.html
@@ -34,7 +34,7 @@
 <body>
   <!-- This file lives in public/500.html -->
   <header>
-		<img id="diaspora_logo" src="/assets/branding/logo_large.png"/>
+		<img id="diaspora_logo" src="/assets/branding/white2x.png"/>
   </header>
 
 	<h1>