diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java
index 92d0d8972112e35a8661de0d66a074c36fd23ffd..aa91251d633e5796b492659aed2d7c5adbd2085e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java
@@ -25,11 +25,6 @@ public abstract class BrandedActivity extends AppCompatActivity implements Brand
     @ColorInt
     protected int colorAccent;
 
-    public static void applyBrandToFAB(@ColorInt int mainColor, @ColorInt int textColor, @NonNull FloatingActionButton fab) {
-        fab.setSupportBackgroundTintList(ColorStateList.valueOf(mainColor));
-        fab.setColorFilter(textColor);
-    }
-
     @Override
     protected void onStart() {
         super.onStart();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java
index 0fc3dcc96c94fc12414a7551e7834aaf7d06fa78..91fb0f6bf5f3ed20a444e109db3d7763c75efcee 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java
@@ -295,7 +295,5 @@ public abstract class SearchableBaseNoteFragment extends BaseNoteFragment {
     public void applyBrand(int mainColor, int textColor) {
         this.mainColor = mainColor;
         this.textColor = textColor;
-        BrandedActivity.applyBrandToFAB(mainColor, textColor, getSearchPrevButton());
-        BrandedActivity.applyBrandToFAB(mainColor, textColor, getSearchNextButton());
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java
index 649d4b0c429de102c9f8a0f91db2ed22deb2f692..1f5143665266d00e5c8a52198ea9b8ca5bf708c6 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java
@@ -60,6 +60,7 @@ public class ImportAccountActivity extends AppCompatActivity {
         binding.welcomeText.setText(getString(R.string.welcome_text, getString(R.string.app_name)));
         binding.addButton.setOnClickListener((v) -> {
             binding.addButton.setEnabled(false);
+            binding.addButton.setVisibility(View.INVISIBLE);
             binding.status.setVisibility(View.GONE);
             try {
                 AccountImporter.pickNewAccount(this);
@@ -70,6 +71,7 @@ public class ImportAccountActivity extends AppCompatActivity {
                 e.printStackTrace();
             } catch (AndroidGetAccountsPermissionNotGranted e) {
                 binding.addButton.setEnabled(true);
+                binding.addButton.setVisibility(View.VISIBLE);
                 AccountImporter.requestAndroidAccountPermissionsAndPickAccount(this);
             }
         });
@@ -171,6 +173,7 @@ public class ImportAccountActivity extends AppCompatActivity {
     private void restoreCleanState() {
         runOnUiThread(() -> {
             binding.addButton.setEnabled(true);
+            binding.addButton.setVisibility(View.VISIBLE);
             binding.progressCircular.setVisibility(View.GONE);
             binding.progressText.setVisibility(View.GONE);
         });
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
index 00d54c48ff6341b339c25fe1c2f17eb15edce1e7..ebdfaa795ec5f6503d38bf2cb2e4aed9196d202b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
@@ -595,7 +595,6 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A
     @Override
     public void applyBrand(int mainColor, int textColor) {
         applyBrandToPrimaryToolbar(activityBinding.appBar, activityBinding.searchToolbar);
-        applyBrandToFAB(mainColor, textColor, activityBinding.fabCreate);
 
         binding.headerView.setBackgroundColor(mainColor);
         binding.appName.setTextColor(textColor);
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up_white_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up_white_24dp.xml
index e0c3e9012ab4477432d2020f95d9c4c75ab4c287..b63f2c5e382d5667cde48a6f4bf213ef4fd1bef1 100644
--- a/app/src/main/res/drawable/ic_keyboard_arrow_up_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_up_white_24dp.xml
@@ -1,11 +1,10 @@
-<vector android:autoMirrored="true"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportHeight="24.0"
+    android:autoMirrored="true"
     android:viewportWidth="24.0"
-    android:width="24dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFF"
         android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z" />
 </vector>
diff --git a/app/src/main/res/layout/fragment_note_edit.xml b/app/src/main/res/layout/fragment_note_edit.xml
index 9a48837429af198091f8ef51902483a33f98572d..eebd5a02b96897e09265e600977b1445784f134b 100644
--- a/app/src/main/res/layout/fragment_note_edit.xml
+++ b/app/src/main/res/layout/fragment_note_edit.xml
@@ -50,6 +50,7 @@
         android:visibility="gone"
         app:backgroundTint="@color/defaultBrand"
         app:srcCompat="@drawable/ic_keyboard_arrow_up_white_24dp"
+        android:tint="@color/e_background"
         tools:visibility="visible" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/layout/fragment_note_preview.xml b/app/src/main/res/layout/fragment_note_preview.xml
index 4fd7d09f74e108f63b39432d19fcd07e3f9f5c69..93a2f3de7c8069377e05abd09a115fde0191949a 100644
--- a/app/src/main/res/layout/fragment_note_preview.xml
+++ b/app/src/main/res/layout/fragment_note_preview.xml
@@ -46,6 +46,7 @@
         android:translationY="-56dp"
         android:visibility="gone"
         app:backgroundTint="@color/defaultBrand"
+        android:tint="@color/e_background"
         app:srcCompat="@drawable/ic_keyboard_arrow_up_white_24dp"
         tools:visibility="visible" />