diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a492481ea9..57b9a1b4ce 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -150,6 +150,9 @@
android:name="org.thoughtcrime.securesms.loki.redesign.activities.JoinPublicChatActivity"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/drawable/profile_picture_view_large_background.xml b/res/drawable/profile_picture_view_large_background.xml
new file mode 100644
index 0000000000..bfc404e25f
--- /dev/null
+++ b/res/drawable/profile_picture_view_large_background.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/profile_picture_view_large_foreground.xml b/res/drawable/profile_picture_view_large_foreground.xml
new file mode 100644
index 0000000000..18cac49b38
--- /dev/null
+++ b/res/drawable/profile_picture_view_large_foreground.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/drawable/setting_button_background.xml b/res/drawable/setting_button_background.xml
new file mode 100644
index 0000000000..ee5f321c99
--- /dev/null
+++ b/res/drawable/setting_button_background.xml
@@ -0,0 +1,9 @@
+
+
+
+ -
+
+
+
\ No newline at end of file
diff --git a/res/drawable/unimportant_outline_button_medium_background.xml b/res/drawable/unimportant_outline_button_medium_background.xml
new file mode 100644
index 0000000000..202eb9cd5c
--- /dev/null
+++ b/res/drawable/unimportant_outline_button_medium_background.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index a2b5ea939a..3a900ffd99 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -24,7 +24,8 @@
android:id="@+id/profileButton"
android:layout_width="@dimen/small_profile_picture_size"
android:layout_height="@dimen/small_profile_picture_size"
- android:layout_alignParentStart="true"
+ android:layout_marginLeft="8dp"
+ android:layout_alignParentLeft="true"
android:layout_centerVertical="true"/>
+ android:layout_marginLeft="64dp" />
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
new file mode 100644
index 0000000000..b1e43dba48
--- /dev/null
+++ b/res/layout/activity_settings.xml
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/view_profile_picture.xml b/res/layout/view_profile_picture.xml
index 128f850b2f..1a380db32b 100644
--- a/res/layout/view_profile_picture.xml
+++ b/res/layout/view_profile_picture.xml
@@ -77,4 +77,22 @@
android:textSize="@dimen/small_font_size"
android:background="@drawable/profile_picture_view_rss_medium_background" />
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/menu/menu_settings.xml b/res/menu/menu_settings.xml
new file mode 100644
index 0000000000..55f56b1233
--- /dev/null
+++ b/res/menu/menu_settings.xml
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fae5931a75..cf140be368 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,6 +16,7 @@
4dp
36dp
46dp
+ 76dp
14dp
2dp
1dp
@@ -25,6 +26,7 @@
224dp
10dp
234dp
+ 72dp
8dp
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ad22770d84..e2c8125eb3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -55,6 +55,14 @@
- @color/text
+
+