diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt
index 28c1f65f7..3c494cd96 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt
@@ -59,7 +59,9 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        (layoutParams as CoordinatorLayout.LayoutParams).behavior = Behavior(context)
+        if (!isInEditMode) {
+            (layoutParams as CoordinatorLayout.LayoutParams).behavior = Behavior(context)
+        }
     }
 
     private fun findTitleView(): TextView {
diff --git a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt
index f57d35968..f2858479c 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt
@@ -255,7 +255,7 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
     }
 
     private fun getCornerRadiusRes() =
-        if (uiSettings.roundMode) {
+        if (!isInEditMode && uiSettings.roundMode) {
             SIZING_CORNER_RADII[sizing]
         } else {
             null
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/IconToolbar.kt b/app/src/main/java/org/oxycblt/auxio/ui/IconToolbar.kt
new file mode 100644
index 000000000..39167f751
--- /dev/null
+++ b/app/src/main/java/org/oxycblt/auxio/ui/IconToolbar.kt
@@ -0,0 +1,4 @@
+package org.oxycblt.auxio.ui
+
+class IconToolbar {
+}
\ No newline at end of file