diff --git a/res/anim/bounce.xml b/res/anim/bounce.xml
deleted file mode 100644
index 611b3c09e..000000000
--- a/res/anim/bounce.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shareInterpolator="false" android:interpolator="@android:anim/bounce_interpolator">
-	<translate 
-	    android:fromXDelta="0%" android:toXDelta="0%"
-   		android:fromYDelta="40%" android:toYDelta="00%"
-  		android:duration="1000"
-  		android:interpolator="@android:anim/bounce_interpolator"
-  		android:repeatMode="restart"
-  		android:repeatCount="infinite"/>
-</set>
\ No newline at end of file
diff --git a/res/layout-land/about.xml b/res/layout-land/about.xml
index 6d9d277b9..d1c2d9d54 100644
--- a/res/layout-land/about.xml
+++ b/res/layout-land/about.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:background="@color/colorH"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical">
@@ -21,7 +20,7 @@
             android:id="@+id/menu_name"
             android:text="@string/about"
             style="@style/font1"
-            android:singleLine="true"
+            android:maxLines="1"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.4"
@@ -40,6 +39,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:baselineAligned="false"
         android:background="@color/colorC"
         android:orientation="horizontal"
         android:layout_weight="1"
@@ -140,6 +140,7 @@
             android:layout_height="1dp"/>
 
         <LinearLayout
+            style="android:attr/buttonBarStyle"
             android:orientation="horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -147,6 +148,7 @@
 
             <Button
                 android:id="@+id/send_log"
+                style="android:attr/buttonBarButtonStyleStyle"
                 android:background="@drawable/button_background"
                 android:layout_margin="5dp"
                 android:layout_width="match_parent"
@@ -155,6 +157,7 @@
 
             <Button
                 android:id="@+id/reset_log"
+                style="android:attr/buttonBarButtonStyleStyle"
                 android:background="@drawable/button_background"
                 android:layout_margin="5dp"
                 android:layout_width="wrap_content"
diff --git a/res/layout-land/assistant_codec_downloader.xml b/res/layout-land/assistant_codec_downloader.xml
index 28579cae7..0020fe739 100644
--- a/res/layout-land/assistant_codec_downloader.xml
+++ b/res/layout-land/assistant_codec_downloader.xml
@@ -36,13 +36,12 @@
 		android:layout_height="wrap_content"
 		android:gravity="center"
 		android:id="@+id/downloading"
-		android:layout_above="@+id/imageView"
 		android:layout_alignParentLeft="true"
 		android:layout_alignParentStart="true"/>
 
 	<Button
 		style="@style/font7"
-		android:text="No"
+		android:text="@string/no"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -50,14 +49,12 @@
 		android:id="@+id/answerNo"
 		android:layout_marginBottom="35dp"
 		android:layout_alignParentBottom="true"
-		android:layout_toLeftOf="@+id/imageView"
-		android:layout_toStartOf="@+id/imageView"
 		android:layout_marginRight="26dp"
 		android:layout_marginEnd="26dp"/>
 
 	<Button
 		style="@style/font7"
-		android:text="Yes"
+		android:text="@string/yes"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -69,7 +66,7 @@
 
 	<Button
 		style="@style/font7"
-		android:text="Ok"
+		android:text="@string/ok"
 		android:textAllCaps="true"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -86,7 +83,6 @@
 		android:layout_height="wrap_content"
 		android:gravity="center"
 		android:id="@+id/downloaded"
-		android:layout_above="@+id/imageView"
 		android:layout_alignParentLeft="true"
 		android:layout_alignParentStart="true"/>
 
diff --git a/res/layout-land/call.xml b/res/layout-land/call.xml
index 2de97452a..1d4b34bd8 100644
--- a/res/layout-land/call.xml
+++ b/res/layout-land/call.xml
@@ -152,7 +152,6 @@
 						android:id="@+id/calls_list"
 						android:background="@color/colorH"
 						android:layout_width="match_parent"
-						android:layout_weight="0.5"
 						android:layout_height="wrap_content"
 						android:layout_alignParentBottom="true"
 						android:layout_gravity="bottom"
diff --git a/res/layout-land/chatlist_cell.xml b/res/layout-land/chatlist_cell.xml
index a8f3d65b8..5f837ef92 100644
--- a/res/layout-land/chatlist_cell.xml
+++ b/res/layout-land/chatlist_cell.xml
@@ -67,7 +67,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_marginTop="5dp"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:layout_alignBottom="@id/sipUri"
 				style="@style/font2"/>
 
@@ -75,7 +75,7 @@
 				android:id="@+id/sipUri"
 				android:lines="1"
 				android:ellipsize="end"
-				android:singleLine="true"
+				android:maxLines="1"
 				style="@style/font6"
 				android:paddingLeft="10dp"
 				android:layout_marginTop="5dp"
@@ -92,7 +92,7 @@
 				android:contentDescription="@string/content_description_unread_chat_message"
 				style="@style/font18"
 				android:gravity="center"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true"
 				android:layout_alignParentTop="true"/>
@@ -107,7 +107,7 @@
 				style="@style/font11"/>
 
 		</RelativeLayout>
-	    
+
 	</LinearLayout>
-    
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-land/dialer.xml b/res/layout-land/dialer.xml
index 2722d36c2..62c0f9e1a 100644
--- a/res/layout-land/dialer.xml
+++ b/res/layout-land/dialer.xml
@@ -4,6 +4,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+	<RelativeLayout
+		android:id="@+id/dialer"
+		android:background="@color/colorH"
+		android:layout_marginBottom="50dp"
+		android:layout_centerHorizontal="true"
+		android:layout_alignParentBottom="true"
+		android:layout_width="300dp"
+		android:layout_height="460dp"
+		android:visibility="gone">
+	</RelativeLayout>
+
 	<RelativeLayout
 		android:id="@+id/address_bar"
 		android:background="@color/colorF"
