diff --git a/res/layout/advanced_security_settings.xml b/res/layout/advanced_security_settings.xml
index 149b49b0504..98ff43d338b 100644
--- a/res/layout/advanced_security_settings.xml
+++ b/res/layout/advanced_security_settings.xml
@@ -15,31 +15,23 @@
   ~ limitations under the License
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:orientation="vertical">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="@dimen/settings_side_margin"
+        android:paddingEnd="@dimen/settings_side_margin">
 
-    <FrameLayout
+    <ListView android:id="@android:id/list"
             android:layout_width="match_parent"
-            android:layout_height="0px"
-            android:layout_weight="1">
+            android:layout_height="match_parent"
+            android:drawSelectorOnTop="false"
+            android:fastScrollEnabled="true" />
 
-        <ListView android:id="@android:id/list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:drawSelectorOnTop="false"
-                android:fastScrollEnabled="true" />
+    <TextView android:id="@android:id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="@string/no_trust_agents"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView android:id="@android:id/empty"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="@string/no_trust_agents"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    </FrameLayout>
-
-</LinearLayout>
+</FrameLayout>
diff --git a/res/layout/trust_agent_item.xml b/res/layout/trust_agent_item.xml
index e7b3bc8ad0e..3555775e086 100644
--- a/res/layout/trust_agent_item.xml
+++ b/res/layout/trust_agent_item.xml
@@ -20,15 +20,19 @@
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:gravity="center_vertical">
+
     <LinearLayout
             android:id="@+id/clickable"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_weight="1"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
             android:gravity="center_vertical"
             android:clickable="true"
             android:focusable="true"
             android:background="?android:attr/selectableItemBackground">
+
         <CheckBox
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 android:id="@+id/checkbox"
@@ -37,6 +41,7 @@
                 android:layout_gravity="center"
                 android:focusable="false"
                 android:clickable="false"/>
+
         <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -44,6 +49,7 @@
                 android:layout_marginTop="6dip"
                 android:layout_marginBottom="6dip"
                 android:layout_weight="1">
+
             <TextView
                     android:id="@+id/name"
                     android:layout_width="wrap_content"
@@ -52,6 +58,7 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:ellipsize="marquee"
                     android:fadingEdge="horizontal"/>
+
             <TextView
                     android:id="@+id/description"
                     android:layout_width="wrap_content"
@@ -65,6 +72,9 @@
                     android:textColor="?android:attr/textColorSecondary"
                     android:focusable="false"
                     android:maxLines="4"/>
+
         </RelativeLayout>
+
     </LinearLayout>
+
 </LinearLayout>