diff --git a/res/layout/theme_shape_option.xml b/res/layout/theme_shape_option.xml
new file mode 100644
index 0000000..94e31ea
--- /dev/null
+++ b/res/layout/theme_shape_option.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="wrap_content"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <FrameLayout
+        android:id="@+id/option_tile"
+        android:layout_width="@dimen/option_tile_width"
+        android:layout_height="@dimen/option_tile_width"
+        android:layout_gravity="center"
+        android:layout_marginTop="16dp"
+        android:padding="2dp">
+        <ImageView
+            android:id="@+id/shape_thumbnail"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"/>
+    </FrameLayout>
+</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3aa48ce..1549395 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -38,4 +38,6 @@
     <color name="tile_enabled_icon_color">@color/material_white_100</color>
     <color name="tile_disabled_icon_color">#2d2d2d</color>
     <color name="tile_disabled_background_color">@color/light_grey</color>
+
+    <color name="shape_option_tile_foreground_color">#f8f9fa</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d76236d..f3ae3b1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -76,4 +76,7 @@
     <dimen name="component_icon_thumb_size">40dp</dimen>
 
     <dimen name="component_color_chip_size">42dp</dimen>
+
+    <dimen name="component_shape_thumb_size">72dp</dimen>
+    <dimen name="component_shape_border_width">3dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6aae5ff..01f57d6 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -122,6 +122,9 @@
     <!-- Title of a page allowing the user to choose a color for a custom theme -->
     <string name="color_component_title">Choose color</string>
 
+    <!-- Title of a page allowing the user to choose an icon shape for a custom theme -->
+    <string name="shape_component_title">Choose shape</string>
+
     <!-- Title of a set of icons that the user can chose for their custom style (eg, "Icons 2") -->
     <string name="icon_component_label">Icons <xliff:g name="component_number" example="1">%1$d</xliff:g></string>