avatar: refactor drawing code

Change-Id: I85258ec690aa0d7328d07300e12d9ea1a316ab39
diff --git a/ring-android/app/src/main/res/layout/activity_conversation.xml b/ring-android/app/src/main/res/layout/activity_conversation.xml
index 8840c64..be163ed 100644
--- a/ring-android/app/src/main/res/layout/activity_conversation.xml
+++ b/ring-android/app/src/main/res/layout/activity_conversation.xml
@@ -18,15 +18,16 @@
         android:minHeight="?attr/actionBarSize"
         android:popupTheme="@style/Theme.AppCompat.Light.NoActionBar"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        android:titleTextAppearance="@style/ToolbarTitle"
         app:contentInsetStart="72dp"
         app:elevation="4dp"
-        app:titleTextAppearance="@style/ToolbarTitle" />
+        app:subtitleTextAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle"
+        app:titleMarginStart="24dp"
+        app:titleTextAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" />
 
     <FrameLayout
         android:id="@+id/main_frame"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentStart="true"
-        android:layout_below="@+id/main_toolbar" />
+        android:layout_below="@id/main_toolbar"
+        android:layout_alignParentStart="true" />
 </RelativeLayout>
\ No newline at end of file