diff --git a/res/drawable-ldrtl-hdpi/wifi_assistant_card.png b/res/drawable-ldrtl-hdpi/wifi_assistant_card.png
new file mode 100644
index 00000000000..67a93b3cc93
Binary files /dev/null and b/res/drawable-ldrtl-hdpi/wifi_assistant_card.png differ
diff --git a/res/drawable-ldrtl-mdpi/wifi_assistant_card.png b/res/drawable-ldrtl-mdpi/wifi_assistant_card.png
new file mode 100644
index 00000000000..578454c89aa
Binary files /dev/null and b/res/drawable-ldrtl-mdpi/wifi_assistant_card.png differ
diff --git a/res/drawable-ldrtl-xhdpi/wifi_assistant_card.png b/res/drawable-ldrtl-xhdpi/wifi_assistant_card.png
new file mode 100644
index 00000000000..8840a6a9de5
Binary files /dev/null and b/res/drawable-ldrtl-xhdpi/wifi_assistant_card.png differ
diff --git a/res/drawable-ldrtl-xxhdpi/wifi_assistant_card.png b/res/drawable-ldrtl-xxhdpi/wifi_assistant_card.png
new file mode 100644
index 00000000000..1273b73d6ea
Binary files /dev/null and b/res/drawable-ldrtl-xxhdpi/wifi_assistant_card.png differ
diff --git a/res/drawable-ldrtl-xxxhdpi/wifi_assistant_card.png b/res/drawable-ldrtl-xxxhdpi/wifi_assistant_card.png
new file mode 100644
index 00000000000..7c7bf0aba87
Binary files /dev/null and b/res/drawable-ldrtl-xxxhdpi/wifi_assistant_card.png differ
diff --git a/res/layout/wifi_assistant_card.xml b/res/layout/wifi_assistant_card.xml
index 7c9af17c76b..bbfc3f3a588 100644
--- a/res/layout/wifi_assistant_card.xml
+++ b/res/layout/wifi_assistant_card.xml
@@ -20,15 +20,11 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:orientation="vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingTop="@dimen/wifi_assistant_padding"
-    android:paddingBottom="@dimen/wifi_assistant_padding">
+    android:orientation="vertical">
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="@dimen/wifi_assistant_height">
 
         <ImageView
             android:id="@+id/cardBackground"
@@ -44,6 +40,8 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/wifi_assistant_text_padding"
             android:gravity="start"
+            android:paddingStart="@dimen/wifi_assistant_padding_start_end"
+            android:paddingTop="@dimen/wifi_assistant_padding_top_bottom"
             android:text="@string/wifi_assistant_intro_setup"
             style="@style/WifiAssistantText" />
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fcfd5bc90d4..3ec64daf95b 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -170,6 +170,9 @@
     <dimen name="wifi_assistant_padding_start_end">16dp</dimen>
     <dimen name="wifi_assistant_padding">25dp</dimen>
     <dimen name="wifi_assistant_text_padding">16dp</dimen>
+    <dimen name="wifi_assistant_height">182dp</dimen>
+    <dimen name="wifi_assistant_image_top">32dp</dimen>
+    <dimen name="wifi_assistant_image_start">24dp</dimen>
 
     <!-- CryptKeeper top margin for password/pin screen -->
     <dimen name="crypt_keeper_password_top_margin">88dip</dimen>