diff --git a/app/views/devise/mailer/confirmation_instructions.haml b/app/views/devise/mailer/confirmation_instructions.haml
index 9b8214edd9bc3e07cfb37117b3a14b4f37c228f2..fb7b8877594294a3a038330418495314f4b2a4a9 100644
--- a/app/views/devise/mailer/confirmation_instructions.haml
+++ b/app/views/devise/mailer/confirmation_instructions.haml
@@ -5,7 +5,7 @@
     = render :partial => 'notifier/notifier_css'
   %body
     %header
-      = image_tag('branding/diaspora_white.png')
+      = image_tag('branding/white.png')
     #container
       %p
         = t('devise.mailer.welcome', :email => @resource.email)
diff --git a/app/views/devise/mailer/reset_password_instructions.haml b/app/views/devise/mailer/reset_password_instructions.haml
index 0204a0b727f18eecef4323dd442c21675cb0f651..58edc94078030603eaa29ca645ffa1984d9ea805 100644
--- a/app/views/devise/mailer/reset_password_instructions.haml
+++ b/app/views/devise/mailer/reset_password_instructions.haml
@@ -5,7 +5,7 @@
     = render :partial => 'notifier/notifier_css'
   %body
     %header
-      = image_tag('branding/diaspora_white.png')
+      = image_tag('branding/white.png')
     #container
       %p
         = t('devise.mailer.hello', :email => @resource.email)
diff --git a/app/views/devise/mailer/unlock_instructions.haml b/app/views/devise/mailer/unlock_instructions.haml
index 40344a076ec2dc310bb8d6fb49c4d11d0f11d3c6..8cdd6038eac75454c426afbf500ae8aaad9a046d 100644
--- a/app/views/devise/mailer/unlock_instructions.haml
+++ b/app/views/devise/mailer/unlock_instructions.haml
@@ -5,7 +5,7 @@
     = render :partial => 'notifier/notifier_css'
   %body
     %header
-      = image_tag('branding/diaspora_white.png')
+      = image_tag('branding/white.png')
     #container
       %p
         = t('devise.mailer.hello', :email => @resource.email)
diff --git a/features/support/env.rb b/features/support/env.rb
index 2842b175ec738e6f1a972a1448e85aa8b4d8d7e9..d88e6ffcc61cc6861e2a9f56518b0a7a1e31cc75 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -101,11 +101,11 @@ Spork.each_run do
   end
 end
 
-# https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection
-require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "deferred_garbage_collection")
-Before do
-  DeferredGarbageCollection.start
-end
-After do
-  DeferredGarbageCollection.reconsider 
-end
+# # https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection
+# require File.join(File.dirname(__FILE__), "..", "..", "spec", "support", "deferred_garbage_collection")
+# Before do
+#   DeferredGarbageCollection.start
+# end
+# After do
+#   DeferredGarbageCollection.reconsider 
+# end