@@ -55,7 +66,7 @@
 		android:layout_centerHorizontal="true"
 		android:layout_width="100dp"
 		android:layout_height="wrap_content"/>
-    
+
     <LinearLayout
         android:id="@+id/controls"
         android:layout_alignParentBottom="true"
diff --git a/res/layout-sw533dp-land/assistant_account_creation.xml b/res/layout-sw533dp-land/assistant_account_creation.xml
index 953f091e1..6a71b68d2 100644
--- a/res/layout-sw533dp-land/assistant_account_creation.xml
+++ b/res/layout-sw533dp-land/assistant_account_creation.xml
@@ -109,7 +109,7 @@
 								android:gravity="center"
 								android:layout_width="65dp"
 								android:layout_height="40dp"
-								android:singleLine="true"/>
+								android:maxLines="1"/>
 
 							<EditText
 								android:id="@+id/phone_number"
@@ -119,7 +119,7 @@
 								android:inputType="phone"
 								android:layout_width="match_parent"
 								android:layout_height="40dp"
-								android:singleLine="true"/>
+								android:maxLines="1"/>
 
 						</LinearLayout>
 
@@ -175,7 +175,7 @@
 						android:contentDescription="@string/content_description_username_field"
 						android:layout_width="match_parent"
 						android:layout_height="40dp"
-						android:singleLine="true"/>
+						android:maxLines="1"/>
 
 					<TextView
 						android:id="@+id/username_error"
@@ -214,7 +214,7 @@
 					android:layout_height="40dp"
 					android:paddingLeft="10dp"
 					android:paddingRight="10dp"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 
 				<TextView
 					android:id="@+id/password_error"
@@ -261,7 +261,7 @@
 					android:layout_height="40dp"
 					android:paddingLeft="10dp"
 					android:paddingRight="10dp"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 
 				<TextView
 					android:id="@+id/email_error"
@@ -301,7 +301,7 @@
 					android:layout_height="40dp"
 					android:paddingLeft="10dp"
 					android:paddingRight="10dp"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 
 				<TextView
 					android:id="@+id/confirm_password_error"
diff --git a/res/layout-sw533dp-land/assistant_linphone_login.xml b/res/layout-sw533dp-land/assistant_linphone_login.xml
index 06fd0b994..48b0eec89 100644
--- a/res/layout-sw533dp-land/assistant_linphone_login.xml
+++ b/res/layout-sw533dp-land/assistant_linphone_login.xml
@@ -97,7 +97,7 @@
 							android:gravity="center"
 							android:layout_width="65dp"
 							android:layout_height="40dp"
-							android:singleLine="true"/>
+							android:maxLines="1"/>
 
 						<EditText
 							android:id="@+id/phone_number"
@@ -107,7 +107,7 @@
 							android:inputType="phone"
 							android:layout_width="match_parent"
 							android:layout_height="40dp"
-							android:singleLine="true"/>
+							android:maxLines="1"/>
 
 					</LinearLayout>
 
@@ -153,7 +153,7 @@
 					android:contentDescription="@string/content_description_username_field"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 			</LinearLayout>
 
 			<LinearLayout
@@ -180,14 +180,14 @@
 					android:inputType="textPassword"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 
 				<TextView
 					android:id="@+id/forgot_password"
 					android:layout_gravity="right"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 			</LinearLayout>
 		</TableRow>
 
@@ -219,7 +219,7 @@
 					android:contentDescription="@string/content_description_display_field"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 			</LinearLayout>
 
 			<View
diff --git a/res/layout-sw533dp-land/assistant_login.xml b/res/layout-sw533dp-land/assistant_login.xml
index 024f51125..1708857cf 100644
--- a/res/layout-sw533dp-land/assistant_login.xml
+++ b/res/layout-sw533dp-land/assistant_login.xml
@@ -5,7 +5,7 @@
 
 	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_height="wrap_content"
 		android:padding="30dp"
 		android:orientation="vertical">
 
@@ -57,7 +57,7 @@
 						android:contentDescription="@string/content_description_username_field"
 						android:layout_width="match_parent"
 						android:layout_height="40dp"
-						android:singleLine="true"/>
+						android:maxLines="1"/>
 				</LinearLayout>
 
 				<LinearLayout
@@ -81,7 +81,7 @@
 						android:inputType="textPassword"
 						android:layout_width="match_parent"
 						android:layout_height="40dp"
-						android:singleLine="true"/>
+						android:maxLines="1"/>
 				</LinearLayout>
 			</TableRow>
 
@@ -111,7 +111,7 @@
 						android:contentDescription="@string/content_description_display_field"
 						android:layout_width="match_parent"
 						android:layout_height="40dp"
-						android:singleLine="true"/>
+						android:maxLines="1"/>
 				</LinearLayout>
 
 				<LinearLayout
@@ -136,7 +136,7 @@
 						android:contentDescription="@string/content_description_domain_field"
 						android:layout_width="match_parent"
 						android:layout_height="40dp"
-						android:singleLine="true"/>
+						android:maxLines="1"/>
 				</LinearLayout>
 
 			</TableRow>
diff --git a/res/layout-sw533dp-land/chatlist_cell.xml b/res/layout-sw533dp-land/chatlist_cell.xml
index fdd4a3b5c..9260677f0 100644
--- a/res/layout-sw533dp-land/chatlist_cell.xml
+++ b/res/layout-sw533dp-land/chatlist_cell.xml
@@ -19,7 +19,7 @@
 		android:layout_centerVertical="true"
 		android:visibility="invisible"
 		android:layout_alignParentTop="true"/>
-	
+
 	<LinearLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
@@ -60,7 +60,7 @@
 				android:layout_height="wrap_content"
 				android:layout_below="@id/avatar_layout"
 				android:layout_marginTop="5dp"
