diff --git a/res/layout-small/dialer.xml b/res/layout-small/dialer.xml
new file mode 100644
index 000000000..5e1bc13eb
--- /dev/null
+++ b/res/layout-small/dialer.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+  	android:background="@drawable/background"
+    android:orientation="vertical">
+    
+    <org.linphone.ui.AddressText
+        android:id="@+id/Adress"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="0.35"
+        android:textColor="@android:color/white"
+        android:background="@drawable/dialer_address_background"
+        android:inputType="textEmailAddress"
+        android:hint="@string/addressHint"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+       	android:layout_gravity="center" />
+	
+    <org.linphone.ui.Numpad 
+	    android:id="@+id/Dialer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="0.15" />
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="0.35" >
+        
+        <ImageView
+            android:contentDescription="@string/content_description_add_contact"
+            android:id="@+id/addContact"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:scaleType="fitXY"
+            android:src="@drawable/add_contact" />
+        
+        <org.linphone.ui.CallButton
+            android:id="@+id/Call"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:scaleType="fitXY"
+            android:src="@drawable/call" />
+        
+        <org.linphone.ui.EraseButton
+            android:id="@+id/Erase"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:scaleType="fitXY"
+            android:src="@drawable/backspace" />
+        
+    </LinearLayout>
+	
+</LinearLayout>
diff --git a/res/layout-small/incall.xml b/res/layout-small/incall.xml
new file mode 100644
index 000000000..a5ce7410c
--- /dev/null
+++ b/res/layout-small/incall.xml
@@ -0,0 +1,188 @@
+<?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:app="http://schemas.android.com/apk/res/org.linphone">
+    
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true">
+
+        <LinearLayout
+            android:id="@+id/fragmentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal" />
+	
+		<TableLayout 
+	        android:id="@+id/calls"
+	    	android:paddingTop="20dp"
+		    android:layout_width="match_parent"
+		    android:layout_height="wrap_content"
+		    android:gravity="top" />
+
+        <fragment
+            android:id="@+id/status"
+            android:name="org.linphone.StatusFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:layout="@layout/status" />
+        
+    </FrameLayout>
+
+    <ImageView
+        android:id="@+id/switchCamera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/content_description_switch_camera"
+        android:layout_marginTop="20dp"
+        android:visibility="invisible"
+        android:src="@drawable/switch_camera" />
+    
+    <org.linphone.ui.Numpad
+        android:id="@+id/numpad"
+        android:background="@drawable/dialer_alt_background"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:visibility="invisible"
+        android:layout_centerHorizontal="true"
+        android:layout_below="@id/switchCamera"
+        android:layout_marginBottom="150dp" />
+
+    <LinearLayout
+        android:id="@+id/menu"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+       	android:visibility="gone"
+        android:gravity="right"
+        android:orientation="vertical" >
+
+        <TextView
+           	android:id="@+id/transfer"
+           	android:background="@drawable/options_transfer"
+        	android:text="@string/button_transfer"
+        	android:gravity="center"
+        	android:paddingTop="40dp"
+           	android:visibility="invisible"
+        	android:textColor="@drawable/text_incall_button_color"
+           	android:layout_width="wrap_content"
+           	android:layout_height="wrap_content" />
+
+       <TextView
+			android:id="@+id/addCall"
+       		android:background="@drawable/options_add_call_alt"
+        	android:text="@string/button_add_call"
+        	android:gravity="center"
+        	android:paddingTop="40dp"
+        	android:textColor="@drawable/text_incall_button_color"
+           	android:layout_width="wrap_content"
+           	android:layout_height="wrap_content"
+           	android:visibility="invisible" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:id="@+id/video"
+                android:background="@drawable/video_off"
+	            android:text="@string/button_video"
+	            android:gravity="center"
+	            android:paddingTop="45dp"
+	            android:textColor="@drawable/text_incall_button_color"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/micro"
+                android:background="@drawable/micro_on"
+	            android:text="@string/button_micro"
+	            android:gravity="center"
+	            android:paddingTop="45dp"
+	            android:textColor="@drawable/text_incall_button_color"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/speaker"
+                android:background="@drawable/speaker_off"
+	            android:text="@string/button_speaker"
+	            android:gravity="center"
+	            android:paddingTop="45dp"
+	            android:textColor="@drawable/text_incall_button_color"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/options"
+                android:background="@drawable/options"
+	            android:text="@string/button_options"
+	            android:gravity="center"
+	            android:paddingTop="45dp"
+	            android:textColor="@drawable/text_incall_button_color"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+        	android:background="@android:color/black"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/pause"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:adjustViewBounds="true"
+                android:contentDescription="@string/content_description_pause"
+                android:scaleType="fitXY"
+                android:src="@drawable/pause_off" />
+            
+            <ImageView
+                android:id="@+id/conference"
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:adjustViewBounds="true"
+                android:contentDescription="@string/content_description_conference"
+                android:scaleType="fitXY"
+                android:src="@drawable/conference" />
+
+            <ImageView
+                android:id="@+id/hangUp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.97"
+                android:adjustViewBounds="true"
+                android:contentDescription="@string/content_description_hang_up"
+                android:scaleType="fitXY"
+                android:src="@drawable/hangup" />
+
+            <ImageView
+                android:id="@+id/dialer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:adjustViewBounds="true"
+                android:contentDescription="@string/content_description_numpad"
+                android:scaleType="fitXY"
+                android:src="@drawable/dialer_alt" />
+            
+        </LinearLayout>
+        
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout-small/main.xml b/res/layout-small/main.xml
index 48c1969d8..a5fd43cb9 100644
--- a/res/layout-small/main.xml
+++ b/res/layout-small/main.xml
@@ -9,7 +9,7 @@
     <LinearLayout
 	    android:id="@+id/mark"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="60dp"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
     
