--- a/res/layout/addcontact.xml	Thu May 10 16:11:18 2012 +0200
+++ b/res/layout/addcontact.xml	Fri May 18 00:25:02 2012 +0200
@@ -3,7 +3,7 @@
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
 	android:orientation="vertical">
 	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:orientation="vertical"
+		android:layout_height="wrap_content" android:orientation="vertical"
 		android:padding="10dip">
 		<TextView android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:text="@string/AddCLogin"
@@ -17,7 +17,7 @@
 			android:layout_height="wrap_content" android:text="@string/AddCAlias"
 			style="@style/Label" />
 		<EditText android:id="@+id/addc_alias" android:inputType="text"
-			android:imeOptions="actionNext" android:textSize="16sp"
+			android:imeOptions="actionNext"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:scrollHorizontally="true" android:layout_margin="3dip"
 			android:contentDescription="@string/AddCAlias"/>
@@ -25,14 +25,15 @@
 			android:layout_height="wrap_content" android:text="@string/AddCGroup"
 			style="@style/Label" />
 		<EditText android:id="@+id/addc_group" android:inputType="text"
-			android:textSize="16sp" android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
 			android:scrollHorizontally="true" android:layout_height="wrap_content"
 			android:layout_margin="3dip"
 			android:contentDescription="@string/AddCGroup"/>
-		<View android:layout_width="fill_parent" android:layout_height="wrap_content"
+		<View android:layout_width="fill_parent" android:layout_height="0dp"
 			android:layout_weight="1" android:layout_marginBottom="18dp" />
 		<Button android:id="@+id/addc_ok" android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
+			android:textAppearance="?android:attr/textAppearanceMedium"
 			android:text="@string/AddCOkButton" android:layout_gravity="bottom" />
 	</LinearLayout>
 </ScrollView>

--- a/res/layout/chat.xml	Thu May 10 16:11:18 2012 +0200
+++ b/res/layout/chat.xml	Fri May 18 00:25:02 2012 +0200
@@ -5,7 +5,8 @@
 	<LinearLayout android:id="@+id/chat_header"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:orientation="horizontal" android:gravity="center_vertical"
-		android:background="#222222" android:padding="4px">
+		android:background="#222222"
+		 android:padding="4dp">
 		<ImageView android:id="@+id/chat_contact_status_icon"
 			android:src="@drawable/avatar_status"
 			android:layout_width="48dip"
@@ -16,12 +17,12 @@
 			android:paddingLeft="15sp">
 			<TextView android:id="@+id/chat_contact_name"
 				android:layout_width="fill_parent" android:layout_height="wrap_content"
-				android:lines="1" android:singleLine="true" android:textSize="16sp"
-				android:textStyle="bold" android:textColor="#FFFFFF"
+				android:lines="1" android:singleLine="true"
+				android:textStyle="bold" android:textColor="@android:color/white"
 				android:focusable="true"/>
 			<TextView android:id="@+id/chat_contact_status_msg"
 				android:layout_width="fill_parent" android:layout_height="wrap_content"
-				android:autoLink="all" android:textSize="12sp" android:textColor="#FFFFFF"
+				android:autoLink="all" android:textSize="12sp" android:textColor="@android:color/white"
 				android:textColorLink="#FFFFFF"
 				android:focusable="true"/>
 			<TextView android:id="@+id/chat_contact_chat_state"
@@ -40,13 +41,13 @@
 		android:layout_width="fill_parent" android:layout_height="0dip"
 		android:layout_weight="1" android:transcriptMode="normal"
 		android:stackFromBottom="true"
-		android:fadingEdge="none" android:padding="4px"
+		android:fadingEdge="none" android:padding="4dp"
 		android:fastScrollEnabled="true" android:smoothScrollbar="false"
 		android:focusable="true"/>
 	<LinearLayout android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:orientation="horizontal"
 		android:gravity="center_vertical"
-		android:background="#222222" android:padding="8px">
+		android:padding="4dp">
 		<EditText android:id="@+id/chat_input" android:layout_width="0dip"
 			android:layout_height="fill_parent" android:layout_weight="1"
 			android:maxLines="5"