-				android:singleLine="true"
+				android:maxLines="1"
 				style="@style/font2"/>
 
 		</RelativeLayout>
@@ -74,7 +74,7 @@
 				android:id="@+id/sipUri"
 				android:lines="1"
 				android:ellipsize="end"
-				android:singleLine="true"
+				android:maxLines="1"
 				style="@style/font6"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -88,7 +88,7 @@
 				android:contentDescription="@string/content_description_unread_chat_message"
 				style="@style/font18"
 				android:gravity="center"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:layout_above="@+id/lastMessage"
 				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true"/>
@@ -104,7 +104,7 @@
 				style="@style/font11"/>
 
 		</RelativeLayout>
-	    
+
 	</LinearLayout>
-    
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp/chatlist_cell.xml b/res/layout-sw533dp/chatlist_cell.xml
index d92015b53..2b11dd93b 100644
--- a/res/layout-sw533dp/chatlist_cell.xml
+++ b/res/layout-sw533dp/chatlist_cell.xml
@@ -19,7 +19,7 @@
 		android:layout_centerVertical="true"
 		android:visibility="invisible"
 		android:layout_alignParentTop="true"/>
-	
+
 	<LinearLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="match_parent"
@@ -60,7 +60,7 @@
 				android:layout_height="wrap_content"
 				android:layout_below="@id/avatar_layout"
 				android:layout_marginTop="5dp"
-				android:singleLine="true"
+				android:maxLines="1"
 				style="@style/font2"/>
 
 		</RelativeLayout>
@@ -75,7 +75,7 @@
 				android:lines="1"
 				android:ellipsize="end"
 				android:fadingEdge="horizontal"
-				android:singleLine="true"
+				android:maxLines="1"
 				style="@style/font6"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -89,7 +89,7 @@
 				android:contentDescription="@string/content_description_unread_chat_message"
 				style="@style/font18"
 				android:gravity="center"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:layout_above="@+id/lastMessage"
 				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true"/>
@@ -105,7 +105,7 @@
 				style="@style/font11"/>
 
 		</RelativeLayout>
-	    
+
 	</LinearLayout>
-    
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-sw533dp/dialer.xml b/res/layout-sw533dp/dialer.xml
index 6b027aece..5e7e3c10f 100644
--- a/res/layout-sw533dp/dialer.xml
+++ b/res/layout-sw533dp/dialer.xml
@@ -11,6 +11,7 @@
 		android:layout_height="wrap_content"/>
 
 	<RelativeLayout
+		android:id="@+id/dialer"
 		android:background="@color/colorH"
 		android:layout_marginBottom="50dp"
 		android:layout_centerHorizontal="true"
diff --git a/res/layout/about.xml b/res/layout/about.xml
index b1e79c0d8..e2622897a 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -21,7 +21,7 @@
             android:id="@+id/menu_name"
             android:text="@string/about"
             style="@style/font1"
-            android:singleLine="true"
+            android:maxLines="1"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.4"
@@ -129,6 +129,7 @@
             android:layout_height="1dp"/>
 
         <LinearLayout
+            style="android:attr/buttonBarStyle"
             android:orientation="horizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -136,6 +137,7 @@
 
             <Button
                 android:id="@+id/send_log"
+                style="android:attr/buttonBarButtonStyleStyle"
                 android:background="@drawable/button_background"
                 android:padding="10dp"
                 android:layout_margin="5dp"
@@ -145,6 +147,7 @@
 
             <Button
                 android:id="@+id/reset_log"
+                style="android:attr/buttonBarButtonStyleStyle"
                 android:background="@drawable/button_background"
                 android:padding="10dp"
                 android:layout_margin="5dp"
diff --git a/res/layout/assistant.xml b/res/layout/assistant.xml
index 719a74335..48008e27e 100644
--- a/res/layout/assistant.xml
+++ b/res/layout/assistant.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:background="@color/colorH"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
diff --git a/res/layout/assistant_account_creation.xml b/res/layout/assistant_account_creation.xml
index 486d7e4c2..c47551462 100644
--- a/res/layout/assistant_account_creation.xml
+++ b/res/layout/assistant_account_creation.xml
@@ -91,7 +91,7 @@
 							android:gravity="center"
 							android:layout_width="65dp"
 							android:layout_height="42dp"
-							android:singleLine="true"/>
+							android:maxLines="1"/>
 
 						<EditText
 							android:id="@+id/phone_number"
@@ -101,7 +101,7 @@
 							android:inputType="phone"
 							android:layout_width="match_parent"
 							android:layout_height="40dp"
-							android:singleLine="true"/>
+							android:maxLines="1"/>
 
 					</LinearLayout>
 
@@ -145,7 +145,7 @@
 					android:inputType="text|textNoSuggestions"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 
 				<TextView
 					android:id="@+id/username_error"
@@ -188,7 +188,7 @@
 						android:layout_height="40dp"
 						android:paddingLeft="10dp"
 						android:paddingRight="10dp"
-						android:singleLine="true"/>
+						android:maxLines="1"/>
 
 					<TextView
 						android:id="@+id/email_error"
@@ -230,7 +230,7 @@
 						android:layout_height="40dp"
 						android:paddingLeft="10dp"
 						android:paddingRight="10dp"
-						android:singleLine="true"/>
+						android:maxLines="1"/>
 
 					<TextView
 						android:id="@+id/password_error"
@@ -267,7 +267,7 @@
 						android:layout_height="40dp"
 						android:paddingLeft="10dp"
 						android:paddingRight="10dp"
-						android:singleLine="true"/>
+						android:maxLines="1"/>
 
 					<TextView
 						android:id="@+id/confirm_password_error"
diff --git a/res/layout/assistant_account_creation_code_activation.xml b/res/layout/assistant_account_creation_code_activation.xml
index 148a66272..18b74092e 100644
--- a/res/layout/assistant_account_creation_code_activation.xml
+++ b/res/layout/assistant_account_creation_code_activation.xml
@@ -52,7 +52,7 @@
 			android:gravity="center_vertical|center_horizontal"
 			android:layout_width="match_parent"
 			android:layout_height="40dp"