@@ -90,7 +90,7 @@
     <LinearLayout
         android:id="@+id/menu"
         android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="70dp"
         android:layout_alignParentBottom="true"
         android:orientation="horizontal">
 
diff --git a/res/layout-small/setup_menu.xml b/res/layout-small/setup_menu.xml
new file mode 100644
index 000000000..d7b0bcd53
--- /dev/null
+++ b/res/layout-small/setup_menu.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    
+    <ImageView 
+	    android:paddingTop="40dp"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:src="@drawable/setup_title_assistant"/>
+    
+    <LinearLayout 
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:paddingTop="40dp"
+	    android:gravity="center"
+	    android:orientation="vertical">
+        
+        <RelativeLayout
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:layout_weight="0.7"
+		    android:layout_marginBottom="10dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
+            
+	        <ImageView
+	            android:id="@+id/setup_create_account"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+	            android:adjustViewBounds="true"
+	            android:scaleType="fitXY"
+	            android:src="@drawable/button"
+		    	android:layout_centerInParent="true" />
+	        
+	        <TextView 
+		    	android:layout_centerInParent="true"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:text="@string/setup_create_account"
+			    android:textColor="@android:color/black"/>
+        
+        </RelativeLayout>
+        
+        <RelativeLayout
+            android:id="@+id/setup_login_linphone_layout"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:layout_weight="0.7"
+		    android:layout_marginBottom="10dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
+            
+	        <ImageView
+	            android:id="@+id/setup_login_linphone"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+	            android:adjustViewBounds="true"
+	            android:scaleType="fitXY"
+	            android:src="@drawable/button"
+		    	android:layout_centerInParent="true" />
+	        
+	        <TextView 
+		    	android:layout_centerInParent="true"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:text="@string/setup_login_linphone"
+			    android:textColor="@android:color/black"/>
+	        
+        </RelativeLayout>
+        
+        <RelativeLayout
+            android:id="@+id/setup_login_generic_layout"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:layout_weight="0.7"
+		    android:layout_marginBottom="10dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
+            
+	        <ImageView
+	            android:id="@+id/setup_login_generic"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+	            android:adjustViewBounds="true"
+	            android:scaleType="fitXY"
+	            android:src="@drawable/button"
+		    	android:layout_centerInParent="true" />
+	        
+	         <TextView 
+		    	android:layout_centerInParent="true"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:text="@string/setup_login_generic"
+			    android:textColor="@android:color/black"/>
+        
+        </RelativeLayout>
+        
+    </LinearLayout>
+    
+</LinearLayout>
\ No newline at end of file