--- a/res/layout/changestatus.xml	Tue Jan 18 00:26:02 2011 +0100
+++ b/res/layout/changestatus.xml	Tue Jun 05 16:29:25 2012 +0200
@@ -5,8 +5,21 @@
 	<RelativeLayout android:orientation="vertical"
 		android:layout_width="fill_parent" android:layout_height="fill_parent"
 		android:padding="10dip">
+		<LinearLayout android:id="@+id/avatar_panel"
+		    android:orientation="vertical"
+		    android:gravity="center"
+		    android:layout_alignParentTop="true"
+		    android:layout_width="fill_parent" android:layout_height="fill_parent" >
+		    <TextView android:text="@string/my_avatar" style="@style/Label"
+			android:layout_width="wrap_content" android:layout_height="wrap_content" />
+
+		    <ImageButton android:id="@+id/avatarButton"
+			android:layout_width="120dip" android:layout_height="120dip"
+			android:scaleType="fitCenter" />
+		</LinearLayout>
 		<TextView android:id="@+id/ChangeStatusTypeLabel"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:layout_below="@id/avatar_panel"
 			android:text="@string/ChangeStatusType" style="@style/Label" />
 		<Spinner android:id="@+id/ChangeStatusSpinner"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
@@ -33,18 +46,14 @@
 			<Button android:id="@+id/ChangeStatusOk"
 				android:layout_width="fill_parent" android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:text="@string/UpdateButton" android:textStyle="bold"
-				android:textSize="18sp" android:textColor="#333333" />
+				android:text="@string/UpdateButton" />
 			<Button android:id="@+id/ChangeStatusClear"
 				android:layout_width="fill_parent" android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:text="@string/ClearButton"
-				android:textStyle="bold" android:textColor="#333333"
-				android:textSize="18sp" />
+				android:text="@string/ClearButton" />
 		</LinearLayout>
 		<Button android:id="@+id/OpenContactList" android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:text="@string/OpenContactList"
-			android:layout_below="@+id/ChangeStatusButtons" android:textStyle="bold" android:textColor="#333333"
-			android:textSize="18sp" />
+			android:layout_below="@+id/ChangeStatusButtons" />
 	</RelativeLayout>
 </ScrollView>