-			android:singleLine="true"/>
+			android:maxLines="1"/>
 
 		<Button
 			android:id="@+id/assistant_check"
diff --git a/res/layout/assistant_country_list.xml b/res/layout/assistant_country_list.xml
index 21d1f431b..f28d50e08 100644
--- a/res/layout/assistant_country_list.xml
+++ b/res/layout/assistant_country_list.xml
@@ -16,7 +16,7 @@
             android:layout_height="match_parent"
             android:text="@string/assistant_choose_country"
             style="@style/font6"
-            android:singleLine="true"
+            android:maxLines="1"
             android:gravity="center_vertical|center" />
 
     </LinearLayout>
diff --git a/res/layout/assistant_linphone_login.xml b/res/layout/assistant_linphone_login.xml
index 2f03b512a..0320c9222 100644
--- a/res/layout/assistant_linphone_login.xml
+++ b/res/layout/assistant_linphone_login.xml
@@ -99,7 +99,7 @@
 								android:gravity="center"
 								android:layout_width="65dp"
 								android:layout_height="42dp"
-								android:singleLine="true"/>
+								android:maxLines="1"/>
 
 							<EditText
 								android:id="@+id/phone_number"
@@ -109,7 +109,7 @@
 								android:inputType="phone"
 								android:layout_width="match_parent"
 								android:layout_height="40dp"
-								android:singleLine="true"/>
+								android:maxLines="1"/>
 
 						</LinearLayout>
 
@@ -148,7 +148,7 @@
 					android:contentDescription="@string/content_description_username_field"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 			</LinearLayout>
 
 			<LinearLayout
@@ -173,14 +173,14 @@
 					android:inputType="textPassword"
 					android:layout_width="match_parent"
 					android:layout_height="40dp"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 
 				<TextView
 					android:id="@+id/forgot_password"
 					android:layout_gravity="right"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:singleLine="true"/>
+					android:maxLines="1"/>
 
 			</LinearLayout>
 
diff --git a/res/layout/assistant_login.xml b/res/layout/assistant_login.xml
index f45069c6c..275f79299 100644
--- a/res/layout/assistant_login.xml
+++ b/res/layout/assistant_login.xml
@@ -5,7 +5,7 @@
 
 	<LinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_height="wrap_content"
 		android:padding="30dp"
 		android:orientation="vertical">
 
@@ -49,7 +49,7 @@
 				android:contentDescription="@string/content_description_username_field"
 				android:layout_width="match_parent"
 				android:layout_height="40dp"
-				android:singleLine="true"/>
+				android:maxLines="1"/>
 
 			<TextView
 				android:text="@string/password"
@@ -66,7 +66,7 @@
 				android:inputType="textPassword"
 				android:layout_width="match_parent"
 				android:layout_height="40dp"
-				android:singleLine="true"/>
+				android:maxLines="1"/>
 
 			<TextView
 				android:text="@string/domain"
@@ -84,7 +84,7 @@
 				android:contentDescription="@string/content_description_domain_field"
 				android:layout_width="match_parent"
 				android:layout_height="40dp"
-				android:singleLine="true"/>
+				android:maxLines="1"/>
 
 			<TextView
 				android:visibility="gone"
@@ -104,7 +104,7 @@
 				android:contentDescription="@string/content_description_display_field"
 				android:layout_width="match_parent"
 				android:layout_height="40dp"
-				android:singleLine="true"/>
+				android:maxLines="1"/>
 
 			<TextView
 				android:text="@string/transport"
diff --git a/res/layout/assistant_remote_provisioning.xml b/res/layout/assistant_remote_provisioning.xml
index 483131e1e..c81a66f15 100644
--- a/res/layout/assistant_remote_provisioning.xml
+++ b/res/layout/assistant_remote_provisioning.xml
@@ -45,7 +45,7 @@
 			android:contentDescription="@string/content_description_url_field"
 			android:layout_width="match_parent"
 			android:layout_height="40dp"
-			android:singleLine="true"/>
+			android:maxLines="1"/>
 
 		<Button
 			android:id="@+id/assistant_apply"
diff --git a/res/layout/assistant_remote_provisioning_login.xml b/res/layout/assistant_remote_provisioning_login.xml
index 6bdcb896a..a1c552a80 100644
--- a/res/layout/assistant_remote_provisioning_login.xml
+++ b/res/layout/assistant_remote_provisioning_login.xml
@@ -47,7 +47,7 @@
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
 			android:paddingRight="10dp"
-			android:singleLine="true"/>
+			android:maxLines="1"/>
 
 		<TextView
 			android:text="@string/password"
@@ -67,7 +67,7 @@
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
 			android:paddingRight="10dp"
-			android:singleLine="true"/>
+			android:maxLines="1"/>
 
 
 		<TextView
@@ -89,7 +89,7 @@
 			android:layout_height="40dp"
 			android:paddingLeft="10dp"
 			android:paddingRight="10dp"
-			android:singleLine="true"/>
+			android:maxLines="1"/>
 
 		<Button
 			android:id="@+id/assistant_connect"
@@ -101,10 +101,8 @@
 			android:layout_height="wrap_content"
 			android:paddingLeft="10dp"
 			android:paddingRight="10dp"
-			android:layout_marginTop="20dp"
-			android:layout_centerInParent="true"
-			android:layout_centerVertical="true"/>
+			android:layout_marginTop="20dp"/>
 
 	</LinearLayout>
- 
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/audio.xml b/res/layout/audio.xml
index f2207a6e1..0cc6d9819 100644
--- a/res/layout/audio.xml
+++ b/res/layout/audio.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent" 
+	android:layout_width="match_parent"
 	android:layout_height="match_parent"
     android:paddingTop="40dp"
 	android:background="@color/colorH">
