diff --git a/app/src/main/java/com/kabouzeid/gramophone/views/SquareFitImageView.java b/app/src/main/java/com/kabouzeid/gramophone/views/SquareFitImageView.java
new file mode 100644
index 00000000..04d6b7ad
--- /dev/null
+++ b/app/src/main/java/com/kabouzeid/gramophone/views/SquareFitImageView.java
@@ -0,0 +1,31 @@
+package com.kabouzeid.gramophone.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class SquareFitImageView extends ImageView {
+
+    public SquareFitImageView(Context context) {
+        super(context);
+    }
+
+    public SquareFitImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SquareFitImageView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        final int newWidth = Math.min(widthMeasureSpec, heightMeasureSpec);
+        //noinspection SuspiciousNameCombination
+        super.onMeasure(newWidth, newWidth);
+    }
+
+}
diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml
index a8fd61c7..23d80189 100644
--- a/app/src/main/res/layout/activity_album_detail.xml
+++ b/app/src/main/res/layout/activity_album_detail.xml
@@ -3,14 +3,20 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/album_art"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/header_image_height"
-        android:scaleType="centerCrop"
-        android:src="@drawable/default_album_art"
-        android:transitionName="@string/transition_album_cover"
-        tools:ignore="ContentDescription,UnusedAttribute" />
+        android:layout_height="@dimen/header_image_height">
+
+        <com.kabouzeid.gramophone.views.SquareFitImageView
+            android:id="@+id/album_art"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:scaleType="centerCrop"
+            android:src="@drawable/default_album_art"
+            android:transitionName="@string/transition_album_cover"
+            tools:ignore="ContentDescription,UnusedAttribute" />
+    </FrameLayout>
 
     <View
         android:id="@+id/list_background"