diff --git a/src/main/res/layout/pass_list_item.xml b/src/main/res/layout/pass_list_item.xml
index fc36d51d..d9b46e49 100644
--- a/src/main/res/layout/pass_list_item.xml
+++ b/src/main/res/layout/pass_list_item.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <LinearLayout
+    <android.support.v7.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
@@ -15,54 +15,7 @@
         android:background="@drawable/box_bg"
         android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
 
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:src="@drawable/ic_launcher" />
-
-            <LinearLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-
-                    android:paddingRight="3dp"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="?android:textColorSecondary"
-                    tools:text="12.10.2013 17:00" />
-
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="3dp"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    tools:text="Title" />
-
-            </LinearLayout>
-
-            <org.ligi.passandroid.ui.views.CategoryIndicatorView
-                android:id="@+id/categoryView"
-                android:layout_width="48dp"
-                android:layout_height="74dp"
-                android:layout_gravity="center" />
-            <!-- <include layout="@layout/category_indicator" /> -->
-        </LinearLayout>
 
 
         <RelativeLayout
@@ -70,13 +23,66 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content">
 
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/pass_top"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:src="@drawable/ic_launcher" />
+
+                <LinearLayout
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+
+                        android:paddingRight="3dp"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="?android:textColorSecondary"
+                        tools:text="12.10.2013 17:00" />
+
+                    <TextView
+                        android:id="@+id/title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        tools:text="Title" />
+
+                </LinearLayout>
+
+                <org.ligi.passandroid.ui.views.CategoryIndicatorView
+                    android:id="@+id/categoryView"
+                    android:layout_width="48dp"
+                    android:layout_height="74dp"
+                    android:padding="4dp"
+                    android:layout_gravity="center" />
+                <!-- <include layout="@layout/category_indicator" /> -->
+            </LinearLayout>
+
             <View
                 android:id="@+id/actions_separator"
                 android:layout_width="match_parent"
                 android:layout_height="2dip"
                 android:layout_margin="7dp"
                 android:background="#dfdfdf"
-                android:padding="7dp" />
+                android:padding="7dp"
+                android:layout_below="@id/pass_top"
+                />
 
 
             <TextView
@@ -87,13 +93,14 @@
                 android:layout_gravity="center_vertical"
                 android:background="@drawable/clickable_bg"
                 android:clickable="true"
+                android:padding="4dp"
                 android:drawableLeft="@drawable/ic_place_grey600_18dp"
                 android:layout_below="@id/actions_separator"
                 android:text="@string/pass_directions" />
 
 
             <TextView
-
+                android:padding="4dp"
                 android:id="@+id/addCalendar"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -105,13 +112,15 @@
                 android:drawableRight="@drawable/ic_today_grey600_18dp"
                 android:text="@string/pass_to_calendar" />
 
+            <LinearLayout
+                android:layout_below="@id/addCalendar"
+                android:id="@+id/passExtrasContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical" />
 
         </RelativeLayout>
 
-        <LinearLayout
-            android:id="@+id/passExtrasContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" />
-    </LinearLayout>
+
+    </android.support.v7.widget.CardView>
 </LinearLayout>
\ No newline at end of file