-	
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/call.xml b/res/layout/call.xml
index a23336e45..8376a1909 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/topLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+				xmlns:tools="http://schemas.android.com/tools"
+				android:id="@+id/topLayout"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent">
 
 	<android.support.v4.widget.DrawerLayout
 		android:id="@+id/side_menu"
@@ -21,152 +21,89 @@
 				android:layout_height="match_parent"
 				android:orientation="horizontal"/>
 
-			<FrameLayout
+			<RelativeLayout
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
+				android:layout_marginTop="40dp"
 				android:layout_above="@+id/menu">
 
-				<RelativeLayout
+				<LinearLayout
+					android:id="@+id/conference_list"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginTop="40dp">
+					android:layout_gravity="top"
+					android:layout_alignParentTop="true"
+					android:orientation="vertical"
+					android:visibility="gone">
+				</LinearLayout>
+
+				<RelativeLayout
+					android:id="@+id/active_call"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:visibility="visible">
 
 					<LinearLayout
-						android:id="@+id/conference_list"
+						android:id="@+id/active_call_info"
+						android:background="@color/colorH"
+						android:alpha="0.8"
 						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_gravity="top"
-						android:layout_alignParentTop="true"
-						android:orientation="vertical"
-						android:visibility="gone">
+						android:layout_height="80dp"
+						android:layout_centerHorizontal="true"
+						android:orientation="vertical">
+
+						<TextView
+							android:id="@+id/current_contact_name"
+							style="@style/font5"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:paddingTop="5dp"
+							android:gravity="center"
+							android:layout_gravity="center"/>
+
+						<Chronometer
+							android:id="@+id/current_call_timer"
+							style="@style/font2"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_gravity="center"/>
 					</LinearLayout>
 
 					<RelativeLayout
-						android:id="@+id/active_call"
+						android:id="@+id/avatar_layout"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:visibility="visible">
-
-						<LinearLayout
-							android:id="@+id/active_call_info"
-							android:background="@color/colorH"
-							android:alpha="0.8"
-							android:layout_width="match_parent"
-							android:layout_height="80dp"
-							android:layout_centerHorizontal="true"
-							android:orientation="vertical">
-
-							<TextView
-								android:id="@+id/current_contact_name"
-								style="@style/font5"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:paddingTop="5dp"
-								android:gravity="center"
-								android:layout_alignParentTop="true"
-								android:layout_gravity="center"/>
-
-							<Chronometer
-								android:id="@+id/current_call_timer"
-								style="@style/font2"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_below="@id/current_contact_name"
-								android:layout_gravity="center"/>
-						</LinearLayout>
-
-						<RelativeLayout
-							android:id="@+id/avatar_layout"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:layout_below="@id/active_call_info"
-							android:layout_margin="5dp"
-							android:paddingTop="10dp"
-							android:gravity="center_horizontal">
-
-							<ImageView
-								android:id="@+id/contact_picture"
-								android:src="@drawable/avatar"
-								android:contentDescription="@string/content_description_contact_picture"
-								android:layout_width="200dp"
-								android:layout_height="200dp"
-								android:adjustViewBounds="true"/>
-
-							<ImageView
-								android:id="@+id/mask"
-								android:src="@drawable/avatar_mask_border"
-								android:contentDescription="@string/content_description_contact_picture"
-								android:layout_width="200dp"
-								android:layout_height="200dp"
-								android:adjustViewBounds="true"/>
-
-						</RelativeLayout>
-
-						<LinearLayout
-							android:id="@+id/remote_pause"
-							android:background="@color/colorC"
-							android:alpha="0.9"
-							android:layout_width="match_parent"
-							android:layout_height="match_parent"
-							android:gravity="center"
-							android:orientation="vertical"
-							android:visibility="gone">
-
-							<ImageView
-								android:src="@drawable/waiting_time"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="center"/>
-
-							<TextView
-								android:text="@string/call_paused_by_remote"
-								style="@style/font16"
-								android:layout_width="wrap_content"
-								android:layout_height="wrap_content"
-								android:layout_gravity="center"/>
-
-						</LinearLayout>
+						android:layout_below="@id/active_call_info"
+						android:layout_margin="5dp"
+						android:paddingTop="10dp"
+						android:gravity="center_horizontal">
 
 						<ImageView
-							android:id="@+id/pause"
-							android:src="@drawable/pause_big_default"
-							android:contentDescription="@string/content_description_pause"
-							android:layout_width="80dp"
-							android:layout_height="80dp"
-							android:padding="10dp"
-							android:layout_below="@+id/active_call_info"
-							android:layout_alignParentRight="true"/>
+							android:id="@+id/contact_picture"
+							android:src="@drawable/avatar"
+							android:contentDescription="@string/content_description_contact_picture"
+							android:layout_width="200dp"
+							android:layout_height="200dp"
+							android:adjustViewBounds="true"/>
 
 						<ImageView
-							android:id="@+id/switchCamera"
-							android:src="@drawable/switch_camera"
-							android:layout_width="80dp"
-							android:layout_height="80dp"
-							android:padding="10dp"
-							android:contentDescription="@string/content_description_switch_camera"
-							android:visibility="invisible"
-							android:layout_below="@+id/active_call_info"
-							android:layout_alignParentLeft="true"/>
+							android:id="@+id/mask"
+							android:src="@drawable/avatar_mask_border"
+							android:contentDescription="@string/content_description_contact_picture"
+							android:layout_width="200dp"
+							android:layout_height="200dp"
+							android:adjustViewBounds="true"/>
+
 					</RelativeLayout>
 
 					<LinearLayout
