From 18d5706572034003290eda89cfe5cd0a0b1b5e2d Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 18 Sep 2015 18:08:44 +0200
Subject: [PATCH] Update Linphone Main with side menu/ Dialer

---
 .../topbar_call_notification.png              | Bin 0 -> 926 bytes
 .../topbar_chat_notification.png              | Bin 0 -> 986 bytes
 .../topbar_videocall_notification.png         | Bin 0 -> 506 bytes
 res/drawable-xhdpi/waiting_time.png           | Bin 0 -> 4407 bytes
 res/drawable/quit.xml                         |   7 +
 res/drawable/security_ko.png                  | Bin 1876 -> 0 bytes
 res/drawable/security_ok.png                  | Bin 1340 -> 0 bytes
 res/drawable/security_pending.png             | Bin 1658 -> 0 bytes
 res/layout/about.xml                          |  39 +-
 res/layout/accounts.xml                       |  40 +-
 res/layout/dialer.xml                         |  21 +-
 res/layout/drawer_list_item.xml               |  12 -
 res/layout/edit_list.xml                      |  50 ++
 res/layout/incall_stats.xml                   | 155 ++++++
 res/layout/launch_screen.xml                  |   5 +-
 res/layout/main.xml                           | 400 +++++++-------
 res/layout/menu_chat_button.xml               |  29 -
 res/layout/menu_contact_button.xml            |  28 -
 res/layout/menu_history_button.xml            |  29 -
 res/layout/numpad.xml                         |   4 +-
 res/layout/side_menu_default_account.xml      |  51 ++
 res/layout/side_menu_item.xml                 |   9 +
 res/layout/status.xml                         | 325 +++--------
 res/values/color.xml                          |   3 +
 res/values/digit_style.xml                    |   8 +-
 res/values/non_localizable_custom.xml         |   5 -
 res/values/strings.xml                        |   9 +-
 res/values/styles.xml                         |  27 +-
 src/org/linphone/AboutFragment.java           |   7 -
 src/org/linphone/ChatActivity.java            |  68 ---
 src/org/linphone/LinphoneActivity.java        | 506 +++++++++---------
 src/org/linphone/LinphoneService.java         |   6 +-
 .../linphone/assistant/AssistantActivity.java |   2 +-
 .../assistant/RemoteProvisioningFragment.java |   2 +-
 src/org/linphone/ui/AddressText.java          |   2 +-
 35 files changed, 857 insertions(+), 992 deletions(-)
 create mode 100644 res/drawable-xhdpi/topbar_call_notification.png
 create mode 100644 res/drawable-xhdpi/topbar_chat_notification.png
 create mode 100644 res/drawable-xhdpi/topbar_videocall_notification.png
 create mode 100644 res/drawable-xhdpi/waiting_time.png
 create mode 100644 res/drawable/quit.xml
 delete mode 100644 res/drawable/security_ko.png
 delete mode 100644 res/drawable/security_ok.png
 delete mode 100644 res/drawable/security_pending.png
 delete mode 100644 res/layout/drawer_list_item.xml
 create mode 100644 res/layout/edit_list.xml
 create mode 100644 res/layout/incall_stats.xml
 delete mode 100644 res/layout/menu_chat_button.xml
 delete mode 100644 res/layout/menu_contact_button.xml
 delete mode 100644 res/layout/menu_history_button.xml
 create mode 100644 res/layout/side_menu_default_account.xml
 create mode 100644 res/layout/side_menu_item.xml
 delete mode 100644 src/org/linphone/ChatActivity.java

