diff --git a/res/layout/catalog_manager_item.xml b/res/layout/catalog_manager_item.xml
index 56a11e6e6..1dc78a023 100644
--- a/res/layout/catalog_manager_item.xml
+++ b/res/layout/catalog_manager_item.xml
@@ -11,9 +11,10 @@
 	<CheckBox
 		android:id="@+id/catalog_manager_item_checkbox"
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
+		android:layout_height="fill_parent"
 		android:layout_marginTop="8dp"
 		android:text=""
+		android:gravity="center|center_vertical"
 	/>
 	<ImageView
 		android:id="@+id/catalog_manager_item_icon"
@@ -28,9 +29,12 @@
 		android:layout_height="fill_parent"
 	>
 		<LinearLayout
-			android:layout_width="fill_parent"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
+			android:layout_marginLeft="5dp"
+			android:layout_marginRight="30dp"
+			android:layout_alignParentLeft="true"
 		>
 			<TextView
 				android:id="@+id/catalog_manager_item_title"
@@ -40,32 +44,27 @@
 				android:textAppearance="?android:attr/textAppearanceMedium"
 				android:ellipsize="marquee"
 				android:marqueeRepeatLimit="marquee_forever"
+				android:layout_marginRight="5dp"
 			/>
 			<TextView
 				android:id="@+id/catalog_manager_item_subtitle"
-				android:layout_width="wrap_content"
+				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginTop="5dip"
-				android:paddingRight="5dp"
 				android:singleLine="true"
 				android:textAppearance="?android:attr/textAppearanceSmall"
 				android:ellipsize="marquee"
 				android:marqueeRepeatLimit="marquee_forever"
+				android:layout_marginRight="5dp"
+				android:layout_marginTop="5dp"
 			/>
 		</LinearLayout>
-		<RelativeLayout
+		<ImageView
 			android:id="@+id/catalog_manager_item_drag_icon"
+			android:src="@drawable/drag_icon"
 			android:layout_width="wrap_content"
 			android:layout_height="fill_parent"
-			android:gravity="center_vertical"
 			android:layout_alignParentRight="true"
-			>
-			<ImageView
-				android:src="@drawable/drag_icon"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerHorizontal="true"
-			/>
-		</RelativeLayout>
+			android:gravity="center_vertical"
+		/>
 	</RelativeLayout>
 </LinearLayout>