--- a/res/layout/chat_msg_row.xml	Thu May 10 16:11:18 2012 +0200
+++ b/res/layout/chat_msg_row.xml	Fri May 18 00:25:02 2012 +0200
@@ -6,7 +6,8 @@
 	<TextView android:id="@+id/chatmessagename"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:layout_alignParentLeft="true" android:layout_alignParentTop="true"
-		android:textSize="16sp" android:textColor="#FFFFFF" android:textStyle="bold"
+		android:textColor="@android:color/white" android:textStyle="bold"
+		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:paddingBottom="1dp" />
 	<TextView android:id="@+id/chatmessagedate"
 		android:layout_width="wrap_content" android:layout_height="wrap_content"

--- a/res/layout/contactlist.xml	Thu May 10 16:11:18 2012 +0200
+++ b/res/layout/contactlist.xml	Fri May 18 00:25:02 2012 +0200
@@ -4,21 +4,10 @@
 	android:orientation="vertical">
 	<ViewStub android:id="@+id/contactlist_stub" android:inflatedId="@+id/contactlist_groupstub" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:layout="@layout/contactlist_groupstub"/>
-		
-		<!-- 
-	
-	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:orientation="horizontal"
-		android:padding="2px">
-		<ListView android:id="@+id/contactlist" android:layout_width="fill_parent"
-		    android:layout_height="fill_parent" android:transcriptMode="disabled"
-		    android:textFilterEnabled="true" />
-	</LinearLayout>
-	 	-->
-	 	
+
 	 	<android.support.v4.view.ViewPager android:id="@+id/pager"
 	 	    android:layout_width="fill_parent"
 	 	    android:layout_height="fill_parent"
-	 	    android:padding="2px"/>
+	 	    />
 	
 </LinearLayout>

--- a/res/layout/contactlistcontact.xml	Thu May 10 16:11:18 2012 +0200
+++ b/res/layout/contactlistcontact.xml	Fri May 18 00:25:02 2012 +0200
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content" android:paddingLeft="10px"
-    android:paddingRight="10px" android:paddingTop="8dip"
+    android:layout_height="wrap_content" android:paddingLeft="10dp"
+    android:paddingRight="10dp" android:paddingTop="8dp"
     android:paddingBottom="8dip" >
     <ImageView android:id="@+id/avatar"
 	android:layout_width="48dip" android:layout_height="48dip"
@@ -14,17 +14,18 @@
 	android:layout_alignParentTop="true"
 	android:layout_toRightOf="@id/avatar"
 	android:singleLine="true"
-	android:maxLines="1" android:textColor="@color/white"
-	android:drawablePadding="12px"
-	android:paddingLeft="10dip"
-	android:textSize="18sp" android:textStyle="bold" />
+	android:maxLines="1"
+	android:paddingLeft="10dp"
+	android:textAppearance="?android:attr/textAppearanceMedium"
+	android:textStyle="bold" />
 
     <TextView android:id="@+id/contactlistmsgperso"
 	android:layout_width="fill_parent" android:layout_height="wrap_content"
 	android:layout_below="@id/contactlistpseudo"
 	android:layout_toRightOf="@id/avatar"
-	android:paddingLeft="30px" android:singleLine="true"
+	android:paddingLeft="10dp" android:singleLine="true"
 	android:maxLines="1" android:linksClickable="false" android:autoLink="all"
 	android:scrollHorizontally="true" android:textColorLink="@color/white"
-	android:textSize="12sp" />
+	android:textAppearance="?android:attr/textAppearanceSmall"
+	/>
 </RelativeLayout>

--- a/res/values/styles.xml	Thu May 10 16:11:18 2012 +0200
+++ b/res/values/styles.xml	Fri May 18 00:25:02 2012 +0200
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="Label">
-		<item name="android:textSize">18sp</item>
+		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
 		<item name="android:textStyle">bold</item>
-		<item name="android:typeface">sans</item>
 		<item name="android:capitalize">characters</item>
-		<!--<item name="android:textColor">#FFFFFF</item>-->
 		<item name="android:focusable">false</item>
-		<item name="android:padding">4px</item>
 	</style>
 	<style name="CheckBoxLabel" parent="@style/Label">
 		<item name="android:enabled">true</item>