diff --git a/res/drawable-xhdpi/topbar_call_notification.png b/res/drawable-xhdpi/topbar_call_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f0b96fea414a27e372f3930c36a7b12e4b9158b
GIT binary patch
literal 926
zcmV;P17ZA$P)<h;3K|Lk000e1NJLTq001Wd001Wl1^@s6jH6LC00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy00TZrL_t(o!_An>Z%siQ$G>x>C{;9~
zln|wfgm^`0;#qG&5sOMJu$8Etg?grc02>xaBwCLM5fWl!B@rPK6bXV>yn;nrb?cV)
zV_}+%$vyX++xFc0?dEsBzxjR6%$(oM94W+rVxR_?tN+P>wZK>YS_;_sKR_8^AMl%h
zEeWjbPq0zIO@gg|0D)D&7Z2t#Fa>CEd?}zZS5OJyus4kzz#hO@&FFps1P*zl^%Yo?
zMppv7$mtXV51fSefC(A2xdQ}7IMewP7!n~S9pL!BW=lv~C~1Ig-#5l2!-9-4A0=IN
zT=|lU;(#0Hw4X*C?X8mbI<Di!m?v?-6*}$K2w)YG&Pp=Ybxl%r97`@CslaI`L%=3V
zx*#dfx}HngZj9-Q3$D#+7iIt(De0D^V(a=KX{9lyC9W!xko3uEmjvy#lIkQ)wXT$;
zD*Iu?TH`95l5i(LGs`Q|wYl25N}Qx^KwcV60r1+<eFqlh3eYX63j#FbfmdGPU6Bj8
z(@xTw47y1`qc_rv<A$qp5<U;nP6C=dz$J0Q<pa%5!udS_T$)9`B|vF5fG3?~XCmlJ
z(*Rb4#0&<`Ics)PRJeIgqF+E+4*-7z0oudrU9TiXKd=HfoWS~sG3fx8d7A0K+kiVs
z3RoW{(Hx-526aYVM;7p%2e{lmTLZK>&pLr4z)Q#X6Id4|(RnB64KOSs;N&!b$Ltd6
zwpL(+)sIU9xHc@wXy+mga5jsN$_I3<5t!lWeZY2Lby$*ZUdIP|33wMM4$!9qTosn2
z&I#xOc4P_I{gKoIgG2N_U=o;>DPSOQ+XLL+eUFU*I24$eg}&Sy?OkC3!-2<M&^e&6
zk9Vj%uLd^R!)<6_0dU;|{M?tfec*&Qr8BdAvr`^m7jO}n)=RK0PHhFK?rBF=z&8)F
z6S!ng)QK$nEAtBUrQS}#7~qQcwr<g`1(pK^A^j8qkDS;S{#rJ@fSe=gprp!xetz4l
zW0Rytd+p4ZG*r@TNi&^44M|Dm#+Zh_J_}9*j(WRFwzf0w)AT@Kv;Fd(MF8pm?gP66
z|H;G%TP&%}{)-taX^^BANzIbpOL}OGY0uQhAE44ZQP&9)X8-^I07*qoM6N<$f?|f7
AB>(^b

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/topbar_chat_notification.png b/res/drawable-xhdpi/topbar_chat_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f35ff4e6b54594b2ab261c495f0d6467236baa9
GIT binary patch
literal 986
zcmV<0110>4P)<h;3K|Lk000e1NJLTq001Qb001Qj1^@s6#hxGo00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy00VkSL_t(o!|j+)Xk1kkhrg4IjcsC}
zY0=o43YON=L`BhpB8o~u6c@U(3!{PrtU{qHg@RR((rgqFTw51zM5R()h!HeVix!NE
zX(5VLY-!q3=^xXCB%hl*av9#3$;@O{9(c@~d(Q8i-@EtRd(L}7ouaM-HUhorS_Mp{
z>m=|~M9i|>qTZ_xtK%*%7u195PPMn$MB3Fs^+)TMS@nRrxt5r*2%#;&JHYJ)>Px_P
zzzN_qFb%8)t_E%Z`U^0#z<%JBh?uKqhMrb07A(n|>UOnb5&Q;qNF6Phxlwh)QV9(g
zka<~M(?BkMR^juE+Fz@KJr&@?>h(>^&mnat^F5_*S`4&9UC2Nmshv&UIQOXMvlu^D
zjgfNTugrKvy>gk3miyJqS*-ol4ByR+Ce*8z`OF)vI5PSx4Yp>>wxHfg3q<`iPnAmL
zYnk!`S|sX?>RgIDr}q7Oc&fhxeaZHLh#08=cL7fT-3@RUjfk-VVuyf-(%)SX@kW_#
zS<b5M1;7I~E_10uRQi4<vpERR2Hc$4d=nA#1y9-Cgw<*Xinjh&+5JrbC18CvI9bKv
zPGB79Xn@psL>ws?p9D;)be$R{per*tUs$yxP5>`0N3uu6tU8_gu@bPd1k7YM9aVNo
z0CzOFj6X!gR2ARlxB@e!)OM7mTIGHfc(K7rIj0V!S<hu%$~S<s5i#EeOk@VPRdKkj
z2`jZ4C~ETZm=onh|2{Qroxmn_V?_K?0ek`2+i0Q#Ulfc#oZXM*>-v6nR_trxiQcK6
z%VOV^D<8=emzLZW)=z3*-ojKW+fp-EmiJmfXlq5ox1-2tAhi%>*|Us<u2m<qScm@0
z`1Q<iK^<HMLfz`OS)A#jnwSGh>c<s;o+c9NPwj7Bq#vyX*rguJfZLluW`+7}!7JO)
zQk=Y<0S6l(vsT@u{!u~ZqWWYtT&c=<{z`Q^3(^A&19t<5fg`|i;0$m%m5V-L0C+If
z%l3jp^zn!|x|FB8HEU7l)zxYIKJ`=sP2O?!xy9bBiwJF2f6M!I^&0i9M6jL@8=t4{
zaz(8?N{LJ_up4+DSefZp0l%i-vYY~*0=A@Lx(4V0u1NZmz%k%UU?d_g)RT<c)W2(d
z@=w(Dt*Ae{YasKr`dF(9b$Q!<s2)vQbzc2b9aHzJxA4EfKg_c$9Q4u+1ONa407*qo
IM6N<$f-3&d1poj5

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/topbar_videocall_notification.png b/res/drawable-xhdpi/topbar_videocall_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..e91df18853130a6fb1de8a1d054a35b7bb9ce986
GIT binary patch
literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq001Wd000*V1^@s6h}l+{00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy00EjwL_t(Y$IX^KXcSQtM$fk!&=?T{
zV#)}D7C}T2Yas!#5bR8ofHvA$+9*T>!PY)PL?MEmAQ57^6lnyJ_=lyH#KJ;QkQ|!{
z43Bl)W@qPvf&1Rv2ZwuS?)#z!xC$I+_}T@YCwVhawz^=m`k@~92g{uLMg6EwcYtFw
zt3$w%0;;Pn0k0~a6Ttjfad5qQhM`-)WRGf10Z)P1;?=$qZZpY)VUVdeN;vf*@EADU
z>r98ysH5HnUev&LfzNG#dj{MCy4Cs{Z~<6t1KinKyavo9S#L{Q_u6<LxRhk4SHf6>
zFn?<C4zQ49t?!4~Al#FxS{uOW|A93Mm*j4eZj#v~UkCc7n}Snk)JN)-f#*$wZC$Pm
z#;UraPP7SbsunK-+v>Ttz?GT?Hq^zo!R?Ke31CHCR>#`{cNzFlTVDgVO2a!UxNYDJ
z@UXUb5}5CIL+n>4hvh_yx%UgWslKZq$9v76C7ajLg5i|<smQt00ltr*t-p&ZzO9@}
w-7>w8da!b%=No|f3A{{lz0XZD2bkpbU)YX=w|pc>EdT%j07*qoM6N<$f>TN5D*ylh

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/waiting_time.png b/res/drawable-xhdpi/waiting_time.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd949a26f902e341b709e88e918c655142dc2ecb
GIT binary patch
literal 4407
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
TYj(%+zXu2~K^vD{#69>gdG&3h

literal 0
HcmV?d00001

diff --git a/res/drawable/quit.xml b/res/drawable/quit.xml
new file mode 100644
index 000000000..f85f9638b
--- /dev/null
+++ b/res/drawable/quit.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="true"
+		  android:drawable="@drawable/quit_over" />
+	<item
+		android:drawable="@drawable/quit_default" />
+</selector>
diff --git a/res/drawable/security_ko.png b/res/drawable/security_ko.png
deleted file mode 100644
index bf75d1b27a079321372c66a4239434ff6819d7d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1876
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
X%+t(>((I3fJolU?d8w*dVXXQaSpuga

diff --git a/res/drawable/security_ok.png b/res/drawable/security_ok.png
deleted file mode 100644
index 0a48c7d1464962b9304307449de57e3c806ec44b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1340
zcmbVMTWs4@7(VGGbQ>*Ms}(x7$~a*K(Z<J48YfoW=Hi3~mM&@|5iXnJCMS()VmppY
z(=w!}K-oqo`hZINuxSz!u$KxR7)X_%l{(gOkr1~so+dG-shd_1+av^{9Jfv3q1pqM
zET8}Q`@a8j{{I}0_B>v@bMH<7KyA2N=*8a#{60`)2Ee3D-kHHhlOBxgeM(v%7BvKX
zDWx9~;hZ>tdXbnK$zMbr092->SX_@s4suB)XBQ2Oy_i!m8-R|kqADf_kxulZ0ZHb`
z)wxeeLQ3)EQ|%ELQ3EI=b&qPOZ?q?t934!0Qe;;r(NW~EKo035QOsrK0$1e8bzKgx
zjctk~)*<>JPi_Pik3@-pq9LN)4%?E@1ql~zryWj~Wm^db(vX4-MKf(Q%Q+YhLSpkF
zu{SN1=6Z$DrY~&qWJcFjj-rN#hwZ}-yP^$Hw8!HyG#I80BiafhvMv_e<bt)VAfQ50
zlT=+&WWrDs`;{S`Cvl`3Ddf~hWJ_2sY!(Waj4FyMMcW~j%NcpCqYHX3`ZtVi(S_KE
zil|;xP=>T5K997uOvbglyCVaLqu~x|5<V0$D=5jK9Fq00z?1loJtd_$NV_3Tvrfn|
z(B-CSUnmgp_ycUn6=0#qN0&9W<9d9oi}gD_zM#`V(?QzjqM^stE`%IG=npZl%ni#0
zU6hlk>{r5mH@WV+a=CzpL|xHhijpmNKs2N1N+F}DM4+#oh=@r^Hf-Z~HnJ6vCcS`C
zAx+5<>-FWNZT!1K(9bxa(*ZZ~_TbP%t{@X~`5k_mVaZKy>i^V?!og5RbNr`S%3HVt
zjpbJBV`FQ0kc=lr!=vFp^34x;I<sNH7c2hM?_PcTB3P_jTU#4QROQcH?rNA+0qyN5
zfw3>(f-s#}0Tnd|s_S|1{m(VuepwP$Uz2<$V0tCn(*29+<*$}4<JLJ-`W>r<B?i~t
zNMEVUHa?nY_zPIPOXqfh-(GZ9?<&oPg*&sR*zTowC!(!2i#zT=`eD?+!ha_`=e1nj
zfAqw>nWil}rqA3YtL`;b)LdF#64$_qCU1Uz%r?@zQh4)Npl-@+t3C<)61(qloNa!(
zCDza}{p%kZIk7NyweHsR0QjuJJ#(tXQdM_w(fr7%JrCDMe>V~H@1Nh_db<(iJEv?z
zroE3nn8?4r@AS3t8yD)Amw@e~<|%&i@Wjmve`d^kNYoTRcd2B%?{ok451PhLKj}R(
zQ);$*_Z^%1yHXu#X!_Cm)`4rt{7J?2PJ6Yj6pBCOJ?p!C<NTsG2tTf!11Gg77R-(B
q`NqD!Rewl0K2hg=^{^E_%LDNI?PuEa%U519?z3>PN0{{|#{L1!>$r#j

diff --git a/res/drawable/security_pending.png b/res/drawable/security_pending.png
deleted file mode 100644
index 1f68accf219a5d0c035feb80ff39ef4db62c198e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1658
zcmbVNX;2eq82*xQ1mwslVw8$&L_x<SySbARa_lA;hbYEiQ>Go+B#WCuvdLzFfKCDH
z5iKfEtY}+HEw)&-GKw?WORKh3samb}5NFzPhT2v|ahxfRSi9k{{o(kdJF~Oj`|a~Q
z@A19w?uOz;g{jHYk^umzwgs4jede&Yke>hmr~erB6KhOmEG}j#RnFAlGyzOr%1uBv
zKfZ!+5V*HCbcV<WfLHEwx)_(eNavya5<G^HMEpUP4M4sj62v_f1OvH=6~2I8bm!A!
zBFN{}i(XLLVS5lINZ*1wnpj%5$myx8@MygvLjjZ@(Xj%4g2ADPzcLWkMf9Q(T^+lQ
zZA(Sa2!yH7i$;TT*^42Rq6tVTfyEwJ1w$%Cg2)wWwR%1zgArH?%cO`*jHq>TnGS}b
zu}j2yqrK%i2WB1f#aen1$uL2kR9aJ0BdL)~D0+ny(Q36Z4Vg^LBE;d^0E0)wf$*$x
z1&j!LXkU==Q2{8Xh`XsOMlWI`9ZkU>wA-Hu2f|~8VoN5C;6W)Ofu(+bEUyuCm~jyQ
zhVfK%*jXDSqz)oXRnZ>yJj!Q{liAum+ffY2Mx$Fy``AOlD>2Gb<tGA+4bzL*HxjSU
ztAh~@j38<Std_wl4T6}gD5^E1YO4xW!&(zEuJJUk22p90CX2~rQOFR)f|yhYtW_y7
ztK0&ctulC=YYT)KJm4Y5{rXtHV_fYsxjK|4aE79t6jeFi0mUT6P+^h^Lg-Q@WXC<e
zK+KLE&uF$7LHnu+ua&0!&`5oCzNh)O!e*HqR><MeytQoTR+U9&Rhi{xM5Y#valQYi
zW>Pj7X{<T^(=6j#YzM}cPg<Wfo(vBWU?+xVN8=LdNCJTSkqt9BBUjzSj~^R&DKFi<
z!u`GoN)Tkh(DC{??V@%N1$@ZbUfs1UD>Ki-6Fht^qoGF$LZB$i2#}qBU33E302(h$
zRW0ZF48YsR8=L`^bN;9Ur#7W@9nW5PsNtQYeofgDej?zUirz9Qwq%0AxbBdVb7Wq}
zN@2@zL=b(57vO8$%&(w?9}+rmn7c|Ix1cH7JQKv(c5=Hg%6>)Sl8X{Z{`1DK(u@zF
zEgcVsvIOB>Z#7o-#dVp|ia%_;_8G9BtnZrHv|z~aZGATw0=wfIT-j%W?G-03reKM8
zS{|j}JHIlgPXe9U4+${t>4e7C-Lo#2<nZp3ed(u?U6;?zE<0b}08Z?f6Y5+d%rmB=
z#kUR`<vw2PHe<3BD%5A3Mh|7AG+eqr9a^@w_IAFa_bNJAOO~1w)0^ExP}_cPc;;!y
z(%C){>pcPsHhZIx;`6!C(Wb_vb4O<c<KD<=vr0hr_1?l%P0F9>!AAyq<2viQ{0W;g
zdZV3PpzuLM%0OA~&rROW!pu1d^EloET1Rikqm0OH!zVvx@7fDKxSNCtGm->lSijQE
zDc#w&KJ#9+Yt@74(Ohn5_Kx?zto?yAH*&Xe(|4`E@!lM68fd=h+F0!ct$Q2XkuTO0
zg5rW>{Ql)@O0V&E8$?sDr;DRJzGk>!hey>>GNohR-_O~yov-Gji?M{re6aTHs-Ej1
zUfSW`w@-AE@ow94NAZQEj>+P@J=3Nb5Af5PoA=!x?7A_t?VPaLycbMU4wLkx(AJg5
zdxo-JujRTHR=)k>Wb$iMWg1tTlP!)8S|;rq_P%Gf9?s1@OD1=3y^=~EU5$54XTbh}
z2|_ZlWfE~S)RSk6zp&@!svcAxm%E|#7Z4J4Cuq1Jo;>vKD=pv5jr|R5mPOdd=CalQ
E0Au+)`v3p{

diff --git a/res/layout/about.xml b/res/layout/about.xml
index e0a3b1b6a..58d6f6a1f 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -3,31 +3,25 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+	android:layout_margin="10dp"
     android:background="@color/colorH"
     android:gravity="center">
 
-    <View android:layout_weight="30" android:layout_width="0dp" android:layout_height="0dp" />
-
     <ImageView
         android:contentDescription="@string/content_description_welcome"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/logo" />
-
-    <View android:layout_weight="5" android:layout_width="0dp" android:layout_height="0dp" />
+		android:padding="10dp"
+        android:src="@drawable/linphone_orange" />
 
     <TextView
+		android:layout_margin="10dp"
         android:id="@+id/textView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/app_name"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="@color/text_default"
-        android:textSize="30dp"
-        android:textStyle="bold" />
+        android:textSize="30dp" />
 
-
-    <View android:layout_weight="50" android:layout_width="0dp" android:layout_height="0dp" />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -47,8 +41,6 @@
         android:textColor="@color/text_contrast"
         android:id="@+id/AboutLink"/>
 
-    <View android:layout_weight="30" android:layout_width="0dp" android:layout_height="0dp" />
-
 	<LinearLayout
 		android:orientation="horizontal"
 		android:layout_width="wrap_content"
@@ -57,30 +49,21 @@
 
 		<Button
        		android:id="@+id/send_log"
+			android:background="@drawable/button_background"
+			android:padding="10dp"
+			android:layout_margin="5dp"
         	android:layout_width="match_parent"
         	android:layout_height="wrap_content"
        		android:text="@string/menu_send_log"/>
 
 		<Button
             android:id="@+id/reset_log"
+			android:background="@drawable/button_background"
+			android:padding="10dp"
+			android:layout_margin="5dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/menu_reset_log"/>
 	</LinearLayout>
 
-	<LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:paddingBottom="30dp">
-
-		<Button android:id="@+id/exit"
-        	android:gravity="center"
-        	android:layout_width="wrap_content"
-        	android:layout_height="wrap_content"
-        	android:text="@string/menu_exit"/>
-
-    </LinearLayout>
-
 </LinearLayout>
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
index 554d2099a..a9d27bb05 100644
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@@ -2,30 +2,22 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:background="@color/colorG"
-	android:layout_height="30dp">
-    
-    <LinearLayout
-        android:layout_centerVertical="true"
-        android:gravity="center"
-		android:layout_width="match_parent" 
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
+	android:layout_height="30dp"
+	android:gravity="center">
 
-		<TextView
-			android:id="@+id/address"
-			style="@style/font13"
-			android:paddingLeft="10dp"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:gravity="center"/>
-	
-	    <ImageView
-	        android:contentDescription="@string/content_description_led"
-	        android:id="@+id/statusLed"
-	        android:src="@drawable/led_disconnected"
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content"/>
+	<TextView
+		android:id="@+id/address"
+		style="@style/font13"
+		android:paddingLeft="10dp"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"/>
+
+	<ImageView
+		android:id="@+id/statusLed"
+		android:layout_width="25dp"
+		android:layout_height="25dp"
+		android:src="@drawable/status_available"
+		android:padding="5dp"
+		android:layout_alignParentRight="true"/>
 
-    </LinearLayout>
-    
 </RelativeLayout>
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index 2d86770ed..0e42ae587 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -14,12 +14,12 @@
 
 		<org.linphone.ui.EraseButton
 			android:id="@+id/Erase"
-			android:layout_width="wrap_content"
+			android:layout_width="40dp"
 			android:layout_height="wrap_content"
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
-			android:paddingRight="10dp"
-			android:scaleType="fitXY"
+			android:layout_marginRight="10dp"
+			android:layout_marginLeft="10dp"
 			android:src="@drawable/backspace" />
 
 		<org.linphone.ui.AddressText
@@ -29,7 +29,7 @@
 			android:background="@color/colorF"
 			android:ellipsize="start"
 			android:inputType="textEmailAddress"
-			android:hint="@string/addressHint"
+			android:hint="@string/address_bar_hint"
 			android:paddingLeft="20dp"
 			android:paddingRight="5dp"
 			android:layout_toLeftOf="@id/Erase"
@@ -57,29 +57,28 @@
 				android:id="@+id/addContact"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:adjustViewBounds="true"
-				android:scaleType="center"
+				android:padding="20dp"
 				android:contentDescription="@string/content_description_contacts"
-				android:src="@drawable/contact_add_button" />
+				android:src="@drawable/contact_add_button"
+				android:layout_alignParentBottom="true"/>
 
 		</RelativeLayout>
 
         <org.linphone.ui.CallButton
+			android:id="@+id/Call"
             android:contentDescription="@string/content_description_call"
-            android:id="@+id/Call"
 			android:background="@drawable/call"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:adjustViewBounds="true"
-            android:scaleType="center"
+			android:padding="15dp"
             android:layout_weight="0.5"
             android:src="@drawable/call_audio_start" />
 
 	</LinearLayout>
 	
     <org.linphone.ui.Numpad
+		android:id="@+id/Dialer"
         android:contentDescription="@string/content_description_numpad"
-	    android:id="@+id/Dialer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
 		android:padding="10dp"
diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml
deleted file mode 100644
index db24c2f8c..000000000
--- a/res/layout/drawer_list_item.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-	<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-		android:id="@android:id/text1"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-			android:textAppearance="?android:attr/textAppearanceListItemSmall"
-			  android:gravity="center_vertical"
-			  android:paddingLeft="16dp"
-			  android:paddingRight="16dp"
-			  android:textColor="@color/text_contrast"
-			  android:background="?android:attr/activatedBackgroundIndicator"
-			  android:minHeight="?android:attr/listPreferredItemHeightSmall"/>
\ No newline at end of file
diff --git a/res/layout/edit_list.xml b/res/layout/edit_list.xml
new file mode 100644
index 000000000..08d995487
--- /dev/null
+++ b/res/layout/edit_list.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/edit_list"
+	android:background="@color/colorF"
+	android:layout_width="match_parent"
+	android:layout_height="60dp"
+	android:visibility="gone">
+
+	<ImageView
+		android:id="@+id/cancel"
+		android:src="@drawable/cancel_edit"
+		android:background="@drawable/toolbar_button"
+		android:contentDescription="@string/content_description_valid"
+		android:layout_width="70dp"
+		android:layout_height="match_parent"
+		android:padding="15dp"
+		android:layout_alignParentLeft="true"/>
+
+	<ImageView
+		android:id="@+id/delete"
+		android:src="@drawable/delete"
+		android:background="@drawable/toolbar_button"
+		android:contentDescription="@string/content_description_valid"
+		android:layout_width="70dp"
+		android:layout_height="match_parent"
+		android:padding="15dp"
+		android:layout_alignParentRight="true"/>
+
+	<ImageView
+		android:id="@+id/select_all"
+		android:src="@drawable/select_all"
+		android:background="@drawable/toolbar_button"
+		android:contentDescription="@string/content_description_valid"
+		android:layout_width="70dp"
+		android:layout_height="match_parent"
+		android:padding="15dp"
+		android:layout_toLeftOf="@id/delete"/>
+
+	<ImageView
+		android:id="@+id/deselect_all"
+		android:src="@drawable/deselect_all"
+		android:background="@drawable/toolbar_button"
+		android:contentDescription="@string/content_description_valid"
+		android:layout_width="70dp"
+		android:layout_height="match_parent"
+		android:padding="15dp"
+		android:layout_toLeftOf="@id/delete"
+		android:visibility="gone"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/incall_stats.xml b/res/layout/incall_stats.xml
new file mode 100644
index 000000000..4dce83347
--- /dev/null
+++ b/res/layout/incall_stats.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="vertical"
+			  android:layout_width="match_parent"
+			  android:layout_height="match_parent">
+
+	<TableLayout
+		android:id="@+id/callStats"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:paddingBottom="10dp"
+		android:paddingLeft="5dp"
+		android:paddingRight="5dp"
+		android:background="@android:color/black">
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="left|center_vertical"
+				android:id="@+id/call_stats_title"
+				android:textStyle="bold"
+				android:textColor="@color/text_default"
+				android:textSize="18sp"/>
+
+		</TableRow>
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="left|center_vertical"
+				android:text="@string/call_stats_codec"
+				android:textStyle="bold"
+				android:textColor="@android:color/white"
+				android:textSize="12sp"/>
+
+			<TextView
+				android:id="@+id/codec"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="5dp"
+				android:gravity="right|center_vertical"
+				android:textColor="@android:color/white"
+				android:textSize="12sp"/>
+
+		</TableRow>
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="left|center_vertical"
+				android:text="@string/call_stats_upload"
+				android:textStyle="bold"
+				android:textColor="@android:color/white"
+				android:textSize="12sp"/>
+
+			<TextView
+				android:id="@+id/uploadBandwith"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="5dp"
+				android:gravity="right|center_vertical"
+				android:textColor="@android:color/white"
+				android:textSize="12sp"/>
+
+		</TableRow>
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="left|center_vertical"
+				android:text="@string/call_stats_download"
+				android:textColor="@android:color/white"
+				android:textStyle="bold"
+				android:textSize="12sp"/>
+
+			<TextView
+				android:id="@+id/downloadBandwith"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="5dp"
+				android:gravity="right|center_vertical"
+				android:textColor="@android:color/white"
+				android:textSize="12sp"/>
+
+		</TableRow>
+
+		<TableRow
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="left|center_vertical"
+				android:text="@string/call_stats_ice"
+				android:textStyle="bold"
+				android:textColor="@android:color/white"
+				android:textSize="12sp"/>
+
+			<TextView
+				android:id="@+id/ice"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="5dp"
+				android:gravity="right|center_vertical"
+				android:textColor="@android:color/white"
+				android:textSize="12sp"/>
+
+		</TableRow>
+
+		<TableRow
+			android:id="@+id/video_resolution_layout"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="left|center_vertical"
+				android:text="@string/call_stats_video_resolution"
+				android:textStyle="bold"
+				android:textColor="@android:color/white"
+				android:textSize="12sp"/>
+
+			<TextView
+				android:id="@+id/video_resolution"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingLeft="5dp"
+				android:gravity="right|center_vertical"
+				android:textColor="@android:color/white"
+				android:textSize="12sp"/>
+
+		</TableRow>
+
+	</TableLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/launch_screen.xml b/res/layout/launch_screen.xml
index f946c5c53..fb691d241 100644
--- a/res/layout/launch_screen.xml
+++ b/res/layout/launch_screen.xml
@@ -12,8 +12,9 @@
 
 		<ImageView
 			android:src="@drawable/splashscreen"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
+			android:layout_width="200dp"
+			android:layout_height="200dp"
+			android:layout_gravity="center"/>
 
 		<TextView
 			android:text="@string/app_name"
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 1c9137499..60cdb9bf8 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -12,252 +12,234 @@
 		android:layout_height="40dp"
 		tools:layout="@layout/status" />
 
-<android.support.v4.widget.DrawerLayout
-	android:id="@+id/drawer_layout"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:background="@color/transparent"
-	android:layout_below="@id/status">
-	<!-- The main content view -->
-
-<RelativeLayout
-    android:id="@+id/topLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-	<LinearLayout
+	<android.support.v4.widget.DrawerLayout
+		android:id="@+id/side_menu"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:orientation="vertical"
-		android:layout_above="@id/footer">
-
-		<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" />
-		</FrameLayout>
-
-	</LinearLayout>
-
-
-    <LinearLayout
-        android:id="@+id/footer"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
+		android:layout_below="@id/status">
 
 		<RelativeLayout
-			android:id="@+id/history"
-			android:background="@drawable/footer_button"
-			android:layout_weight="1"
-			android:layout_width="0dp"
+			android:layout_width="match_parent"
 			android:layout_height="match_parent">
 
-			<ImageView
+			<LinearLayout
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:adjustViewBounds="true"
-				android:layout_margin="10dp"
-				android:scaleType="center"
-				android:contentDescription="@string/content_description_history"
-				android:src="@drawable/footer_history" />
+				android:layout_height="match_parent"
+				android:orientation="vertical"
+				android:layout_above="@id/footer">
 
-			<RelativeLayout
-				android:id="@+id/history_select"
-				android:background="@color/colorA"
+				<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" />
+				</FrameLayout>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@+id/footer"
 				android:layout_width="match_parent"
-				android:layout_height="5dp"
+				android:layout_height="70dp"
 				android:layout_alignParentBottom="true"
-				android:visibility="gone" />
+				android:orientation="horizontal">
 
-			<TextView
-				android:id="@+id/missedCalls"
-				style="@style/font18"
-				android:layout_width="25dp"
-				android:layout_height="25dp"
-				android:layout_alignParentRight="true"
-				android:layout_alignParentTop="true"
-				android:background="@drawable/history_chat_indicator"
-				android:gravity="center"
-				android:visibility="gone" />
+				<RelativeLayout
+					android:id="@+id/history"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="0dp"
+					android:layout_height="match_parent">
 
-		</RelativeLayout>
+					<ImageView
+						android:layout_width="match_parent"
+						android:layout_height="35dp"
+						android:layout_centerInParent="true"
+						android:contentDescription="@string/content_description_history"
+						android:src="@drawable/footer_history"
+						android:id="@+id/imageView"/>
 
-		<RelativeLayout
-			android:id="@+id/contacts"
-			android:background="@drawable/footer_button"
-			android:layout_weight="1"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:adjustViewBounds="true">
+					<RelativeLayout
+						android:id="@+id/history_select"
+						android:background="@color/colorA"
+						android:layout_width="match_parent"
+						android:layout_height="5dp"
+						android:layout_alignParentBottom="true"
+						android:visibility="gone" />
 
-			<ImageView
-				android:src="@drawable/footer_contacts"
-				android:contentDescription="@string/content_description_contacts"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:adjustViewBounds="true"
-				android:layout_margin="10dp"
-				android:scaleType="center" />
+					<TextView
+						android:id="@+id/missedCalls"
+						style="@style/font18"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
+						android:layout_margin="12dp"
+						android:background="@drawable/history_chat_indicator"
+						android:gravity="center"
+						android:visibility="gone"/>
 
-			<RelativeLayout
-				android:id="@+id/contacts_select"
-				android:background="@color/colorA"
-				android:layout_width="match_parent"
-				android:layout_height="5dp"
-				android:layout_alignParentBottom="true"
-				android:visibility="gone" />
-		</RelativeLayout>
+				</RelativeLayout>
+
+				<RelativeLayout
+					android:id="@+id/contacts"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="0dp"
+					android:layout_height="match_parent"
+					android:adjustViewBounds="true">
+
+					<ImageView
+						android:src="@drawable/footer_contacts"
+						android:contentDescription="@string/content_description_contacts"
+						android:layout_width="match_parent"
+						android:layout_height="35dp"
+						android:layout_centerInParent="true" />
+
+					<RelativeLayout
+						android:id="@+id/contacts_select"
+						android:background="@color/colorA"
+						android:layout_width="match_parent"
+						android:layout_height="5dp"
+						android:layout_alignParentBottom="true"
+						android:visibility="gone" />
+				</RelativeLayout>
 
 
-		<RelativeLayout
-			android:id="@+id/dialer"
-			android:background="@drawable/footer_button"
-			android:layout_weight="1"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:adjustViewBounds="true">
+				<RelativeLayout
+					android:id="@+id/dialer"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="0dp"
+					android:layout_height="match_parent"
+					android:adjustViewBounds="true">
 
-			<ImageView
-				android:src="@drawable/footer_dialer"
-				android:contentDescription="@string/content_description_dialer"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:adjustViewBounds="true"
-				android:layout_margin="10dp"
-				android:scaleType="center"/>
+					<ImageView
+						android:src="@drawable/footer_dialer"
+						android:contentDescription="@string/content_description_dialer"
+						android:layout_width="match_parent"
+						android:layout_height="35dp"
+						android:layout_centerInParent="true"/>
 
-			<RelativeLayout
-				android:id="@+id/dialer_select"
-				android:background="@color/colorA"
-				android:layout_width="match_parent"
-				android:layout_height="5dp"
-				android:layout_alignParentBottom="true"/>
+					<RelativeLayout
+						android:id="@+id/dialer_select"
+						android:background="@color/colorA"
+						android:layout_width="match_parent"
+						android:layout_height="5dp"
+						android:layout_alignParentBottom="true"/>
 
-		</RelativeLayout>
+				</RelativeLayout>
 
-        <RelativeLayout
-            android:id="@+id/chat"
-			android:background="@drawable/footer_button"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-			android:adjustViewBounds="true">
+				<RelativeLayout
+					android:id="@+id/chat"
+					android:background="@drawable/footer_button"
+					android:layout_weight="1"
+					android:layout_width="0dp"
+					android:layout_height="match_parent">
 
-			<ImageView
-				android:src="@drawable/footer_chat"
-				android:contentDescription="@string/content_description_chat"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:adjustViewBounds="true"
-				android:layout_margin="10dp"
-				android:scaleType="center" />
+					<ImageView
+						android:src="@drawable/footer_chat"
+						android:contentDescription="@string/content_description_chat"
+						android:layout_width="match_parent"
+						android:layout_height="35dp"
+						android:layout_centerInParent="true" />
 
-			<RelativeLayout
-				android:id="@+id/chat_select"
-				android:background="@color/colorA"
-				android:layout_width="match_parent"
-				android:layout_height="5dp"
-				android:layout_alignParentBottom="true"
-				android:visibility="gone"/>
+					<RelativeLayout
+						android:id="@+id/chat_select"
+						android:background="@color/colorA"
+						android:layout_width="match_parent"
+						android:layout_height="5dp"
+						android:layout_alignParentBottom="true"
+						android:visibility="gone"/>
 
-            <TextView
-                android:id="@+id/missedChats"
-				style="@style/font18"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentTop="true"
-                android:background="@drawable/history_chat_indicator"
-                android:gravity="center"
-                android:visibility="gone" />
-            
-        </RelativeLayout>
-        
-    </LinearLayout>
-    
-    <LinearLayout
-        android:id="@+id/fragmentContainer2"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-        
-    </LinearLayout>
+					<TextView
+						android:id="@+id/missedChats"
+						style="@style/font18"
+						android:layout_width="25dp"
+						android:layout_height="25dp"
+						android:layout_margin="12dp"
+						android:background="@drawable/history_chat_indicator"
+						android:gravity="center"
+						android:visibility="gone" />
 
-</RelativeLayout>
+				</RelativeLayout>
+			</LinearLayout>
 
-	<!-- The navigation drawer -->
-	<RelativeLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:id="@+id/left_drawer"
-		android:layout_gravity="left">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="vertical">
-
-		<ListView android:id="@+id/accounts_list"
+		<LinearLayout
+			android:id="@+id/fragmentContainer2"
+			android:visibility="gone"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:choiceMode="singleChoice"
-			android:cacheColorHint="@color/transparent"
-			android:divider="@android:color/transparent"
-			android:dividerHeight="0dp"
-			android:background="@color/colorB"/>
-
-		<ListView android:id="@+id/list_drawer"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:choiceMode="singleChoice"
-			android:divider="@color/colorE"
-			android:cacheColorHint="@color/transparent"
-			android:dividerHeight="1dp"
-			android:background="@color/colorH"/>
+			android:orientation="vertical">
 
 		</LinearLayout>
 
+		</RelativeLayout>
 
-
+	<!-- Side Menu -->
 	<RelativeLayout
-		android:id="@+id/exitLayout"
-		android:gravity="bottom"
-		android:layout_alignParentBottom="true"
 		android:layout_width="match_parent"
-		android:layout_height="48dp"
-		android:background="@color/colorA">
+		android:layout_height="match_parent"
+		android:id="@+id/side_menu_content"
+		android:layout_gravity="left">
 
-		<ImageView
-			android:id="@+id/lol"
-			android:layout_width="25dp"
-			android:layout_height="wrap_content"
-			android:layout_alignParentLeft="true"
-			android:layout_marginLeft="12dp"
-			android:layout_marginRight="12dp"
-			android:src="@drawable/quit_default"
-			android:layout_centerVertical="true" />
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="vertical">
 
-		<TextView
-			android:id="@+id/exit"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/lol"
-			android:text="@string/menu_exit"
-			android:minHeight="?android:attr/listPreferredItemHeightSmall"
-			android:textAppearance="?android:attr/textAppearanceListItemSmall"
-			android:gravity="center_vertical"
-			android:paddingRight="40dp"/>
+			<include layout="@layout/side_menu_default_account"/>
 
-	</RelativeLayout>
+			<ListView android:id="@+id/accounts_list"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:choiceMode="singleChoice"
+				android:cacheColorHint="@color/transparent"
+				android:divider="@android:color/transparent"
+				android:dividerHeight="0dp"
+				android:background="@color/colorB"/>
+
+			<ListView android:id="@+id/item_list"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:choiceMode="singleChoice"
+				android:divider="@color/colorE"
+				android:listSelector="@color/colorH"
+				android:dividerHeight="1dp"
+				android:background="@color/colorH"/>
+		</LinearLayout>
+
+		<RelativeLayout
+			android:id="@+id/side_menu_quit"
+			android:gravity="bottom"
+			android:layout_alignParentBottom="true"
+			android:layout_width="match_parent"
+			android:layout_height="50dp"
+			android:background="@color/colorA">
+
+			<ImageView
+				android:id="@+id/quit_button"
+				android:src="@drawable/quit"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentLeft="true"
+				android:padding="5dp"
+				android:layout_centerVertical="true" />
+
+			<TextView
+				android:id="@+id/quit"
+				android:text="@string/quit"
+				style="@style/font14"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_toRightOf="@id/quit_button"
+				android:gravity="center_vertical"
+				android:layout_centerInParent="true"/>
+
+		</RelativeLayout>
 
 	</RelativeLayout>
 
diff --git a/res/layout/menu_chat_button.xml b/res/layout/menu_chat_button.xml
deleted file mode 100644
index a2254c5ed..000000000
--- a/res/layout/menu_chat_button.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-	android:id="@+id/chat"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="@color/colorD"
-	android:layout_weight="1"
-	android:layout_width="0dp"
-	android:layout_height="match_parent">
-    
-    <ImageView
-        android:id="@+id/image"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:contentDescription="@string/content_description_chat_button"
-		android:src="@drawable/footer_chat" />
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_alignBottom="@id/image"
-        android:paddingBottom="10dp"
-        android:textColor="@drawable/text_color"
-        android:text="@string/button_chat"
-        android:textSize="12sp" />
-    
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/menu_contact_button.xml b/res/layout/menu_contact_button.xml
deleted file mode 100644
index 1df5ddb39..000000000
--- a/res/layout/menu_contact_button.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-	android:id="@+id/contacts"
-	android:background="@color/colorD"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_weight="1"
-    android:layout_width="0dp"
-    android:layout_height="match_parent"
-	android:adjustViewBounds="true">
-    
-    <ImageView
-        android:id="@+id/image"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:scaleType="center"
-		android:contentDescription="@string/content_description_contacts"
-		android:src="@drawable/footer_contacts" />
-
-	<RelativeLayout
-		android:visibility="gone"
-		android:id="@+id/select"
-		android:layout_width="match_parent"
-		android:layout_height="8dp"
-		android:layout_alignParentBottom="true"
-		android:contentDescription="@string/content_description_contacts"
-		android:background="@color/colorD" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/menu_history_button.xml b/res/layout/menu_history_button.xml
deleted file mode 100644
index b9338fff6..000000000
--- a/res/layout/menu_history_button.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-	android:id="@+id/history"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="@color/colorD"
-	android:layout_weight="1"
-	android:layout_width="0dp"
-	android:layout_height="match_parent"
-	android:adjustViewBounds="true">
-    
-    <ImageView
-        android:id="@+id/image"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:adjustViewBounds="true"
-		android:scaleType="center"
-		android:contentDescription="@string/content_description_history"
-		android:src="@drawable/footer_history" />
-
-	<RelativeLayout
-		android:visibility="gone"
-		android:id="@+id/select"
-		android:layout_width="match_parent"
-		android:layout_height="8dp"
-		android:layout_alignParentBottom="true"
-		android:contentDescription="@string/content_description_contacts"
-		android:background="@color/colorD" />
-    
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/numpad.xml b/res/layout/numpad.xml
index 93f4d1342..ee9b946be 100644
--- a/res/layout/numpad.xml
+++ b/res/layout/numpad.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			 android:layout_width="match_parent" android:layout_height="match_parent" android:shrinkColumns="*" >
+			 android:layout_width="match_parent" android:layout_height="match_parent" >
 
 <TableRow android:layout_weight="1" android:gravity="center">
 	<org.linphone.ui.Digit android:id="@+id/Digit1"	android:text="1" style="@style/DialerDigit" android:background="@drawable/numpad_one" android:soundEffectsEnabled="true"/>
@@ -10,7 +10,7 @@
 </TableRow>
 
 <TableRow android:layout_weight="1" android:gravity="center">
-	<org.linphone.ui.Digit android:id="@+id/Digit4"	android:text="4" style="@style/DialerDigit" android:background="@drawable/numpad_four" android:soundEffectsEnabled="true" />
+	<org.linphone.ui.Digit android:id="@+id/Digit4" android:text="4" style="@style/DialerDigit" android:background="@drawable/numpad_four" android:soundEffectsEnabled="true" />
 	<org.linphone.ui.Digit android:id="@+id/Digit5"	android:text="5" style="@style/DialerDigit" android:background="@drawable/numpad_five" android:soundEffectsEnabled="true" />
 	<org.linphone.ui.Digit android:id="@+id/Digit6"	android:text="6" style="@style/DialerDigit" android:background="@drawable/numpad_six" android:soundEffectsEnabled="true" />
 </TableRow>
diff --git a/res/layout/side_menu_default_account.xml b/res/layout/side_menu_default_account.xml
new file mode 100644
index 000000000..14d3dce79
--- /dev/null
+++ b/res/layout/side_menu_default_account.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/default_account"
+	android:background="@color/colorF"
+	android:layout_width="match_parent"
+	android:layout_height="80dp">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:src="@drawable/avatar"
+		android:layout_width="30dp"
+		android:layout_height="30dp"
+		android:layout_marginLeft="12dp"
+		android:layout_marginRight="12dp"
+		android:layout_centerVertical="true" />
+
+	<LinearLayout
+		android:id="@+id/layout"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:orientation="vertical"
+		android:layout_toRightOf="@+id/icon"
+		android:gravity="center_vertical">
+
+		<TextView
+			android:id="@+id/display_name"
+			style="@style/font7"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:editable="false"/>
+
+		<TextView
+			android:id="@+id/address"
+			style="@style/font3"
+			android:editable="false"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+
+	</LinearLayout>
+
+	<ImageView
+		android:id="@+id/status_led"
+		android:layout_width="25dp"
+		android:layout_height="25dp"
+		android:src="@drawable/status_available"
+		android:padding="5dp"
+		android:layout_marginBottom="5dp"
+		android:layout_alignParentRight="true"
+		android:layout_alignBottom="@id/layout"/>
+
+</RelativeLayout>
diff --git a/res/layout/side_menu_item.xml b/res/layout/side_menu_item.xml
new file mode 100644
index 000000000..8ff9cbe10
--- /dev/null
+++ b/res/layout/side_menu_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@android:id/text1"
+	style="@style/font6"
+	android:layout_width="match_parent"
+	android:layout_height="50dp"
+	android:gravity="center_vertical"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp"/>
\ No newline at end of file
diff --git a/res/layout/status.xml b/res/layout/status.xml
index ce237baf1..f6bcc9450 100644
--- a/res/layout/status.xml
+++ b/res/layout/status.xml
@@ -1,263 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/status"
 	android:background="@color/colorA"
-	xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="40dp"
     android:orientation="horizontal">
-
-	<RelativeLayout
-		android:id="@+id/content"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-
-            
-	       <!--     <TableLayout
-				    android:id="@+id/callStats"
-				    android:layout_width="match_parent"
-				    android:layout_height="wrap_content"
-			    	android:layout_gravity="center"
-				    android:paddingBottom="10dp"
-				    android:paddingLeft="5dp"
-				    android:paddingRight="5dp"
-				    android:background="@android:color/black">
-			    
-				    <TableRow
-					    android:layout_width="match_parent"
-					    android:layout_height="wrap_content">
-				        
-				        <TextView 
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-					    	android:gravity="left|center_vertical"
-					    	android:id="@+id/call_stats_title"
-					        android:textStyle="bold"
-					        android:textColor="@color/text_default"
-					        android:textSize="18sp"/>
-				        
-				    </TableRow>
-			    
-				    <TableRow
-					    android:layout_width="match_parent"
-					    android:layout_height="wrap_content">
-				        
-				        <TextView 
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-					    	android:gravity="left|center_vertical"
-					    	android:text="@string/call_stats_codec"
-					        android:textStyle="bold"
-					        android:textColor="@android:color/white"
-					        android:textSize="12sp"/>
-				        
-				        <TextView 
-				            android:id="@+id/codec"
-						    android:layout_width="match_parent"
-						    android:layout_height="wrap_content"
-						    android:paddingLeft="5dp"
-					    	android:gravity="right|center_vertical"
-					        android:textColor="@android:color/white"
-					        android:textSize="12sp"/>
-				        
-				    </TableRow>
-				    
-				    <TableRow
-					    android:layout_width="match_parent"
-					    android:layout_height="wrap_content">
-				        
-				        <TextView 
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-					    	android:gravity="left|center_vertical"
-					    	android:text="@string/call_stats_upload"
-					        android:textStyle="bold"
-					        android:textColor="@android:color/white"
-					        android:textSize="12sp"/>
-				        
-				        <TextView 
-				            android:id="@+id/uploadBandwith"
-						    android:layout_width="match_parent"
-						    android:layout_height="wrap_content"
-						    android:paddingLeft="5dp"
-					    	android:gravity="right|center_vertical"
-					        android:textColor="@android:color/white"
-					        android:textSize="12sp"/>
-				        
-				    </TableRow>
-				    
-				    <TableRow
-					    android:layout_width="match_parent"
-					    android:layout_height="wrap_content">
-				        
-				        <TextView 
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-					    	android:gravity="left|center_vertical"
-					    	android:text="@string/call_stats_download"
-					        android:textColor="@android:color/white"
-					        android:textStyle="bold"
-					        android:textSize="12sp"/>
-				        
-				        <TextView 
-				            android:id="@+id/downloadBandwith"
-						    android:layout_width="match_parent"
-						    android:layout_height="wrap_content"
-						    android:paddingLeft="5dp"
-					    	android:gravity="right|center_vertical"
-					        android:textColor="@android:color/white"
-					        android:textSize="12sp"/>
-				        
-				    </TableRow>
-				    
-				    <TableRow
-					    android:layout_width="match_parent"
-					    android:layout_height="wrap_content">
-				        
-				        <TextView 
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-					    	android:gravity="left|center_vertical"
-					    	android:text="@string/call_stats_ice"
-					        android:textStyle="bold"
-					        android:textColor="@android:color/white"
-					        android:textSize="12sp"/>
-				        
-				        <TextView 
-				            android:id="@+id/ice"
-						    android:layout_width="match_parent"
-						    android:layout_height="wrap_content"
-						    android:paddingLeft="5dp"
-					    	android:gravity="right|center_vertical"
-					        android:textColor="@android:color/white"
-					        android:textSize="12sp"/>
-				        
-				    </TableRow>
-				    
-				    <TableRow
-				        android:id="@+id/video_resolution_layout"
-					    android:layout_width="match_parent"
-					    android:layout_height="wrap_content">
-				        
-				        <TextView 
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-					    	android:gravity="left|center_vertical"
-					    	android:text="@string/call_stats_video_resolution"
-					        android:textStyle="bold"
-					        android:textColor="@android:color/white"
-					        android:textSize="12sp"/>
-				        
-				        <TextView 
-				            android:id="@+id/video_resolution"
-						    android:layout_width="match_parent"
-						    android:layout_height="wrap_content"
-						    android:paddingLeft="5dp"
-					    	android:gravity="right|center_vertical"
-					        android:textColor="@android:color/white"
-					        android:textSize="12sp"/>
-				        
-				    </TableRow>
-			    
-			</TableLayout> -->
-
-	</RelativeLayout>
         
-		<RelativeLayout
-			android:id="@+id/handle"
-		    android:layout_width="match_parent"
-		    android:layout_height="match_parent">
+	<RelativeLayout
+		android:id="@+id/status_bar"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
 
-			<ImageView
-				android:id="@+id/menu_icon"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:padding="10dp"
-				android:src="@drawable/menu_burger"
-				android:layout_centerVertical="true"
-				android:layout_centerInParent="true"
-				android:layout_alignParentLeft="true"/>
+		<ImageView
+			android:id="@+id/side_menu_button"
+			android:src="@drawable/menu_burger"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:padding="10dp"
+			android:layout_centerInParent="true"
+			android:layout_alignParentLeft="true"/>
 
-			<ImageView
-		        android:contentDescription="@string/content_description_led"
-		        android:id="@+id/statusLed"
-		        android:paddingLeft="5dp"
-				android:src="@drawable/led_disconnected"
-		        android:adjustViewBounds="true"
-				android:layout_width="wrap_content"
-		        android:layout_height="match_parent"
-				android:layout_alignParentTop="true"
-				android:layout_toRightOf="@+id/menu_icon"/>
+		<ImageView
+			android:id="@+id/call_quality"
+			android:src="@drawable/call_quality_indicator_0"
+			android:contentDescription="@string/content_description_call_quality"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:padding="10dp"
+			android:layout_centerInParent="true"
+			android:layout_alignParentLeft="true"
+			android:visibility="invisible" />
 
-			<TextView
-		        android:id="@+id/statusText" 
-		        android:text="@string/status_not_connected"
-		        android:textColor="@android:color/white"
-		        android:textSize="18sp"
-		        android:paddingLeft="5dp"
-            	android:layout_centerVertical="true"
-		        android:layout_width="wrap_content"
-		        android:layout_height="match_parent"
-		        android:gravity="center_vertical"
-		        android:layout_toRightOf="@id/statusLed" />
-		    
-		    <LinearLayout 
-		        android:id="@+id/moreStatusLed"
-		        android:layout_width="wrap_content"
-		        android:layout_height="10dp"
-		        android:orientation="horizontal"
-		        android:layout_toRightOf="@id/statusLed"/>
-		    
-		    <ImageView
-		        android:contentDescription="@string/content_description_call_quality"
-		        android:id="@+id/callQuality"
-		        android:layout_width="wrap_content"
-		        android:layout_height="wrap_content"
-		        android:layout_centerVertical="true"
-		        android:src="@drawable/call_quality_indicator_0" 
-		        android:adjustViewBounds="true"
-		        android:layout_centerHorizontal="true"
-		        android:visibility="gone" />
-		    
-		    <TextView
-		        android:id="@+id/exit"
-		        android:layout_width="wrap_content"
-		        android:layout_height="match_parent"
-		        android:layout_alignParentRight="true"
-		        android:layout_centerVertical="true"
-		        android:gravity="center_vertical"
-		        android:paddingLeft="10dp"
-		        android:paddingRight="10dp"
-		        android:text="@string/menu_exit"
-		        android:textColor="@android:color/white"
-		        android:visibility="gone"
-		        android:textSize="18sp" />
-		    
-			<TextView 
-				android:id="@+id/voicemailCount" 
-				android:textColor="@android:color/white"
-				android:layout_alignParentRight="true"
-				android:textSize="18sp"
-				android:paddingLeft="5dp"
-				android:paddingRight="10dp"
-				android:layout_centerVertical="true"
-				android:layout_width="wrap_content"
-				android:layout_height="match_parent"
-				android:gravity="center_vertical"
-				android:visibility="gone" />
-		</RelativeLayout>
+		<ImageView
+			android:id="@+id/status_led"
+			android:src="@drawable/led_disconnected"
+			android:contentDescription="@string/content_description_led"
+			android:paddingLeft="5dp"
+			android:adjustViewBounds="true"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_alignParentTop="true"
+			android:layout_toRightOf="@id/side_menu_button"/>
 
-    <ImageView
-        android:contentDescription="@string/content_description_encryption"
-        android:id="@+id/encryption"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:src="@drawable/security_pending" 
-        android:adjustViewBounds="true"
-        android:visibility="gone"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true" />
+		<TextView
+			android:id="@+id/status_text"
+			android:text="@string/status_not_connected"
+			style="@style/font16"
+			android:paddingLeft="5dp"
+			android:layout_centerVertical="true"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:gravity="center_vertical"
+			android:layout_toRightOf="@id/status_led" />
 
+		<ImageView
+			android:id="@+id/voicemail"
+			android:src="@drawable/voicemail"
+			android:layout_centerVertical="true"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:gravity="center_vertical"
+			android:visibility="gone" />
+
+		<TextView
+			android:id="@+id/voicemail_count"
+			style="@style/font16"
+			android:layout_alignParentRight="true"
+			android:paddingLeft="5dp"
+			android:paddingRight="10dp"
+			android:layout_centerVertical="true"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:visibility="gone" />
+
+		<ImageView
+			android:id="@+id/encryption"
+			android:src="@drawable/security_ko"
+			android:contentDescription="@string/content_description_encryption"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:adjustViewBounds="true"
+			android:padding="5dp"
+			android:layout_centerInParent="true"
+			android:visibility="gone"
+			android:layout_alignParentRight="true" />
+	</RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/color.xml b/res/values/color.xml
index 5a3a49cab..6486e2d39 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -13,6 +13,9 @@
 	<color name="colorJ">#ffa645</color>
 	<color name="colorK">#3eb5c0</color>
 	<color name="colorL">#96c11f</color>
+	<color name="colorAB">#ffeee5</color>
+
+
 
 	<!-- end -->
 
diff --git a/res/values/digit_style.xml b/res/values/digit_style.xml
index 61f6a8f6c..1fb8cd745 100644
--- a/res/values/digit_style.xml
+++ b/res/values/digit_style.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="DialerDigit" parent="@android:style/TextAppearance.Medium">
-		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_width">50dp</item>
+		<item name="android:layout_height">50dp</item>
 		<item name="android:textColor">@android:color/transparent</item>
 		<item name="android:textSize">20sp</item>
-		<item name="android:scaleType">center</item>
-		<item name="android:adjustViewBounds">true</item>
-		<item name="android:layout_margin">10dp</item>
+		<item name="android:layout_margin">30dp</item>
 	</style>
 
 	<declare-styleable name="Numpad">
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index 0047642e9..06bd9b33b 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -21,10 +21,6 @@
 	<string name="wizard_url">https://www.linphone.org/wizard.php</string>
 
 	<!-- Interface settings -->
-    <bool name="replace_settings_by_about">false</bool>
-    <bool name="replace_chat_by_about">false</bool>
-    <bool name="display_about_in_settings">true</bool>
-    <bool name="exit_button_on_dialer">false</bool>
 
     <bool name="hide_camera_settings">false</bool>
     <bool name="replace_wizard_with_old_interface">false</bool>
@@ -50,7 +46,6 @@
 
 	<bool name="disable_animations">false</bool>
     <bool name="show_statusbar_only_on_dialer">true</bool>
-	<bool name="lock_statusbar">false</bool>
 	<bool name="emoticons_in_messages">true</bool>
 	<bool name="only_display_username_if_unknown">true</bool> <!-- Display username for all sip addresses (if not in contact and display name empty) -->
 	<bool name="never_display_sip_addresses">false</bool> <!-- To use only with the above setting set to true -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0705ddf88..13b1764ff 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -37,20 +37,22 @@
 	<string name="assistant_password_confirm">Confirm password</string>
 
 	<!-- 1. Dailer -->
-	<string name="addressHint">Enter a number or an address</string>
+	<string name="address_bar_hint">Enter a number or an address</string>
 
 	<!-- 2. History -->
 
 
 	<!-- 3. Contacts -->
 
-	<!-- Left Menu -->
-	<string-array name="menu_entry">
+	<!-- Side Menu -->
+	<string-array name="side_menu_item">
 		<item>Settings</item>
 		<item>Assistant</item>
 		<item>About</item>
 	</string-array>
 
+	<string name="quit">Quit</string>
+
 	<!-- Call -->
 	<string name="incoming_call">incoming call</string>
 	<string name="outgoing_call">outgoing call</string>
@@ -258,7 +260,6 @@
   <string name="menu_send_log">Send log</string>
   <string name="menu_reset_log">Reset log</string>
   <string name="pref_audio">Audio</string>
-  <string name="menu_exit">Exit</string>
   <string name="pref_prefix">Prefix</string>
   <string name="pref_advanced">Advanced</string>
   <string name="menu_settings">Settings</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ef2a3845b..a80c6bf00 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -9,12 +9,12 @@
 		<item name="android:textColor">@color/colorA</item>
 		<item name="android:textAllCaps">true</item>
 		<item name="android:textStyle">bold</item>
-		<item name="android:textSize">30sp</item>
+		<item name="android:textSize">28sp</item>
 	</style>
 
 	<style name="font2" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorA</item>
-		<item name="android:textSize">20sp</item>
+		<item name="android:textSize">18sp</item>
 	</style>
 
 	<style name="font3" parent="@android:style/TextAppearance.Small">
@@ -31,12 +31,12 @@
 
 	<style name="font5" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorC</item>
-		<item name="android:textSize">40sp</item>
+		<item name="android:textSize">32sp</item>
 	</style>
 
 	<style name="font6" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorC</item>
-		<item name="android:textSize">28sp</item>
+		<item name="android:textSize">20sp</item>
 	</style>
 
 	<style name="font7" parent="@android:style/TextAppearance.Medium">
@@ -48,7 +48,7 @@
 	<style name="font8" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorC</item>
 		<item name="android:textAllCaps">true</item>
-		<item name="android:textSize">20sp</item>
+		<item name="android:textSize">18sp</item>
 	</style>
 
 	<style name="font9" parent="@android:style/TextAppearance.Small">
@@ -58,7 +58,7 @@
 
 	<style name="font10" parent="@android:style/TextAppearance.Medium">
 		<item name="android:textColor">@color/colorD</item>
-		<item name="android:textSize">24sp</item>
+		<item name="android:textSize">20sp</item>
 	</style>
 
 	<style name="font11" parent="@android:style/TextAppearance.Medium">
@@ -78,7 +78,7 @@
 
 	<style name="font14" parent="@android:style/TextAppearance.Small">
 		<item name="android:textColor">@color/colorH</item>
-		<item name="android:textSize">30sp</item>
+		<item name="android:textSize">26sp</item>
 	</style>
 
 	<style name="font15" parent="@android:style/TextAppearance.Small">
@@ -89,7 +89,7 @@
 
 	<style name="font16" parent="@android:style/TextAppearance.Small">
 		<item name="android:textColor">@color/colorH</item>
-		<item name="android:textSize">22sp</item>
+		<item name="android:textSize">20sp</item>
 	</style>
 
 	<style name="font17" parent="@android:style/TextAppearance.Small">
@@ -110,4 +110,15 @@
 		<item name="android:textSize">22sp</item>
 	</style>
 
+	<style name="font20" parent="@android:style/TextAppearance.Small">
+		<item name="android:textColor">@color/colorI</item>
+		<item name="android:textSize">14sp</item>
+	</style>
+
+	<style name="font21" parent="@android:style/TextAppearance.Large">
+		<item name="android:textColor">@color/colorH</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textSize">50sp</item>
+	</style>
+
 </resources>
\ No newline at end of file
diff --git a/src/org/linphone/AboutFragment.java b/src/org/linphone/AboutFragment.java
index 1e9d70fd6..934f869db 100644
--- a/src/org/linphone/AboutFragment.java
+++ b/src/org/linphone/AboutFragment.java
@@ -62,10 +62,6 @@ public class AboutFragment extends Fragment implements OnClickListener {
 		resetLogButton.setOnClickListener(this);
 		resetLogButton.setVisibility(LinphonePreferences.instance().isDebugEnabled() ? View.VISIBLE : View.GONE);
 
-		exitButton = view.findViewById(R.id.exit);
-		exitButton.setOnClickListener(this);
-		exitButton.setVisibility(View.VISIBLE);
-
 		return view;
 	}
 
@@ -88,7 +84,6 @@ public class AboutFragment extends Fragment implements OnClickListener {
 		if (LinphoneActivity.isInstanciated()) {
 			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
 			if (v == sendLogButton) {
-				//LinphoneUtils.collectLogs(LinphoneActivity.instance(), getString(R.string.about_bugreport_email));
 				if (lc != null) {
 					lc.uploadLogCollection();
 				}
@@ -96,8 +91,6 @@ public class AboutFragment extends Fragment implements OnClickListener {
 				if (lc != null) {
 					lc.resetLogCollection();
 				}
-			} else {
-				LinphoneActivity.instance().exit();
 			}
 		}
 	}
diff --git a/src/org/linphone/ChatActivity.java b/src/org/linphone/ChatActivity.java
deleted file mode 100644
index a3114f654..000000000
--- a/src/org/linphone/ChatActivity.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.linphone;
-/*
-ChatActivity.java
-Copyright (C) 2015  Belledonne Communications, Grenoble, France
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-import android.app.Activity;
-import android.app.FragmentManager;
-import android.os.Bundle;
-
-/**
- * @author Margaux Clerc
- */
-public class ChatActivity extends Activity {
-	private static final String CHAT_FRAGMENT = "chatFragment";
-	private ChatFragment chatFragment;
-	private StatusFragment status;
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.chat_activity);
-
-		Bundle extras = new Bundle();
-		if( getIntent().getExtras() != null) {
-			extras.putString("SipUri", getIntent().getExtras().getString("SipUri"));
-			extras.putString("DisplayName", getIntent().getExtras().getString("DisplayName"));
-			extras.putString("PictureUri", getIntent().getExtras().getString("PictureUri"));
-			extras.putString("ThumbnailUri", getIntent().getExtras().getString("ThumbnailUri"));
-		}
-
-		ChatFragment fragment = new ChatFragment();
-		fragment.setArguments(extras);
-		getFragmentManager().beginTransaction().add(R.id.fragmentContainer, fragment, "ChatFragment").commit();
-
-		FragmentManager fm = getFragmentManager();
-		chatFragment = (ChatFragment) fm.findFragmentByTag(CHAT_FRAGMENT);
-
-		// If the Fragment is non-null, then it is currently being
-		// retained across a configuration change.
-		if (chatFragment == null) {
-			chatFragment = new ChatFragment();
-			chatFragment.setArguments(extras);
-			fm.beginTransaction().add(R.id.fragmentContainer, chatFragment, CHAT_FRAGMENT).commit();
-		}
-
-	}
-
-	public void updateStatusFragment(StatusFragment fragment) {
-		status = fragment;
-	}
-
-}
-
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index cd187f0c1..63bdc255d 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -22,7 +22,6 @@ import static android.content.Intent.ACTION_MAIN;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.List;
@@ -44,17 +43,15 @@ import org.linphone.core.LinphoneCore.RegistrationState;
 import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListenerBase;
+import org.linphone.core.LinphonePlayer;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.Reason;
 import org.linphone.mediastream.Log;
 import org.linphone.assistant.RemoteProvisioningLoginActivity;
 import org.linphone.ui.AddressText;
-import org.linphone.ui.LedPreference;
 
 import android.annotation.SuppressLint;
-import android.app.ActionBar;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
 import android.app.FragmentManager;
@@ -65,12 +62,11 @@ import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.Layout;
+import android.support.v4.widget.DrawerLayout;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -85,16 +81,12 @@ import android.view.animation.AnimationUtils;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
-import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
-import android.widget.TableLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v4.app.ActionBarDrawerToggle;
 
 /**
  * @author Sylvain Berfini
@@ -111,7 +103,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 	private StatusFragment statusFragment;
 	private TextView missedCalls, missedChats;
-	private LinearLayout menu, mark;
 	private RelativeLayout contacts, history, dialer, chat;
 	private RelativeLayout contacts_selected, history_selected, dialer_selected, chat_selected;
 	private FragmentsAvailable currentFragment, nextFragment;
@@ -123,12 +114,14 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	private boolean isAnimationDisabled = false, preferLinphoneContacts = false;
 	private OrientationEventListener mOrientationHelper;
 	private LinphoneCoreListenerBase mListener;
-	private String[] mParams;
+
+	private DrawerLayout sideMenu;
+	private String[] sideMenuItems;
 	private String mTitle;
-	private RelativeLayout mDrawerList, exitLayout, headerLayout;
-	private DrawerLayout mDrawerLayout;
-	private ActionBarDrawerToggle mDrawerToggle;
-	ListView mDrawerListB;
+	private RelativeLayout sideMenuContent, quitLayout, defaultAccount;
+	private ListView accountsList, sideMenuItemList;
+	private ImageView menu;
+
 
 	static final boolean isInstanciated() {
 		return instance != null;
@@ -151,7 +144,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
         }
 
 		if (!LinphoneManager.isInstanciated()) {
-			Log.e("No service running: avoid crash by starting the launcher", this.getClass().getName());
+			Log.e("No service running: avoid crash by starting the launch", this.getClass().getName());
 			// super.onCreate called earlier
 			finish();
 			startActivity(getIntent().setClass(this, LinphoneLauncherActivity.class));
@@ -175,16 +168,15 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		if (getResources().getBoolean(R.bool.use_linphone_tag)) {
 			ContactsManager.getInstance().initializeSyncAccount(getApplicationContext(), getContentResolver());
 		} else {
-				ContactsManager.getInstance().initializeContactManager(getApplicationContext(), getContentResolver());
+			ContactsManager.getInstance().initializeContactManager(getApplicationContext(), getContentResolver());
 		}
 
 		setContentView(R.layout.main);
 		instance = this;
 		fragmentsHistory = new ArrayList<FragmentsAvailable>();
 
-
-		createDrawer();
 		initButtons();
+		createSideMenu();
 
 		currentFragment = nextFragment = FragmentsAvailable.DIALER;
 		fragmentsHistory.add(currentFragment);
@@ -231,13 +223,13 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 						displayCustomToast(getString(R.string.error_io_error), Toast.LENGTH_LONG);
 					}
 				}
-
-				//initAccounts();
+				initAccounts();
 			}
 
 			@Override
 			public void callState(LinphoneCore lc, LinphoneCall call, LinphoneCall.State state, String message) {
 				if (state == State.IncomingReceived) {
+					//finish();
 					startActivity(new Intent(LinphoneActivity.instance(), IncomingCallActivity.class));
 				} else if (state == State.OutgoingInit || state == State.OutgoingProgress) {
 					startActivity(new Intent(LinphoneActivity.instance(), OutgoingCallActivity.class));
@@ -290,212 +282,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		updateAnimationsState();
 	}
 
-	public void createDrawer() {
-		mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-		mParams = getResources().getStringArray(R.array.menu_entry);
-		mDrawerList = (RelativeLayout) findViewById(R.id.left_drawer);
-		mDrawerListB = (ListView) findViewById(R.id.list_drawer);
-		List<String> dataList = new ArrayList<String>();
-		mDrawerListB.setAdapter(new ArrayAdapter<String>(this,R.layout.drawer_list_item, mParams));
-		mDrawerListB.setOnItemClickListener(new DrawerItemClickListener());
-
-		initAccounts();
-
-		ImageView menubar = (ImageView) findViewById(R.id.menu_icon);
-		menubar.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				if(mDrawerLayout.isDrawerVisible(Gravity.LEFT)){
-					mDrawerLayout.closeDrawer(mDrawerList);
-				} else {
-					mDrawerLayout.openDrawer(mDrawerList);
-				}
-			}
-		});
-
-		exitLayout = (RelativeLayout) findViewById(R.id.exitLayout);
-		exitLayout.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				exit();
-			}
-		});
-
-
-
-	}
-
-	public void initAccounts() {
-		ListView accounts = (ListView) findViewById(R.id.accounts_list);
-		//accounts.setVisibility(View.VISIBLE);
-
-		accounts.setAdapter(new AccountsListAdapter());
-		accounts.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-				Log.w("Tag " + i);
-				int position = (int) view.getTag();
-				displayAccountSettings(position);
-				mDrawerLayout.closeDrawer(mDrawerList);
-			}
-		});
-
-	}
-
-	private int getStatusIconResource(LinphoneCore.RegistrationState state, boolean isDefaultAccount) {
-		try {
-			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-			boolean defaultAccountConnected = (isDefaultAccount && lc != null && lc.getDefaultProxyConfig() != null && lc.getDefaultProxyConfig().isRegistered()) || !isDefaultAccount;
-			if (state == RegistrationState.RegistrationOk && defaultAccountConnected) {
-				return R.drawable.led_connected;
-			} else if (state == RegistrationState.RegistrationProgress) {
-				return R.drawable.led_inprogress;
-			} else if (state == RegistrationState.RegistrationFailed) {
-				return R.drawable.led_error;
-			} else {
-				return R.drawable.led_disconnected;
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		return R.drawable.led_disconnected;
-	}
-
-	class AccountsListAdapter extends BaseAdapter {
-		List<LinphoneProxyConfig> proxy_list;
-
-		AccountsListAdapter() {
-			proxy_list = new ArrayList<LinphoneProxyConfig>();
-			refresh();
-
-		}
-
-		public void refresh(){
-			proxy_list = new ArrayList<LinphoneProxyConfig>();
-
-			proxy_list.add(LinphoneManager.getLc().getDefaultProxyConfig());
-			for(LinphoneProxyConfig proxyConfig : LinphoneManager.getLc().getProxyConfigList()){
-				if(proxyConfig != LinphoneManager.getLc().getDefaultProxyConfig()){
-					proxy_list.add(proxyConfig);
-				}
-			}
-		}
-
-		public int getCount() {
-			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-			if (proxy_list != null) {
-				return proxy_list.size();
-			} else {
-				return 0;
-			}
-		}
-
-		public Object getItem(int position) {
-			return proxy_list.get(position);
-		}
-
-		public long getItemId(int position) {
-			return position;
-		}
-
-		public View getView(final int position, View convertView, ViewGroup parent) {
-			refresh();
-			boolean isDefaultAccount = false;
-			View view = null;
-			Log.w(position);
-			LinphoneProxyConfig lpc = (LinphoneProxyConfig) getItem(position);
-			//if (convertView != null) {
-			//	view = convertView;
-			//} else {
-			if(lpc == LinphoneManager.getLc().getDefaultProxyConfig()) {
-				isDefaultAccount = true;
-				view = getLayoutInflater().inflate(R.layout.main_account, parent, false);
-				Log.w("Default account");
-
-			} else {
-				view = getLayoutInflater().inflate(R.layout.accounts, parent, false);
-			}
-			//}
-
-			ImageView status = (ImageView) view.findViewById(R.id.statusLed);
-
-			TextView address = (TextView) view.findViewById(R.id.address);
-			String sipAddress = (lpc.getIdentity() != null && lpc.getIdentity().startsWith("sip:")) ? lpc.getIdentity().split("sip:")[1] : lpc.getIdentity();
-			//identity.setText(sipAddress);
-
-			try {
-				LinphoneAddress identity = LinphoneCoreFactory.instance().createLinphoneAddress(lpc.getIdentity());
-				address.setText(identity.asStringUriOnly());
-				if(isDefaultAccount) {
-					TextView displayName = (TextView) findViewById(R.id.display_name);
-					if (identity.getDisplayName() != null)
-						displayName.setText(identity.getDisplayName());
-					else
-						displayName.setText(identity.getUserName());
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-
-			int nbAccounts = LinphonePreferences.instance().getAccountCount();
-			int accountIndex = 0;
-
-			for (int i = 0; i < nbAccounts; i++) {
-				String username = LinphonePreferences.instance().getAccountUsername(i);
-				String domain = LinphonePreferences.instance().getAccountDomain(i);
-				String id = username + "@" + domain;
-				if (id.equals(address)) {
-					accountIndex = i;
-					view.setTag(accountIndex);
-
-					break;
-				}
-			}
-
-			status.setImageResource(getStatusIconResource(lpc.getState(),isDefaultAccount));
-
-			view.setTag(accountIndex);
-
-			return view;
-		}
-	}
-
-	private class DrawerItemClickListener implements ListView.OnItemClickListener {
-	@Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-			selectItem(view,position);
-		}
-	}
-
-	private void selectItem(View view,int position) {
-
-		Log.w(mDrawerListB.getAdapter().getItem(position).toString());
-		mDrawerListB.setItemChecked(position, true);
-
-		if(mDrawerListB.getAdapter().getItem(position).toString().equals("Settings")){
-			displaySettings();
-		}
-		if(mDrawerListB.getAdapter().getItem(position).toString().equals("About")){
-			displayAbout();
-		}
-
-		if(mDrawerListB.getAdapter().getItem(position).toString().equals("Assistant")){
-			displayAssistant();
-		}
-		mDrawerLayout.closeDrawer(mDrawerList);
-	}
-
-	@Override
-	public void setTitle(CharSequence title) {
-		mTitle = (String) title;
-		//getActionBar().setTitle(mTitle);
-	}
-
-	/**
-	 * When using the ActionBarDrawerToggle, you must call it during
-	 * onPostCreate() and onConfigurationChanged()...
-	 */
 
 	@Override
 	protected void onPostCreate(Bundle savedInstanceState) {
@@ -513,8 +299,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 
 	private void initButtons() {
-		menu = (LinearLayout) findViewById(R.id.menu);
-
 		history = (RelativeLayout) findViewById(R.id.history);
 		history.setOnClickListener(this);
 		contacts = (RelativeLayout) findViewById(R.id.contacts);
@@ -863,11 +647,13 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 			return;
 		}
 
+		Log.w("Display chat sipuri" + sipUri);
+
 		if(sipUri == null) {
-			Intent intent = new Intent(this, ChatActivity.class);
-			startOrientationSensor();
-			startActivityForResult(intent, CHAT_ACTIVITY);
+			Bundle extras = new Bundle();
+			changeCurrentFragment(FragmentsAvailable.CHAT, extras);
 		} else {
+			Log.w("Display chat");
 			LinphoneAddress lAddress;
 			try {
 				lAddress = LinphoneCoreFactory.instance().createLinphoneAddress(sipUri);
@@ -885,38 +671,38 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 				thumbnailUri = contact.getThumbnailUri().toString();
 			}
 
-
-			if (currentFragment == FragmentsAvailable.CHATLIST || currentFragment == FragmentsAvailable.CHAT){
-				if (isTablet()){
-						Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2);
-						if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.CHAT) {
-							ChatFragment chatFragment = (ChatFragment) fragment2;
-							chatFragment.changeDisplayedChat(sipUri, displayName, pictureUri);
-						} else {
-							Bundle extras = new Bundle();
-							extras.putString("SipUri", sipUri);
-							if (contact != null) {
-								extras.putString("DisplayName", displayName);
-								extras.putString("PictureUri", pictureUri);
-								extras.putString("ThumbnailUri", thumbnailUri);
-							}
-							changeCurrentFragment(FragmentsAvailable.CHAT, extras);
-						}
+			if (currentFragment == FragmentsAvailable.CHATLIST || currentFragment == FragmentsAvailable.CHAT) {
+				Fragment fragment2 = getFragmentManager().findFragmentById(R.id.fragmentContainer2);
+				if (fragment2 != null && fragment2.isVisible() && currentFragment == FragmentsAvailable.CHAT) {
+					ChatFragment chatFragment = (ChatFragment) fragment2;
+					chatFragment.changeDisplayedChat(sipUri, displayName, pictureUri);
 				} else {
 					Bundle extras = new Bundle();
 					extras.putString("SipUri", sipUri);
 					if (lAddress.getDisplayName() != null) {
-						extras.putString("DisplayName", contact.getName());
+						extras.putString("DisplayName", displayName);
 						extras.putString("PictureUri", pictureUri);
 						extras.putString("ThumbnailUri", thumbnailUri);
 					}
 					changeCurrentFragment(FragmentsAvailable.CHAT, extras);
 				}
-				if (messageListFragment != null && messageListFragment.isVisible()) {
-					((ChatListFragment) messageListFragment).refresh();
+			} else {
+				Bundle extras = new Bundle();
+				extras.putString("SipUri", sipUri);
+				if (lAddress.getDisplayName() != null) {
+					extras.putString("DisplayName", displayName);
+					extras.putString("PictureUri", pictureUri);
+					extras.putString("ThumbnailUri", thumbnailUri);
 				}
+				changeCurrentFragment(FragmentsAvailable.CHAT, extras);
 			}
 
+
+			if (messageListFragment != null && messageListFragment.isVisible()) {
+				((ChatListFragment) messageListFragment).refresh();
+			}
+
+
 			LinphoneService.instance().resetMessageNotifCount();
 			LinphoneService.instance().removeMessageNotification();
 			displayMissedChats(getChatStorage().getUnreadMessageCount());
@@ -999,11 +785,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		messageListFragment = fragment;
 	}
 
-	public void hideMenu(boolean hide) {
-		menu.setVisibility(hide ? View.GONE : View.VISIBLE);
-		mark.setVisibility(hide ? View.GONE : View.VISIBLE);
-	}
-
 	public void updateStatusFragment(StatusFragment fragment) {
 		statusFragment = fragment;
 	}
@@ -1094,11 +875,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	private void displayMissedChats(final int missedChatCount) {
 		if (missedChatCount > 0) {
 			missedChats.setText(missedChatCount + "");
-			if (missedChatCount > 99) {
-				missedChats.setTextSize(12);
-			} else {
-				missedChats.setTextSize(20);
-			}
 			missedChats.setVisibility(View.VISIBLE);
 			if (!isAnimationDisabled) {
 				missedChats.startAnimation(AnimationUtils.loadAnimation(LinphoneActivity.this, R.anim.bounce));
@@ -1311,7 +1087,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}
 	}
 
-	public void exit() {
+	public void quit() {
 		finish();
 		stopService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
 	}
@@ -1320,7 +1096,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		if (resultCode == Activity.RESULT_FIRST_USER && requestCode == SETTINGS_ACTIVITY) {
 			if (data.getExtras().getBoolean("Exit", false)) {
-				exit();
+				quit();
 			} else {
 				FragmentsAvailable newFragment = (FragmentsAvailable) data.getExtras().getSerializable("FragmentToDisplay");
 				changeCurrentFragment(newFragment, null, true);
@@ -1498,6 +1274,206 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 		}*/
 		return super.onKeyDown(keyCode, event);
 	}
+
+	//SIDE MENU
+
+	public void openOrCloseSideMenu(boolean open) {
+		if(open) {
+			sideMenu.openDrawer(sideMenuContent);
+		} else {
+			sideMenu.closeDrawer(sideMenuContent);
+		}
+	}
+
+	public void createSideMenu() {
+		sideMenu = (DrawerLayout) findViewById(R.id.side_menu);
+		sideMenuItems = getResources().getStringArray(R.array.side_menu_item);
+		sideMenuContent = (RelativeLayout) findViewById(R.id.side_menu_content);
+		sideMenuItemList = (ListView)findViewById(R.id.item_list);
+		menu = (ImageView) findViewById(R.id.side_menu_button);
+
+		sideMenuItemList.setAdapter(new ArrayAdapter<String>(this, R.layout.side_menu_item, sideMenuItems));
+		sideMenuItemList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+			@Override
+			public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+				if(sideMenuItemList.getAdapter().getItem(i).toString().equals("Settings")){
+					LinphoneActivity.instance().displaySettings();
+				}
+				if(sideMenuItemList.getAdapter().getItem(i).toString().equals("About")){
+					LinphoneActivity.instance().displayAbout();
+				}
+				if(sideMenuItemList.getAdapter().getItem(i).toString().equals("Assistant")){
+					LinphoneActivity.instance().displayAssistant();
+				}
+				openOrCloseSideMenu(false);
+			}
+		});
+
+		initAccounts();
+
+		menu.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if(sideMenu.isDrawerVisible(Gravity.LEFT)){
+					sideMenu.closeDrawer(sideMenuContent);
+				} else {
+					sideMenu.openDrawer(sideMenuContent);
+				}
+			}
+		});
+
+		quitLayout = (RelativeLayout) findViewById(R.id.side_menu_quit);
+		quitLayout.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				LinphoneActivity.instance().quit();
+			}
+		});
+	}
+
+	private void initAccounts() {
+		accountsList = (ListView) findViewById(R.id.accounts_list);
+		defaultAccount = (RelativeLayout) findViewById(R.id.default_account);
+
+		if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
+			defaultAccount.setVisibility(View.VISIBLE);
+			ImageView status = (ImageView)findViewById(R.id.status_led);
+			TextView address = (TextView) findViewById(R.id.address);
+			TextView displayName = (TextView) findViewById(R.id.display_name);
+
+			try {
+				LinphoneAddress identity = LinphoneCoreFactory.instance().createLinphoneAddress((LinphoneManager.getLc().getDefaultProxyConfig().getIdentity()));
+				address.setText(identity.asStringUriOnly());
+				if (identity.getDisplayName() != null) {
+					displayName.setText(identity.getDisplayName());
+				} else if (identity.getUserName() != null) {
+					displayName.setText(identity.getUserName());
+				} else {
+					displayName.setText("");
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			status.setImageResource(getStatusIconResource(LinphoneManager.getLc().getDefaultProxyConfig().getState()));
+
+			defaultAccount.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					LinphoneActivity.instance().displayAccountSettings(LinphonePreferences.instance().getDefaultAccountIndex());
+					openOrCloseSideMenu(false);
+				}
+			});
+
+		} else {
+			defaultAccount.setVisibility(View.GONE);
+		}
+
+		if(LinphoneManager.getLc().getProxyConfigList().length > 1) {
+			accountsList.setVisibility(View.VISIBLE);
+			accountsList.setAdapter(new AccountsListAdapter());
+			accountsList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+				@Override
+				public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+					int position = Integer.parseInt(view.getTag().toString());
+					LinphoneActivity.instance().displayAccountSettings(position);
+					openOrCloseSideMenu(false);
+				}
+			});
+		} else {
+			accountsList.setVisibility(View.GONE);
+		}
+	}
+
+	private int getStatusIconResource(LinphoneCore.RegistrationState state) {
+		try {
+			LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
+			if (state == RegistrationState.RegistrationOk) {
+				return R.drawable.led_connected;
+			} else if (state == RegistrationState.RegistrationProgress) {
+				return R.drawable.led_inprogress;
+			} else if (state == RegistrationState.RegistrationFailed) {
+				return R.drawable.led_error;
+			} else {
+				return R.drawable.led_disconnected;
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return R.drawable.led_disconnected;
+	}
+
+	class AccountsListAdapter extends BaseAdapter {
+		List<LinphoneProxyConfig> proxy_list;
+
+		AccountsListAdapter() {
+			proxy_list = new ArrayList<LinphoneProxyConfig>();
+			refresh();
+		}
+
+		public void refresh(){
+			proxy_list = new ArrayList<LinphoneProxyConfig>();
+			for(LinphoneProxyConfig proxyConfig : LinphoneManager.getLc().getProxyConfigList()){
+				if(proxyConfig != LinphoneManager.getLc().getDefaultProxyConfig()){
+					proxy_list.add(proxyConfig);
+				}
+			}
+		}
+
+		public int getCount() {
+			if (proxy_list != null) {
+				return proxy_list.size();
+			} else {
+				return 0;
+			}
+		}
+
+		public Object getItem(int position) {
+			return proxy_list.get(position);
+		}
+
+		public long getItemId(int position) {
+			return position;
+		}
+
+		public View getView(final int position, View convertView, ViewGroup parent) {
+			View view = null;
+			LinphoneProxyConfig lpc = (LinphoneProxyConfig) getItem(position);
+			if (convertView != null) {
+				view = convertView;
+			} else {
+				view = getLayoutInflater().inflate(R.layout.accounts, parent, false);
+			}
+
+			ImageView status = (ImageView) view.findViewById(R.id.statusLed);
+			TextView address = (TextView) view.findViewById(R.id.address);
+			String sipAddress = (lpc.getIdentity() != null && lpc.getIdentity().startsWith("sip:")) ? lpc.getIdentity().split("sip:")[1] : lpc.getIdentity();
+
+			try {
+				LinphoneAddress identity = LinphoneCoreFactory.instance().createLinphoneAddress(lpc.getIdentity());
+				address.setText(identity.asStringUriOnly());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+
+			int nbAccounts = LinphonePreferences.instance().getAccountCount();
+			int accountIndex = 0;
+
+			for (int i = 0; i < nbAccounts; i++) {
+				String username = LinphonePreferences.instance().getAccountUsername(i);
+				String domain = LinphonePreferences.instance().getAccountDomain(i);
+				String id = username + "@" + domain;
+				if (id.equals(sipAddress)) {
+					accountIndex = i;
+					view.setTag(accountIndex);
+					break;
+				}
+			}
+			status.setImageResource(getStatusIconResource(lpc.getState()));
+			return view;
+		}
+	}
 }
 
 interface ContactPicked {
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 5c829cec3..088dc80df 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -297,7 +297,7 @@ public final class LinphoneService extends Service {
 			notificationTextId = R.string.incall_notif_paused;
 			break;
 		case VIDEO:
-			inconId = R.drawable.conf_video;
+			inconId = R.drawable.topbar_videocall_notification;
 			notificationTextId = R.string.incall_notif_video;
 			break;	
 		default:
@@ -405,10 +405,10 @@ public final class LinphoneService extends Service {
 			try {
 				bm = MediaStore.Images.Media.getBitmap(getContentResolver(), pictureUri);
 			} catch (Exception e) {
-				bm = BitmapFactory.decodeResource(getResources(), R.drawable.unknown_small);
+				bm = BitmapFactory.decodeResource(getResources(), R.drawable.avatar);
 			}
 		} else {
-			bm = BitmapFactory.decodeResource(getResources(), R.drawable.unknown_small);
+			bm = BitmapFactory.decodeResource(getResources(), R.drawable.avatar);
 		}
 		mMsgNotif = Compatibility.createMessageNotification(getApplicationContext(), mMsgNotifCount, fromName, message, bm, notifContentIntent);
 		
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 84cf1ad6b..bf8b69516 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -138,7 +138,7 @@ public class AssistantActivity extends Activity implements OnClickListener {
 		back.setOnClickListener(this);
 		cancel = (ImageView) findViewById(R.id.cancel);
 		cancel.setOnClickListener(this);
-		status.enableLeftMenu(false);
+		status.enableSideMenu(false);
 	}
 	
 	private void changeFragment(Fragment newFragment) {
diff --git a/src/org/linphone/assistant/RemoteProvisioningFragment.java b/src/org/linphone/assistant/RemoteProvisioningFragment.java
index 6fd08962e..eb257431c 100644
--- a/src/org/linphone/assistant/RemoteProvisioningFragment.java
+++ b/src/org/linphone/assistant/RemoteProvisioningFragment.java
@@ -62,7 +62,7 @@ public class RemoteProvisioningFragment extends Fragment implements OnClickListe
 			Intent intent = new Intent();
 			intent.setClass(getActivity(), LinphoneLauncherActivity.class);
 			getActivity().finish();
-			LinphoneActivity.instance().exit();
+			LinphoneActivity.instance().quit();
 			startActivity(intent);
 		}
 	}
diff --git a/src/org/linphone/ui/AddressText.java b/src/org/linphone/ui/AddressText.java
index 3b6677578..6b754ba91 100644
--- a/src/org/linphone/ui/AddressText.java
+++ b/src/org/linphone/ui/AddressText.java
@@ -73,7 +73,7 @@ public class AddressText extends EditText implements AddressType {
 	}
 	
 	private String getHintText() {
-		String resizedText = getContext().getString(R.string.addressHint);
+		String resizedText = getContext().getString(R.string.address_bar_hint);
 		if (getHint() != null) {
 			resizedText = getHint().toString();
 		}