-						android:id="@+id/calls_list"
-						android:background="@color/colorH"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_alignParentBottom="true"
-						android:layout_gravity="bottom"
-						android:orientation="vertical">
-					</LinearLayout>
-
-					<LinearLayout
-						android:id="@+id/no_current_call"
+						android:id="@+id/remote_pause"
 						android:background="@color/colorC"
+						android:alpha="0.9"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
+						android:gravity="center"
 						android:orientation="vertical"
-						android:layout_above="@id/calls_list"
-						android:gravity="center_vertical"
 						android:visibility="gone">
 
 						<ImageView
@@ -176,15 +113,71 @@
 							android:layout_gravity="center"/>
 
 						<TextView
-							android:text="@string/no_current_call"
+							android:text="@string/call_paused_by_remote"
 							style="@style/font16"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
 							android:layout_gravity="center"/>
+
 					</LinearLayout>
 
+					<ImageView
+						android:id="@+id/pause"
+						android:src="@drawable/pause_big_default"
+						android:contentDescription="@string/content_description_pause"
+						android:layout_width="80dp"
+						android:layout_height="80dp"
+						android:padding="10dp"
+						android:layout_below="@+id/active_call_info"
+						android:layout_alignParentRight="true"/>
+
+					<ImageView
+						android:id="@+id/switchCamera"
+						android:src="@drawable/switch_camera"
+						android:layout_width="80dp"
+						android:layout_height="80dp"
+						android:padding="10dp"
+						android:contentDescription="@string/content_description_switch_camera"
+						android:visibility="invisible"
+						android:layout_below="@+id/active_call_info"
+						android:layout_alignParentLeft="true"/>
 				</RelativeLayout>
-			</FrameLayout>
+
+				<LinearLayout
+					android:id="@+id/calls_list"
+					android:background="@color/colorH"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_alignParentBottom="true"
+					android:layout_gravity="bottom"
+					android:orientation="vertical">
+				</LinearLayout>
+
+				<LinearLayout
+					android:id="@+id/no_current_call"
+					android:background="@color/colorC"
+					android:layout_width="match_parent"
+					android:layout_height="match_parent"
+					android:orientation="vertical"
+					android:layout_above="@id/calls_list"
+					android:gravity="center_vertical"
+					android:visibility="gone">
+
+					<ImageView
+						android:src="@drawable/waiting_time"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"/>
+
+					<TextView
+						android:text="@string/no_current_call"
+						style="@style/font16"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center"/>
+				</LinearLayout>
+
+			</RelativeLayout>
 
 			<LinearLayout
 				android:id="@+id/menu"
@@ -204,23 +197,23 @@
 						android:layout_height="wrap_content"
 						android:layout_weight="1">
 
-					<ImageView
-						android:id="@+id/video"
-						android:src="@drawable/camera_button"
-						android:background="@drawable/button_background"
-						android:contentDescription="@string/content_description_switch_video"
-						android:padding="20dp"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"/>
+						<ImageView
+							android:id="@+id/video"
+							android:src="@drawable/camera_button"
+							android:background="@drawable/button_background"
+							android:contentDescription="@string/content_description_switch_video"
+							android:padding="20dp"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"/>
 
-					<ProgressBar
-						android:id="@+id/video_in_progress"
-						style="?android:attr/progressBarStyle"
-						android:layout_centerHorizontal="true"
-						android:layout_centerVertical="true"
-						android:visibility="gone"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"/>
+						<ProgressBar
+							android:id="@+id/video_in_progress"
+							style="?android:attr/progressBarStyle"
+							android:layout_centerHorizontal="true"
+							android:layout_centerVertical="true"
+							android:visibility="gone"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"/>
 
 					</RelativeLayout>
 
diff --git a/res/layout/call_inactive_row.xml b/res/layout/call_inactive_row.xml
index ba0188795..e1cb2818a 100644
--- a/res/layout/call_inactive_row.xml
+++ b/res/layout/call_inactive_row.xml
@@ -18,7 +18,7 @@
    	<TextView
         android:id="@+id/contact_name"
 		style="@style/font14"
-		android:singleLine="true"
+		android:maxLines="1"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -34,7 +34,7 @@
 		android:paddingLeft="10dp"
 		android:paddingRight="20dp"
 		android:gravity="center_vertical|right"/>
-    
+
     <ImageView
 		android:id="@+id/call_pause"
 		android:src="@drawable/pause_small_over_selected"
diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 357d7a6d3..1077f67a2 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -25,7 +25,7 @@
 			android:id="@+id/contact_name"
 			style="@style/font6"
 			android:ellipsize="end"
-			android:singleLine="true"
+			android:maxLines="1"
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
 			android:layout_weight="0.4"
diff --git a/res/layout/chat_bubble.xml b/res/layout/chat_bubble.xml
index 74c25108f..181c85711 100644
--- a/res/layout/chat_bubble.xml
+++ b/res/layout/chat_bubble.xml
@@ -2,12 +2,12 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content">
-	
+
 	<RelativeLayout
 		android:id="@+id/bubble"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content">
-	
+
 		<CheckBox
 			android:id="@+id/delete_message"
 			android:button="@drawable/checkbox"
@@ -19,20 +19,19 @@
 			android:adjustViewBounds="true"
 			android:layout_alignParentRight="true"
 			android:visibility="gone"/>
-	
-		
+
+
 		<LinearLayout
 		    android:id="@+id/background"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_toLeftOf="@id/delete_message"
 			android:orientation="horizontal">
-			
+
 		    <RelativeLayout
 				android:id="@+id/avatar_layout"
 				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_centerHorizontal="true">
+				android:layout_height="wrap_content">
 
 				<ImageView
 					android:id="@+id/contact_picture"
@@ -54,7 +53,7 @@
 					android:adjustViewBounds="true"/>
 
 			</RelativeLayout>
-	
+
 			<LinearLayout
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -65,10 +64,10 @@
 
 				<TextView
 					android:id="@+id/contact_header"
