diff --git a/app/build.gradle b/app/build.gradle
index 54cbf5f8..66d12252 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,8 +28,8 @@ android {
 
 dependencies {
     compile project(':orbotservice')
-
     compile 'com.android.support:support-v4:23.4.0'
     compile 'com.android.support:appcompat-v7:23.4.0'
     compile 'com.android.support:design:23.4.0'
+    compile 'com.android.support:cardview-v7:23.4.0'
 }
diff --git a/app/src/main/res/layout/content_hidden_services.xml b/app/src/main/res/layout/content_hidden_services.xml
index ba760de1..39588f91 100644
--- a/app/src/main/res/layout/content_hidden_services.xml
+++ b/app/src/main/res/layout/content_hidden_services.xml
@@ -6,8 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context="org.torproject.android.ui.hs.HiddenServicesActivity"
diff --git a/app/src/main/res/layout/onion_item.xml b/app/src/main/res/layout/onion_item.xml
index 754afdb4..12fbf1d7 100644
--- a/app/src/main/res/layout/onion_item.xml
+++ b/app/src/main/res/layout/onion_item.xml
@@ -1,21 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_marginBottom="15sp">
+    android:padding="5dp">
 
-    <TextView
-        android:id="@+id/hs_name"
+    <android.support.v7.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="24sp" />
+        android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/hs_onion"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="18sp" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="5dp">
 
+            <TextView
+                android:id="@+id/hs_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="24sp"
+                android:paddingLeft="5dp" />
+
+            <TextView
+                android:id="@+id/hs_onion"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"
+                android:paddingLeft="5dp" />
+        </LinearLayout>
+    </android.support.v7.widget.CardView>
 </LinearLayout>
\ No newline at end of file