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 3d862723..02c9a422 100644
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -1,9 +1,9 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true">
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:focusable="true"
+             android:focusableInTouchMode="true">
 
     <com.github.ksoichiro.android.observablescrollview.ObservableScrollView
         android:id="@+id/observableScrollView"
@@ -54,6 +54,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/header"
+                android:background="?android:attr/colorBackground"
                 android:orientation="vertical"
                 android:padding="16dp">
 
@@ -151,8 +152,8 @@
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
         style="@style/Toolbar"
-        android:gravity="start|left"
         android:background="#00000000"
+        android:gravity="start|left"
         tools:ignore="RtlHardcoded" />
 
     <com.melnykov.fab.FloatingActionButton
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index c31c9ce1..317f4317 100644
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -1,9 +1,9 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true">
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:focusable="true"
+             android:focusableInTouchMode="true">
 
     <com.github.ksoichiro.android.observablescrollview.ObservableScrollView
         android:id="@+id/observableScrollView"
@@ -68,6 +68,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/header"
+                android:background="?android:attr/colorBackground"
                 android:orientation="vertical"
                 android:padding="16dp">
 
@@ -107,9 +108,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:fontFamily="sans-serif"
+                        android:inputType="text|textCapWords"
                         android:singleLine="true"
                         android:text="@string/genre"
-                        android:inputType="text|textCapWords"
                         android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
 
                     <com.kabouzeid.gramophone.views.DynamicEditText