-					android:singleLine="true"
+					android:maxLines="1"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"/>
-	
+
 				<TextView
 					android:id="@+id/message"
 					style="@style/font11"
@@ -77,21 +76,20 @@
 					android:visibility="gone"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content" />
-	
+
 				<ImageView
 					android:id="@+id/image"
 					android:visibility="gone"
 					android:layout_width="150dp"
 					android:layout_height="150dp"
-					android:scaleType="centerInside"
-					android:layout_centerInParent="true" />
-	
+					android:scaleType="centerInside"/>
+
 				<RelativeLayout
 					android:id="@+id/file_transfer_layout"
 					android:visibility="gone"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content">
-	
+
 					<ProgressBar
 						android:id="@+id/progress_bar"
 						style="@android:style/Widget.ProgressBar.Horizontal"
@@ -100,7 +98,7 @@
 						android:layout_marginBottom="10dp"
 						android:layout_width="150dp"
 						android:layout_height="5dp"/>
-	
+
 					<Button
 						android:id="@+id/file_transfer_action"
 						android:layout_width="wrap_content"
@@ -112,7 +110,6 @@
 					android:id="@+id/imdmLayout"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_alignParentBottom="true"
 					android:layout_alignParentRight="true"
 					android:layout_marginTop="2dp"
 					android:layout_marginBottom="2dp"
@@ -126,7 +123,7 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:text="Displayed"
-						android:textSize="10dp"
+						android:textSize="12sp"
 						android:paddingRight="3dp"/>
 					<ImageView
 						android:id="@+id/imdmIcon"
@@ -140,7 +137,7 @@
 			</LinearLayout>
 
 		</LinearLayout>
-	
+
 		<RelativeLayout
 		    android:layout_alignRight="@id/background"
 		    android:layout_alignTop="@id/background"
@@ -148,7 +145,7 @@
 			android:layout_height="15dp"
 			android:paddingTop="5dp"
 			android:paddingBottom="3dp">
-			
+
 			<ImageView
 				android:id="@+id/status"
 				android:contentDescription="@string/content_description_message_status"
@@ -159,7 +156,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"
 				android:adjustViewBounds="true" />
-	
+
 			<ProgressBar
 				android:id="@+id/inprogress"
 				android:visibility="gone"
@@ -168,9 +165,9 @@
 				android:paddingRight="5dp"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"/>
-		
+
 		</RelativeLayout>
 
 	</RelativeLayout>
-	
+
 </RelativeLayout>
diff --git a/res/layout/chatlist_cell.xml b/res/layout/chatlist_cell.xml
index 0c08eede5..7b7926abf 100644
--- a/res/layout/chatlist_cell.xml
+++ b/res/layout/chatlist_cell.xml
@@ -59,7 +59,7 @@
 				android:layout_height="wrap_content"
 				android:layout_below="@id/avatar_layout"
 				android:layout_marginTop="5dp"
-				android:singleLine="true"
+				android:maxLines="1"
 				style="@style/font2"/>
 
 		</RelativeLayout>
@@ -75,7 +75,7 @@
 				android:lines="1"
 				android:ellipsize="end"
 				android:scrollHorizontally="true"
-				android:singleLine="true"
+				android:maxLines="1"
 				style="@style/font6"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -89,7 +89,7 @@
 				android:background="@drawable/chat_list_indicator"
 				style="@style/font18"
 				android:gravity="center"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:layout_above="@+id/lastMessage"
 				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true"/>
diff --git a/res/layout/conf_call_control_row.xml b/res/layout/conf_call_control_row.xml
index 4c8fd365f..81b3e831c 100644
--- a/res/layout/conf_call_control_row.xml
+++ b/res/layout/conf_call_control_row.xml
@@ -26,7 +26,7 @@
 		<TextView
 			android:id="@+id/contactNameOrNumber"
 			style="@style/font6"
-			android:singleLine="true"
+			android:maxLines="1"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:gravity="center_vertical|left"
diff --git a/res/layout/conference_paused_row.xml b/res/layout/conference_paused_row.xml
index 339fe74a4..1b7907a50 100644
--- a/res/layout/conference_paused_row.xml
+++ b/res/layout/conference_paused_row.xml
@@ -19,14 +19,14 @@
         android:id="@+id/contact_name"
 		android:text="@string/conference"
 		style="@style/font14"
-		android:singleLine="true"
+		android:maxLines="1"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_vertical|left"
         android:paddingLeft="20dp"
        	android:paddingRight="10dp"/>
-    
+
     <ImageView
 		android:id="@+id/conference_pause"
 		android:src="@drawable/pause_small_over_selected"
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 9f3de8408..2242b686c 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -87,15 +87,15 @@
 			<TextView
 				android:id="@+id/contact_name"
 				style="@style/font5"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:layout_gravity="center"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>
-			
-			<TextView 
+
+			<TextView
 			    android:id="@+id/contactOrganization"
 				style="@style/font9"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:layout_gravity="center"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"/>
@@ -108,7 +108,7 @@
 				android:paddingTop="10dp"/>
 
 		</LinearLayout>
-    
+
     </ScrollView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/contact_cell.xml b/res/layout/contact_cell.xml
index 537707085..5642cfb3b 100644
--- a/res/layout/contact_cell.xml
+++ b/res/layout/contact_cell.xml
@@ -109,7 +109,7 @@
 				style="@style/font6"
 				android:lines="1"
 				android:ellipsize="end"
-				android:singleLine="true"
+				android:maxLines="1"
 			    android:layout_width="wrap_content"
 			    android:layout_height="wrap_content"
 			    android:layout_alignParentTop="true"/>
@@ -117,7 +117,7 @@
 			<TextView
 			    android:id="@+id/contactOrganization"
 				style="@style/font9"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 			    android:layout_alignParentBottom="true"/>
