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 d13760cb..cb973303 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
@@ -2,9 +2,7 @@ package com.kabouzeid.gramophone.ui.activities;
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -15,7 +13,6 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.text.Html;
 import android.text.Spanned;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -30,8 +27,6 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import com.github.ksoichiro.android.observablescrollview.ObservableRecyclerView;
-import com.kabouzeid.appthemehelper.ATH;
-import com.kabouzeid.appthemehelper.util.ATHUtil;
 import com.kabouzeid.appthemehelper.util.ColorUtil;
 import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
 import com.kabouzeid.gramophone.R;
@@ -61,9 +56,8 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.Util;
 
-import java.util.Locale;
-
 import java.util.ArrayList;
+import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -151,12 +145,13 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
             scrollY += headerViewHeight;
 
             // Change alpha of overlay
-            float headerAlpha = Math.max(0, Math.min(1, (float) 2*scrollY/headerViewHeight));
+            float headerAlpha = Math.max(0, Math.min(1, (float) 2 * scrollY / headerViewHeight));
             headerOverlay.setBackgroundColor(ColorUtil.withAlpha(toolbarColor, headerAlpha));
 
             // Translate name text
             headerView.setTranslationY(Math.max(-scrollY, -headerViewHeight));
             headerOverlay.setTranslationY(Math.max(-scrollY, -headerViewHeight));
+            albumArtImageView.setTranslationY(Math.max(-scrollY, -headerViewHeight));
         }
     };
 
diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml
index 9b98faa8..fe367e55 100644
--- a/app/src/main/res/layout/activity_album_detail.xml
+++ b/app/src/main/res/layout/activity_album_detail.xml
@@ -45,13 +45,7 @@
                 android:dividerHeight="0dp"
                 android:scrollbars="none" />
 
-            <View
-                android:id="@+id/header_overlay"
-                android:elevation="@dimen/toolbar_elevation"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/title_view_height" />
-
-            <LinearLayout
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
@@ -65,15 +59,11 @@
                     android:orientation="horizontal"
                     tools:ignore="UnusedAttribute">
 
-                    <ImageView
-                        android:id="@+id/image"
+                    <!--placeholder image view, the actual image view can't go here or the shared element transition won't work right-->
+                    <View
                         android:layout_width="144dp"
                         android:layout_height="144dp"
-                        android:layout_margin="16dp"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/default_album_art"
-                        android:transitionName="@string/transition_album_art"
-                        tools:ignore="ContentDescription,UnusedAttribute" />
+                        android:layout_margin="16dp" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -211,7 +201,24 @@
                     android:layout_height="match_parent"
                     android:background="@android:color/transparent" />
 
-            </LinearLayout>
+            </FrameLayout>
+
+            <ImageView
+                android:id="@+id/image"
+                android:layout_width="144dp"
+                android:layout_height="144dp"
+                android:layout_margin="16dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/default_album_art"
+                android:transitionName="@string/transition_album_art"
+                tools:ignore="ContentDescription,UnusedAttribute" />
+
+            <View
+                android:id="@+id/header_overlay"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/title_view_height"
+                android:elevation="@dimen/toolbar_elevation"
+                tools:ignore="UnusedAttribute" />
         </FrameLayout>
 
     </LinearLayout>