diff --git a/app/src/main/java/com/ganlvtech/kahlanotify/ConversationActivity.java b/app/src/main/java/com/ganlvtech/kahlanotify/ConversationActivity.java
index 822fd69..f52129e 100644
--- a/app/src/main/java/com/ganlvtech/kahlanotify/ConversationActivity.java
+++ b/app/src/main/java/com/ganlvtech/kahlanotify/ConversationActivity.java
@@ -7,8 +7,10 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.*;
 import com.ganlvtech.kahlanotify.client.KahlaClient;
@@ -43,6 +45,7 @@ public class ConversationActivity extends MyServiceActivity {
     private ImageButton mButtonSendImage;
     private ImageButton mButtonSendFile;
     private Button mButtonSend;
+    private Toolbar mToolbar;
     private MessageListItemAdapter mMessageListItemAdapter;
     private ConversationListActivitySharedPreferences mConversationListActivitySharedPreferences;
     private String mServer;
@@ -82,6 +85,11 @@ protected void onCreate(Bundle savedInstanceState) {
         mButtonSendImage = findViewById(R.id.buttonSendImage);
         mButtonSendFile = findViewById(R.id.buttonSendFile);
         mButtonSend = findViewById(R.id.buttonSend);
+        mToolbar = findViewById(R.id.toolbar);
+
+        setSupportActionBar(mToolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
 
         mSwipeRefreshLayout.setColorSchemeColors(getColor(R.color.main_theme));
         mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@@ -352,4 +360,12 @@ private void showImage(IconTitleContent iconTitleContentItem) {
             startActivity(intent);
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if(item.getItemId() == android.R.id.home){
+            onBackPressed();
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }
diff --git a/app/src/main/java/com/ganlvtech/kahlanotify/ConversationListActivity.java b/app/src/main/java/com/ganlvtech/kahlanotify/ConversationListActivity.java
index 21d7573..ef12204 100644
--- a/app/src/main/java/com/ganlvtech/kahlanotify/ConversationListActivity.java
+++ b/app/src/main/java/com/ganlvtech/kahlanotify/ConversationListActivity.java
@@ -24,6 +24,7 @@
 import com.ganlvtech.kahlanotify.kahla.responses.auth.MeResponse;
 import com.ganlvtech.kahlanotify.kahla.responses.friendship.MyFriendsResponse;
 import com.ganlvtech.kahlanotify.util.ConversationListActivitySharedPreferences;
+import com.jaeger.library.StatusBarUtil;
 
 import java.util.List;
 
@@ -56,10 +57,12 @@ protected void onCreate(Bundle savedInstanceState) {
         mTextViewNewAccount = findViewById(R.id.textViewNewAccount);
         mToolbar = findViewById(R.id.toolbar);
 
+        StatusBarUtil.setColorNoTranslucentForDrawerLayout(this, mDrawerLayoutConversationListActivity, getColor(R.color.main_theme));
+
         setSupportActionBar(mToolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeButtonEnabled(true);
-        getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_menu_black_24dp);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
 
         mDrawerToggle = new ActionBarDrawerToggle(this,mDrawerLayoutConversationListActivity,R.string.Menu,R.string.Menu);
         mDrawerLayoutConversationListActivity.addDrawerListener(mDrawerToggle);
diff --git a/app/src/main/res/layout/activity_conversation.xml b/app/src/main/res/layout/activity_conversation.xml
index ee20b1e..339fd2b 100644
--- a/app/src/main/res/layout/activity_conversation.xml
+++ b/app/src/main/res/layout/activity_conversation.xml
@@ -13,12 +13,15 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:popupTheme="@style/AppTheme._Toolbar"
+        android:theme="@style/AppTheme._Toolbar"
         android:background="@color/main_theme">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="vertical"
+            android:layout_gravity="center"
             android:paddingTop="2dp"
             android:paddingBottom="4dp">
 
@@ -91,6 +94,8 @@
             android:layout_height="wrap_content"
             app:icon="@drawable/ic_send_black_24dp"
             android:layout_gravity="bottom"
+            android:layout_marginEnd="4dp"
+            android:layout_marginStart="4dp"
             android:text="@string/send"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_conversation_list.xml b/app/src/main/res/layout/activity_conversation_list.xml
index 7439a44..0ab3cab 100644
--- a/app/src/main/res/layout/activity_conversation_list.xml
+++ b/app/src/main/res/layout/activity_conversation_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawerLayoutConversationListActivity"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -15,32 +16,36 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:popupTheme="@style/AppTheme._Toolbar"
+            android:theme="@style/AppTheme._Toolbar"
+            app:navigationIcon="@drawable/ic_menu_black_24dp"
             android:background="@color/main_theme">
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
                 android:paddingTop="2dp"
+                android:layout_gravity="center"
                 android:paddingBottom="4dp">
 
                 <TextView
                     android:id="@+id/toolbarTextViewTitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="start"
+                    android:layout_gravity="center"
                     android:text="@string/app_name"
                     android:textAppearance="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"
-                    android:textColor="@color/toolbar_title" />
+                    android:textColor="@color/toolbar_title"/>
 
                 <TextView
                     android:id="@+id/toolbarTextViewSubtitle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="start"
+                    android:layout_gravity="center"
                     android:textAppearance="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"
                     android:textColor="@color/toolbar_subtitle"
-                    android:textSize="12sp" />
+                    android:textSize="12sp"/>
             </LinearLayout>
         </android.support.v7.widget.Toolbar>
 
@@ -55,9 +60,9 @@
                 android:layout_height="match_parent"
                 android:divider="@android:color/darker_gray"
                 android:dividerHeight="1px"
-                android:scrollbars="none" />
+                android:scrollbars="none"/>
         </android.support.v4.widget.SwipeRefreshLayout>
     </LinearLayout>
 
-    <include layout="@layout/drawer_layout_menu" />
+    <include layout="@layout/drawer_layout_menu"/>
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/drawer_layout_menu.xml b/app/src/main/res/layout/drawer_layout_menu.xml
index 2dffc17..d0175f5 100644
--- a/app/src/main/res/layout/drawer_layout_menu.xml
+++ b/app/src/main/res/layout/drawer_layout_menu.xml
@@ -39,6 +39,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:textColor="@android:color/white"
+                    android:textSize="16sp"
                     android:text="@string/app_name" />
 
                 <TextView
@@ -46,8 +48,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     android:layout_weight="1"
+                    android:textColor="@android:color/secondary_text_dark"
                     android:text="@string/version_number"
-                    android:textSize="8sp" />
+                    android:textSize="12sp" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8ef4c81..f5f1c2e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -8,6 +8,8 @@
         <item name="android:statusBarColor">@color/main_theme</item>
     </style>
 
+    <style name="AppTheme._Toolbar" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
+
     <style name="AppTheme.LoginActivity" parent="AppTheme">
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowSoftInputMode">adjustResize</item>