2 files changed, 14 insertions, 20 deletions

diff --git a/adapter/src/main/res/layout/kau_iitem_card.xml b/adapter/src/main/res/layout/kau_iitem_card.xml
index 621da2e..249f3b8 100644
--- a/adapter/src/main/res/layout/kau_iitem_card.xml
+++ b/adapter/src/main/res/layout/kau_iitem_card.xml
@@ -8,29 +8,27 @@
     android:id="@+id/kau_card_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/kau_padding_normal"
     android:background="?android:selectableItemBackground"
     android:minHeight="?android:listPreferredItemHeight">
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/kau_padding_normal"
-        android:paddingEnd="@dimen/kau_padding_normal"
-        android:paddingTop="@dimen/kau_padding_normal">
+        android:padding="@dimen/kau_padding_normal">
 
         <ImageView
             android:id="@+id/kau_card_image"
-            android:layout_width="@dimen/kau_avatar_bounds"
-            android:layout_height="@dimen/kau_avatar_bounds"
-            android:layout_marginEnd="@dimen/kau_avatar_margin"
-            android:layout_marginStart="@dimen/kau_avatar_margin"
-            android:padding="@dimen/kau_avatar_padding"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
+            android:paddingEnd="32dp"
             android:scaleType="fitCenter"
             android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0" />
 
         <TextView
             android:id="@+id/kau_card_title"
@@ -39,37 +37,34 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/kau_card_image"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_goneMarginStart="@dimen/kau_padding_normal" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/kau_card_description"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/kau_card_image"
-            app:layout_constraintTop_toBottomOf="@id/kau_card_title"
-            app:layout_goneMarginStart="@dimen/kau_padding_normal" />
+            app:layout_constraintTop_toBottomOf="@id/kau_card_title" />
 
         <LinearLayout
             android:id="@+id/kau_card_bottom_row"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/kau_card_image"
-            app:layout_constraintTop_toBottomOf="@id/kau_card_description"
-            app:layout_goneMarginStart="@dimen/kau_padding_normal">
+            app:layout_constraintTop_toBottomOf="@id/kau_card_description">
 
             <Button
                 android:id="@+id/kau_card_button"
                 style="?android:borderlessButtonStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/kau_spacing_normal"
                 android:textColor="?attr/colorAccent" />
 
         </LinearLayout>
diff --git a/adapter/src/main/res/layout/kau_iitem_header.xml b/adapter/src/main/res/layout/kau_iitem_header.xml
index fa5a595..db809eb 100644
--- a/adapter/src/main/res/layout/kau_iitem_header.xml
+++ b/adapter/src/main/res/layout/kau_iitem_header.xml
@@ -3,7 +3,6 @@
     android:id="@+id/kau_header_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/kau_padding_normal"
     android:orientation="vertical">
 
     <TextView