diff --git a/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
index 03da2312..deefcfda 100644
--- a/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
@@ -3,6 +3,7 @@ package net.vonforst.evmap.ui
 import android.content.Context
 import android.content.res.ColorStateList
 import android.view.View
+import android.view.ViewGroup.MarginLayoutParams
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
@@ -16,6 +17,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import net.vonforst.evmap.api.goingelectric.Chargepoint
+import kotlin.math.roundToInt
 
 
 @BindingAdapter("goneUnless")
@@ -119,6 +121,16 @@ fun setHtmlTextValue(textView: TextView, htmlText: String?) {
     }
 }
 
+@BindingAdapter("android:layout_marginTop")
+fun setTopMargin(view: View, topMargin: Float) {
+    val layoutParams = view.layoutParams as MarginLayoutParams
+    layoutParams.setMargins(
+        layoutParams.leftMargin, topMargin.roundToInt(),
+        layoutParams.rightMargin, layoutParams.bottomMargin
+    )
+    view.layoutParams = layoutParams
+}
+
 private fun availabilityColor(
     status: List<ChargepointStatus>?,
     context: Context
diff --git a/app/src/main/res/layout/item_detail_openinghours.xml b/app/src/main/res/layout/item_detail_openinghours.xml
index b0f26ba0..844b198e 100644
--- a/app/src/main/res/layout/item_detail_openinghours.xml
+++ b/app/src/main/res/layout/item_detail_openinghours.xml
@@ -80,11 +80,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
+            app:dayOfWeek="@{DayOfWeek.MONDAY}"
             app:goneUnless="@{expandToggle.checked}"
             app:hours="@{item.hoursDays}"
-            app:dayOfWeek="@{DayOfWeek.MONDAY}"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
             app:layout_constraintTop_toBottomOf="@+id/textView8" />
 
         <include
@@ -98,7 +98,7 @@
             app:dayOfWeek="@{DayOfWeek.TUESDAY}"
             app:hours="@{item.hoursDays}"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
             app:layout_constraintTop_toBottomOf="@id/hours_mon" />
 
         <include
@@ -112,7 +112,7 @@
             app:dayOfWeek="@{DayOfWeek.WEDNESDAY}"
             app:hours="@{item.hoursDays}"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
             app:layout_constraintTop_toBottomOf="@id/hours_tue" />
 
         <include
@@ -126,7 +126,7 @@
             app:dayOfWeek="@{DayOfWeek.THURSDAY}"
             app:hours="@{item.hoursDays}"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
             app:layout_constraintTop_toBottomOf="@id/hours_wed" />
 
         <include
@@ -140,7 +140,7 @@
             app:dayOfWeek="@{DayOfWeek.FRIDAY}"
             app:hours="@{item.hoursDays}"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
             app:layout_constraintTop_toBottomOf="@id/hours_thu" />
 
         <include
@@ -154,7 +154,7 @@
             app:dayOfWeek="@{DayOfWeek.SATURDAY}"
             app:hours="@{item.hoursDays}"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
             app:layout_constraintTop_toBottomOf="@id/hours_fri" />
 
         <include
@@ -168,7 +168,7 @@
             app:dayOfWeek="@{DayOfWeek.SUNDAY}"
             app:hours="@{item.hoursDays}"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
             app:layout_constraintTop_toBottomOf="@id/hours_sat" />
 
         <include
@@ -184,19 +184,19 @@
             app:hours="@{item.hoursDays}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/textView8"
+            app:layout_constraintStart_toStartOf="@+id/textView9"
             app:layout_constraintTop_toBottomOf="@id/hours_sun" />
 
         <ToggleButton
             android:id="@+id/expandToggle"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@{item.detailText != null ? @dimen/expand_toggle_padding_large : @dimen/expand_toggle_padding_small}"
             android:layout_marginEnd="16dp"
             android:background="@drawable/expand_toggle"
+            android:onClick="@{() -> TransitionManager.beginDelayedTransition(container)}"
             android:textOff=""
             android:textOn=""
-            android:onClick="@{() -> TransitionManager.beginDelayedTransition(container)}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 98f7eca5..43e8a5e2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,4 +5,6 @@
     <dimen name="gallery_height_with_margin">208dp</dimen>
     <dimen name="detail_corner_radius">8dp</dimen>
     <dimen name="detail_corner_radius_negative">-8dp</dimen>
+    <dimen name="expand_toggle_padding_large">16dp</dimen>
+    <dimen name="expand_toggle_padding_small">8dp</dimen>
 </resources>
\ No newline at end of file