diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
index 16e7a8580d4..469fc509d8d 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -17,40 +17,41 @@
     android:orientation="vertical"
     android:paddingLeft="6dip"
     android:paddingRight="6dip"
-    android:paddingBottom="3dip"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:scrollbars="vertical" >
 
+    <View
+        android:paddingTop="53dip"
+        android:layout_width="match_parent"
+        android:layout_height="1dip"
+        android:background="#ff404040"
+        />
+
     <CheckBox android:id="@+id/show_owner_info_on_lockscreen_checkbox"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android_layout_marginTop="20dip"
+        android:layout_height="64dip"
+        android:gravity="center_vertical"
         android:text="@string/show_owner_info_on_lockscreen_label"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:attr/textColorSecondary"
     />
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
+    <View
         android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android_layout_marginTop="20dip"
-        android:scrollbars="vertical" >
-
-        <EditText android:id="@+id/owner_info_edit_text"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            android:lines="4"
-            android:maxLines="4"
+        android:layout_height="1dip"
+        android:background="#ff404040"
         />
 
-        <View
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-        />
-
-    </LinearLayout>
+    <EditText android:id="@+id/owner_info_edit_text"
+        android:layout_width="480dip"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="62dip"
+        android:layout_marginTop="40dip"
+        android:gravity="top"
+        android:hint="@string/owner_info_settings_edit_text_hint"
+        android:lines="8"
+        android:maxLines="8"
+    />
 
 </LinearLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 413807cb9a8..3523b760498 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -570,6 +570,8 @@
     <string name="owner_info_settings_title">Owner info</string>
     <!-- Text shown for summary of owner info setting [CHAR LIMIT=40]-->
     <string name="owner_info_settings_summary">Set or disable showing owner info on lock screen</string>
+    <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
+    <string name="owner_info_settings_edit_text_hint">Enter text to display on the lock screen</string>
     <!-- Main Settings screen setting option title for the item to take you the security and location screen -->
     <string name="security_settings_title">Location &amp; security</string>
     <!-- Location & security settings screen title -->