diff --git a/res/layout/contact_control_row.xml b/res/layout/contact_control_row.xml
index 03d21fda1..99f1254c3 100644
--- a/res/layout/contact_control_row.xml
+++ b/res/layout/contact_control_row.xml
@@ -54,7 +54,7 @@
 			android:marqueeRepeatLimit="marquee_forever"
 			android:scrollHorizontally="true"
 			android:fadingEdge="horizontal"
-			android:singleLine="true"
+			android:maxLines="1"
 			android:gravity="center" />
 
 		<LinearLayout
@@ -85,5 +85,5 @@
 
 		</LinearLayout>
 	</LinearLayout>
-  
+
   </TableRow>
\ No newline at end of file
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index 015a512ac..0ac31123c 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -4,6 +4,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+	<RelativeLayout
+		android:id="@+id/dialer"
+		android:background="@color/colorH"
+		android:layout_marginBottom="50dp"
+		android:layout_centerHorizontal="true"
+		android:layout_alignParentBottom="true"
+		android:layout_width="300dp"
+		android:layout_height="460dp"
+		android:visibility="gone">
+	</RelativeLayout>
+
 	<RelativeLayout
 		android:id="@+id/address_bar"
 		android:background="@color/colorF"
@@ -47,7 +58,7 @@
 		android:layout_above="@id/controls"
 		android:layout_below="@id/address_bar"
 		android:layout_centerInParent="true"/>
-    
+
     <LinearLayout
         android:id="@+id/controls"
         android:layout_alignParentBottom="true"
diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml
index 295c27d6d..4c52fab29 100644
--- a/res/layout/history_cell.xml
+++ b/res/layout/history_cell.xml
@@ -105,7 +105,7 @@
 				style="@style/font6"
 				android:lines="1"
 				android:ellipsize="end"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:gravity="center_vertical"
 				android:layout_width="wrap_content"
 				android:layout_height="match_parent"
diff --git a/res/layout/in_app_store.xml b/res/layout/in_app_store.xml
index cccaf054e..573d25a52 100644
--- a/res/layout/in_app_store.xml
+++ b/res/layout/in_app_store.xml
@@ -4,8 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
-    
-    <LinearLayout 
+
+    <LinearLayout
 	    android:layout_width="match_parent"
 	    android:layout_height="wrap_content"
 		android:padding="30dp"
@@ -34,7 +34,7 @@
 				android:inputType="text|textEmailAddress"
 				android:layout_width="match_parent"
 				android:layout_height="40dp"
-				android:singleLine="true"/>
+				android:maxLines="1"/>
 
 			<TextView
 				android:id="@+id/username_error"
@@ -43,7 +43,7 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:visibility="invisible"/>
-        
+
         </LinearLayout>
 
 		<LinearLayout
@@ -70,7 +70,7 @@
 				android:layout_height="40dp"
 				android:paddingLeft="10dp"
 				android:paddingRight="10dp"
-				android:singleLine="true"/>
+				android:maxLines="1"/>
 
 		</LinearLayout>
     </LinearLayout>
diff --git a/res/layout/incall_stats.xml b/res/layout/incall_stats.xml
index 5e876d889..99a084b95 100644
--- a/res/layout/incall_stats.xml
+++ b/res/layout/incall_stats.xml
@@ -6,7 +6,7 @@
 	<LinearLayout
 		android:orientation="vertical"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent">
+		android:layout_height="wrap_content">
 
 		<TextView
 			android:layout_width="match_parent"
@@ -23,7 +23,7 @@
 			android:id="@+id/callStatsAudio"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_gravity="left|center"
+			android:layout_gravity="start|center"
 			android:paddingBottom="10dp"
 			android:paddingLeft="5dp"
 			android:paddingRight="5dp">
@@ -122,8 +122,8 @@
 				android:gravity="center"
 				android:textColor="@color/colorB"
 				android:textSize="12sp"/>
-			
-			<TextView 
+
+			<TextView
 				android:id="@+id/jitterBufferAudio"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
diff --git a/res/layout/input_dialog.xml b/res/layout/input_dialog.xml
index bb489dc18..31d0571a2 100644
--- a/res/layout/input_dialog.xml
+++ b/res/layout/input_dialog.xml
@@ -23,7 +23,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="40dp"
 		android:layout_margin="20dp"
-		android:singleLine="true"/>
+		android:maxLines="1"/>
 
 	<LinearLayout
 		android:layout_width="match_parent"
diff --git a/res/layout/new_password.xml b/res/layout/new_password.xml
index 703c7b1b5..61cac01de 100644
--- a/res/layout/new_password.xml
+++ b/res/layout/new_password.xml
@@ -24,7 +24,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="40dp"
 		android:layout_margin="20dp"
-		android:singleLine="true"/>
+		android:maxLines="1"/>
 
 	<TextView
 		android:id="@+id/customText"
@@ -45,7 +45,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="40dp"
 		android:layout_margin="20dp"
-		android:singleLine="true" />
+		android:maxLines="1"/>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index e7407e67a..956ce08f7 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -55,7 +55,7 @@
     <string name="pref_wizard_key">pref_wizard_key</string>
     <string name="pref_activated_key">pref_activated_key</string>
     <string name="pref_debug_key">pref_debug_key</string>
-    <string name="first_launch_suceeded_once_key">first_launch_suceeded_once_key</string>
+    <string name="first_launch_succeeded_once_key">first_launch_succeeded_once_key</string>
 
     <string name="pref_wifi_only_key">pref_wifi_only_key</string>
 	<string name="pref_doze_mode_key">pref_doze_mode_key</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9551c1a21..081f721c3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,7 +47,7 @@
     <string name="maybe_later">Maybe later</string>
     <string name="later">Later</string>
     <string name="no">No</string>
-    <string name="ok">Ok</string>
+    <string name="ok">OK</string>
     <string name="yes">Yes</string>
     <string name="link_account">Link your account</string>