diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index 5aa9e2bc..f2903b27 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -173,7 +173,6 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
         recyclerView = (ObservableRecyclerView) findViewById(R.id.list);
         albumTitleView = (TextView) findViewById(R.id.album_title);
         songsBackgroundView = findViewById(R.id.list_background);
-//        statusBar = findViewById(R.id.status_bar);
     }
 
     private void setUpObservableListViewParams() {
@@ -301,6 +300,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
 
     private void setUpToolBar() {
         setSupportActionBar(toolbar);
+        //noinspection ConstantConditions
         getSupportActionBar().setTitle(null);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
index 1b8d57e5..41b0e0d9 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
@@ -79,7 +79,6 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
                 alpha = 1;
             }
             ViewUtil.setBackgroundAlpha(toolBar, alpha, paletteColorPrimary);
-            ViewUtil.setBackgroundAlpha(header, alpha, paletteColorPrimary);
             image.setTranslationY(scrollY / 2);
         }
     };
@@ -126,12 +125,6 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
 
     private void setUpScrollView() {
         scrollView.setScrollViewCallbacks(observableScrollViewCallbacks);
-        scrollView.post(new Runnable() {
-            @Override
-            public void run() {
-                scrollView.scrollVerticallyTo(headerVariableSpace / 2);
-            }
-        });
     }
 
     private void setUpImageView() {
@@ -199,10 +192,11 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
         final int primaryColor = PreferenceUtils.getInstance(this).getThemeColorPrimary();
         paletteColorPrimary = primaryColor;
         observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false);
-        setStatusBarColor(primaryColor);
+        setStatusBarColor(paletteColorPrimary);
         if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(this).coloredNavigationBarTagEditorEnabled())
-            setNavigationBarColor(primaryColor);
-        notifyTaskColorChange(primaryColor);
+            setNavigationBarColor(paletteColorPrimary);
+        header.setBackgroundColor(paletteColorPrimary);
+        notifyTaskColorChange(paletteColorPrimary);
     }
 
     private void getIntentExtras() {
@@ -287,7 +281,6 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
     private void applyPalette(final Bitmap bitmap) {
         Palette.from(bitmap)
                 .generate(new Palette.PaletteAsyncListener() {
-
                     @Override
                     public void onGenerated(Palette palette) {
                         final Palette.Swatch vibrantSwatch = palette.getVibrantSwatch();
@@ -295,10 +288,11 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
                             final int vibrantColor = palette.getVibrantColor(DialogUtils.resolveColor(AbsTagEditorActivity.this, R.attr.default_bar_color));
                             paletteColorPrimary = vibrantColor;
                             observableScrollViewCallbacks.onScrollChanged(scrollView.getCurrentScrollY(), false, false);
-                            setStatusBarColor(vibrantColor);
+                            setStatusBarColor(paletteColorPrimary);
                             if (Util.isAtLeastLollipop() && PreferenceUtils.getInstance(AbsTagEditorActivity.this).coloredNavigationBarTagEditorEnabled())
-                                setNavigationBarColor(vibrantColor);
-                            notifyTaskColorChange(vibrantColor);
+                                setNavigationBarColor(paletteColorPrimary);
+                            header.setBackgroundColor(paletteColorPrimary);
+                            notifyTaskColorChange(paletteColorPrimary);
                         } else {
                             resetColors();
                         }
@@ -318,7 +312,6 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
     protected void writeValuesToFiles(final Map<FieldKey, String> fieldKeyValueMap, final Artwork artwork, final boolean deleteArtwork) {
         Util.hideSoftKeyboard(this);
         final String writingFileStr = getResources().getString(R.string.writing_file_number);
-        //TODO dialog currently disappears on orientation change and using DialogFragment causes an exception for some reason
         final MaterialDialog progressDialog = new MaterialDialog.Builder(AbsTagEditorActivity.this)
                 .title(R.string.saving_changes)
                 .cancelable(false)
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index f9090141..0a09a142 100644
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -26,7 +26,6 @@
                 android:id="@+id/header"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignBottom="@+id/image"
                 android:elevation="@dimen/toolbar_elevation"
                 android:minHeight="@dimen/title_view_height"
                 android:orientation="vertical"
@@ -34,7 +33,8 @@
                 android:paddingLeft="16dp"
                 android:paddingRight="16dp"
                 android:paddingTop="8dp"
-                tools:ignore="UnusedAttribute">
+                tools:ignore="UnusedAttribute"
+                android:layout_below="@+id/image">
 
                 <android.support.design.widget.TextInputLayout
                     android:layout_width="match_parent"