diff --git a/app/build.gradle b/app/build.gradle
index ec1a6174b..6de288cc1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,5 +30,7 @@ dependencies {
     compile 'com.android.support:support-v13:25.1.0'
     compile 'com.android.volley:volley:1.0.0'
     compile 'com.android.support:design:25.1.0'
+    compile 'com.squareup.picasso:picasso:2.5.2'
+    compile 'com.pkmmte.view:circularimageview:1.1'
     testCompile 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
index dcb1f81a5..313086b3d 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
@@ -19,9 +19,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
+import android.icu.text.NumberFormat;
+import android.media.Image;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.design.widget.CollapsingToolbarLayout;
+import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
@@ -31,6 +35,7 @@ import android.text.method.LinkMovementMethod;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.volley.AuthFailureError;
@@ -41,6 +46,8 @@ import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.JsonArrayRequest;
 import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.NetworkImageView;
+import com.pkmmte.view.CircularImageView;
+import com.squareup.picasso.Picasso;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -78,11 +85,21 @@ public class AccountActivity extends BaseActivity {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        NetworkImageView avatar = (NetworkImageView) findViewById(R.id.account_avatar);
-        NetworkImageView header = (NetworkImageView) findViewById(R.id.account_header);
-        avatar.setDefaultImageResId(R.drawable.avatar_default);
-        avatar.setErrorImageResId(R.drawable.avatar_error);
-        header.setDefaultImageResId(R.drawable.account_header_default);
+        ActionBar actionBar = getSupportActionBar();
+
+        if (actionBar != null) {
+            actionBar.setTitle(null);
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
+
+        FloatingActionButton floatingBtn = (FloatingActionButton) findViewById(R.id.floating_btn);
+        floatingBtn.hide();
+
+        CircularImageView avatar = (CircularImageView) findViewById(R.id.account_avatar);
+        ImageView header = (ImageView) findViewById(R.id.account_header);
+        avatar.setImageResource(R.drawable.avatar_default);
+        header.setImageResource(R.drawable.account_header_default);
 
         obtainAccount();
         if (!accountId.equals(loggedInAccountId)) {
@@ -165,39 +182,43 @@ public class AccountActivity extends BaseActivity {
         TextView username = (TextView) findViewById(R.id.account_username);
         TextView displayName = (TextView) findViewById(R.id.account_display_name);
         TextView note = (TextView) findViewById(R.id.account_note);
-        NetworkImageView avatar = (NetworkImageView) findViewById(R.id.account_avatar);
-        NetworkImageView header = (NetworkImageView) findViewById(R.id.account_header);
+        CircularImageView avatar = (CircularImageView) findViewById(R.id.account_avatar);
+        ImageView header = (ImageView) findViewById(R.id.account_header);
 
         String usernameFormatted = String.format(
                 getString(R.string.status_username_format), account.username);
         username.setText(usernameFormatted);
 
         displayName.setText(account.displayName);
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setTitle(account.displayName);
-        }
 
         note.setText(account.note);
         note.setLinksClickable(true);
         note.setMovementMethod(LinkMovementMethod.getInstance());
 
-        ImageLoader imageLoader = VolleySingleton.getInstance(this).getImageLoader();
         if (!account.avatar.isEmpty()) {
-            avatar.setImageUrl(account.avatar, imageLoader);
+            Picasso.with(this)
+                    .load(account.avatar)
+                    .placeholder(R.drawable.avatar_default)
+                    .error(R.drawable.avatar_error)
+                    .into(avatar);
         }
         if (!account.header.isEmpty()) {
-            header.setImageUrl(account.header, imageLoader);
+            Picasso.with(this)
+                    .load(account.header)
+                    .placeholder(R.drawable.account_header_default)
+                    .into(header);
         }
 
         openInWebUrl = account.url;
+        java.text.NumberFormat nf = java.text.NumberFormat.getInstance();
 
         // Add counts to the tabs in the TabLayout.
         String[] counts = {
-            account.statusesCount,
-            account.followingCount,
-            account.followersCount,
+            nf.format(Integer.parseInt(account.statusesCount)),
+            nf.format(Integer.parseInt(account.followingCount)),
+            nf.format(Integer.parseInt(account.followersCount)),
         };
+
         for (int i = 0; i < tabLayout.getTabCount(); i++) {
             TabLayout.Tab tab = tabLayout.getTabAt(i);
             if (tab != null) {
@@ -261,9 +282,29 @@ public class AccountActivity extends BaseActivity {
     private void onObtainRelationshipsSuccess(boolean following, boolean blocking) {
         this.following = following;
         this.blocking = blocking;
+
         if (!following || !blocking) {
             invalidateOptionsMenu();
         }
+
+        updateButtons();
+    }
+
+    private void updateButtons() {
+        invalidateOptionsMenu();
+
+        FloatingActionButton floatingBtn = (FloatingActionButton) findViewById(R.id.floating_btn);
+
+        if(!isSelf && !blocking && !following) {
+            floatingBtn.show();
+            floatingBtn.setImageResource(R.drawable.ic_person_add_24dp);
+            floatingBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    follow(accountId);
+                }
+            });
+        }
     }
 
     private void onObtainRelationshipsFailure(Exception exception) {
@@ -337,7 +378,7 @@ public class AccountActivity extends BaseActivity {
                             return;
                         }
                         following = followingValue;
-                        invalidateOptionsMenu();
+                        updateButtons();
                     }
                 },
                 new Response.ErrorListener() {
@@ -385,7 +426,7 @@ public class AccountActivity extends BaseActivity {
                             return;
                         }
                         blocking = blockingValue;
-                        invalidateOptionsMenu();
+                        updateButtons();
                     }
                 },
                 new Response.ErrorListener() {
@@ -417,10 +458,8 @@ public class AccountActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.action_back: {
-                Intent intent = new Intent(this, MainActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                startActivity(intent);
+            case android.R.id.home: {
+                onBackPressed();
                 return true;
             }
             case R.id.action_open_in_web: {
diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
index 50c0463a1..899bd1a3f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
@@ -23,12 +23,14 @@ import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 
 import com.android.volley.AuthFailureError;
 import com.android.volley.Request;
@@ -62,6 +64,15 @@ public class MainActivity extends BaseActivity {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
+        FloatingActionButton floatingBtn = (FloatingActionButton) findViewById(R.id.floating_btn);
+        floatingBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getApplicationContext(), ComposeActivity.class);
+                startActivity(intent);
+            }
+        });
+
         // Setup the tabs and timeline pager.
         TimelinePagerAdapter adapter = new TimelinePagerAdapter(getSupportFragmentManager());
         String[] pageTitles = {
@@ -170,11 +181,6 @@ public class MainActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.action_compose: {
-                Intent intent = new Intent(this, ComposeActivity.class);
-                startActivity(intent);
-                return true;
-            }
             case R.id.action_view_profile: {
                 Intent intent = new Intent(this, AccountActivity.class);
                 intent.putExtra("id", loggedInAccountId);
diff --git a/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
index bc5d91f7f..5be5cf2a6 100644
--- a/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
@@ -26,11 +26,13 @@ import android.text.style.URLSpan;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
 import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.NetworkImageView;
+import com.squareup.picasso.Picasso;
 
 import java.util.Date;
 
@@ -40,7 +42,7 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
     private TextView username;
     private TextView sinceCreated;
     private TextView content;
-    private NetworkImageView avatar;
+    private ImageView avatar;
     private View rebloggedBar;
     private TextView rebloggedByDisplayName;
     private ImageButton replyButton;
@@ -65,9 +67,7 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
         username = (TextView) itemView.findViewById(R.id.status_username);
         sinceCreated = (TextView) itemView.findViewById(R.id.status_since_created);
         content = (TextView) itemView.findViewById(R.id.status_content);
-        avatar = (NetworkImageView) itemView.findViewById(R.id.status_avatar);
-        avatar.setDefaultImageResId(R.drawable.avatar_default);
-        avatar.setErrorImageResId(R.drawable.avatar_error);
+        avatar = (ImageView) itemView.findViewById(R.id.status_avatar);
         rebloggedBar = itemView.findViewById(R.id.status_reblogged_bar);
         rebloggedByDisplayName = (TextView) itemView.findViewById(R.id.status_reblogged);
         replyButton = (ImageButton) itemView.findViewById(R.id.status_reply);
@@ -159,8 +159,11 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
             return;
         }
         Context context = avatar.getContext();
-        ImageLoader imageLoader = VolleySingleton.getInstance(context).getImageLoader();
-        avatar.setImageUrl(url, imageLoader);
+        Picasso.with(context)
+                .load(url)
+                .placeholder(R.drawable.avatar_default)
+                .error(R.drawable.avatar_error)
+                .into(avatar);
     }
 
     private void setCreatedAt(@Nullable Date createdAt) {
@@ -202,10 +205,10 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
     private void setRebloggingEnabled(boolean enabled) {
         reblogButton.setEnabled(enabled);
         if (enabled) {
-            reblogButton.setImageResource(R.drawable.ic_reblog);
+            reblogButton.setImageResource(R.drawable.ic_repeat_24dp);
         } else {
             ThemeUtils.setImageViewTint(reblogButton, R.attr.status_reblog_button_disabled_tint);
-            reblogButton.setImageResource(R.drawable.ic_reblog_disabled);
+            reblogButton.setImageResource(R.drawable.ic_lock_24dp);
         }
     }
 
diff --git a/app/src/main/res/drawable/account_header_gradient.xml b/app/src/main/res/drawable/account_header_gradient.xml
new file mode 100644
index 000000000..f1ae0bab8
--- /dev/null
+++ b/app/src/main/res/drawable/account_header_gradient.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <gradient
+                android:angle="90"
+                android:startColor="#FF000000"
+                android:endColor="#00000000"
+                android:type="linear" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_create_24dp.xml b/app/src/main/res/drawable/ic_create_24dp.xml
new file mode 100644
index 000000000..fb3234929
--- /dev/null
+++ b/app/src/main/res/drawable/ic_create_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_24dp.xml b/app/src/main/res/drawable/ic_lock_24dp.xml
new file mode 100644
index 000000000..6316164d2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_horiz_24dp.xml b/app/src/main/res/drawable/ic_more_horiz_24dp.xml
new file mode 100644
index 000000000..cba1e880a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_horiz_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_person_add_24dp.xml b/app/src/main/res/drawable/ic_person_add_24dp.xml
new file mode 100644
index 000000000..5c029e12a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person_add_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_person_outline_24dp.xml b/app/src/main/res/drawable/ic_person_outline_24dp.xml
new file mode 100644
index 000000000..4ad4f8d08
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person_outline_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_repeat_24dp.xml b/app/src/main/res/drawable/ic_repeat_24dp.xml
new file mode 100644
index 000000000..4b13abca8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repeat_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_reply_24dp.xml b/app/src/main/res/drawable/ic_reply_24dp.xml
new file mode 100644
index 000000000..5fcea57d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_reply_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_star_24dp.xml b/app/src/main/res/drawable/ic_star_24dp.xml
new file mode 100644
index 000000000..47ad24899
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>
diff --git a/app/src/main/res/drawable/toggle_small.xml b/app/src/main/res/drawable/toggle_small.xml
index 03947856f..b6b80bfcd 100644
--- a/app/src/main/res/drawable/toggle_small.xml
+++ b/app/src/main/res/drawable/toggle_small.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#ff4f575f" />
-    <corners android:radius="2dp" />
+    <solid android:color="@color/color_background_dark" />
+    <corners android:radius="3dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index e99535c8a..3ffb121d0 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -10,77 +10,97 @@
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
+        android:theme="@style/AppTheme"
         android:layout_height="wrap_content">
 
         <android.support.design.widget.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:contentScrim="?attr/toolbar_background_color"
+            android:fitsSystemWindows="true"
             app:titleEnabled="false">
 
-            <LinearLayout
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_marginTop="?attr/actionBarSize"
                 android:background="?attr/account_header_background_color">
 
-                <com.android.volley.toolbox.NetworkImageView
+                <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:id="@+id/account_header"
-                    android:scaleType="fitCenter"
+                    android:scaleType="centerCrop"
+                    app:layout_collapseMode="pin"
+                    android:fitsSystemWindows="true"
                     android:adjustViewBounds="true" />
 
-                <RelativeLayout
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:paddingTop="?attr/actionBarSize"
+                    android:background="@drawable/account_header_gradient"
                     android:layout_width="match_parent"
+                    app:layout_collapseMode="parallax"
                     android:layout_height="wrap_content">
 
-                    <com.android.volley.toolbox.NetworkImageView
-                        android:layout_width="80dp"
-                        android:layout_height="80dp"
-                        android:id="@+id/account_avatar"
-                        android:paddingLeft="8dp"
-                        android:paddingRight="8dp"
-                        android:paddingTop="8dp" />
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:paddingLeft="16dp"
+                        android:paddingRight="16dp"
+                        android:paddingTop="16dp"
+                        android:layout_height="wrap_content">
 
-                    <LinearLayout
+                        <com.pkmmte.view.CircularImageView
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
+                            android:layout_marginRight="10dp"
+                            app:shadow="true"
+                            android:id="@+id/account_avatar" />
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_centerVertical="true"
+                            android:layout_toRightOf="@id/account_avatar">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:id="@+id/account_display_name"
+                                android:textStyle="normal|bold"
+                                android:textColor="?android:textColorPrimary"
+                                android:textSize="18sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="?android:textColorSecondary"
+                                android:id="@+id/account_username" />
+
+                        </LinearLayout>
+
+                    </RelativeLayout>
+
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_toRightOf="@id/account_avatar"
-                        android:layout_centerVertical="true">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/account_display_name"
-                            android:textStyle="normal|bold"
-                            android:textSize="18sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/account_username" />
-
-                    </LinearLayout>
-
-                </RelativeLayout>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/account_note"
-                    android:padding="8dp" />
-
-            </LinearLayout>
+                        android:id="@+id/account_note"
+                        android:textColor="?android:textColorTertiary"
+                        android:padding="16dp"
+                        android:paddingTop="10dp"/>
+                </LinearLayout>
+            </FrameLayout>
 
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/toolbar_background_color"
+                android:background="@android:color/transparent"
                 android:layout_gravity="top"
+                android:layout_alignParentTop="true"
                 app:layout_collapseMode="pin" />
 
         </android.support.design.widget.CollapsingToolbarLayout>
@@ -95,6 +115,7 @@
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tab_layout"
+            app:tabBackground="?android:colorBackground"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -119,4 +140,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/floating_btn"
+        android:layout_width="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_person_add_24dp"/>
+
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2da08be8f..031b9ccfa 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_main"
@@ -33,6 +33,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:tabTextAppearance="@style/TabLayoutTextStyle"
+                app:tabBackground="?android:colorBackground"
                 app:tabPaddingStart="1dp"
                 app:tabPaddingEnd="1dp">
 
@@ -54,14 +55,19 @@
             </android.support.design.widget.TabLayout>
 
         </android.support.v4.view.ViewPager>
-
     </LinearLayout>
 
     <FrameLayout
         android:id="@+id/overlay_fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-
     </FrameLayout>
 
-</RelativeLayout>
\ No newline at end of file
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/floating_btn"
+        android:layout_width="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_create_24dp"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 853296e5a..e4fd8edb4 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -3,6 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:id="@+id/status_container">
 
     <RelativeLayout
@@ -16,60 +18,76 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_reblogged"
+            app:srcCompat="@drawable/ic_repeat_24dp"
             android:id="@+id/status_reblogged_icon"
-            android:paddingRight="@dimen/status_avatar_padding"
-            android:paddingLeft="@dimen/status_reblogged_icon_left_padding"
-            android:tint="?attr/notification_icon_tint" />
+            android:paddingRight="10dp"
+            android:paddingLeft="24dp"
+            android:tint="?android:textColorTertiary" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/status_reblogged"
+            android:textColor="?android:textColorTertiary"
             android:layout_centerVertical="true"
             android:layout_toRightOf="@id/status_reblogged_icon" />
 
     </RelativeLayout>
 
-    <com.android.volley.toolbox.NetworkImageView
-        android:layout_width="64dp"
-        android:layout_height="64dp"
+    <ImageView
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:scaleType="fitCenter"
         android:id="@+id/status_avatar"
         android:layout_below="@+id/status_reblogged_bar"
-        android:padding="@dimen/status_avatar_padding" />
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="10dp" />
 
-    <com.keylesspalace.tusky.FlowLayout
+    <RelativeLayout
         android:layout_height="wrap_content"
         android:layout_toRightOf="@+id/status_avatar"
         android:layout_toEndOf="@+id/status_avatar"
         android:id="@+id/status_name_bar"
         android:layout_below="@+id/status_reblogged_bar"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
+        android:paddingBottom="4dp"
         android:paddingTop="@dimen/status_avatar_padding">
 
-        <TextView
-            android:id="@+id/status_display_name"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
-            android:textStyle="normal|bold"
-            android:paddingRight="@dimen/status_display_name_right_padding" />
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/status_display_name"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
+                android:textColor="?android:textColorPrimary"
+                android:textStyle="normal|bold"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:text="Name"
+                android:paddingRight="@dimen/status_display_name_right_padding" />
 
-        <TextView
-            android:id="@+id/status_username"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="?attr/status_text_color_secondary"
-            android:paddingRight="@dimen/status_username_right_padding" />
+            <TextView
+                android:id="@+id/status_username"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?android:textColorSecondary"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:text="Username is the slongest thing ever i am totally going" />
+        </LinearLayout>
 
         <TextView
             android:id="@+id/status_since_created"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="?attr/status_text_color_secondary" />
+            android:layout_alignParentRight="true"
+            android:text="20m ago"
+            android:textColor="?android:textColorSecondary" />
 
-    </com.keylesspalace.tusky.FlowLayout>
+    </RelativeLayout>
 
     <com.keylesspalace.tusky.FlowLayout
         android:layout_width="wrap_content"
@@ -79,12 +97,14 @@
         android:layout_toRightOf="@+id/status_avatar"
         android:layout_toEndOf="@+id/status_avatar"
         android:layout_below="@+id/status_name_bar"
-        android:layout_marginBottom="8dp">
+        android:layout_marginBottom="4dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/status_content_warning_description"
+            android:text="Hello world"
+            android:textColor="?android:textColorPrimary"
             android:paddingRight="8dp"/>
 
         <ToggleButton
@@ -95,8 +115,9 @@
             android:id="@+id/status_content_warning_button"
             android:textOn="@string/status_content_warning_show_less"
             android:textOff="@string/status_content_warning_show_more"
-            android:background="?attr/content_warning_button"
-            android:padding="4dp" />
+            android:padding="3dp"
+            android:textSize="12sp"
+            android:background="?attr/content_warning_button" />
 
     </com.keylesspalace.tusky.FlowLayout>
 
@@ -104,6 +125,7 @@
         android:id="@+id/status_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:textColor="?android:textColorPrimary"
         android:layout_toRightOf="@+id/status_avatar"
         android:layout_toEndOf="@+id/status_avatar"
         android:layout_below="@+id/status_content_warning_bar" />
@@ -195,10 +217,10 @@
         android:layout_below="@id/status_media_preview_container"
         android:layout_toRightOf="@+id/status_avatar"
         android:paddingBottom="8dp"
-        android:paddingTop="8dp">
+        android:paddingTop="10dp">
 
         <ImageButton
-            app:srcCompat="@drawable/ic_reply"
+            app:srcCompat="@drawable/ic_reply_24dp"
             android:id="@+id/status_reply"
             android:layout_width="32dp"
             android:layout_height="32dp"
@@ -210,7 +232,7 @@
             android:layout_weight="1" />
 
         <ImageButton
-            app:srcCompat="@drawable/ic_reblog"
+            app:srcCompat="@drawable/ic_repeat_24dp"
             android:id="@+id/status_reblog"
             style="?attr/image_button_style"
             android:layout_width="32dp"
@@ -225,7 +247,7 @@
             android:layout_width="32dp"
             android:layout_height="32dp"
             style="?attr/image_button_style"
-            app:srcCompat="@drawable/ic_favourite"
+            app:srcCompat="@drawable/ic_star_24dp"
             android:id="@+id/status_favourite" />
 
         <Space
@@ -234,7 +256,7 @@
             android:layout_weight="1" />
 
         <ImageButton
-            app:srcCompat="@drawable/ic_extra"
+            app:srcCompat="@drawable/ic_more_horiz_24dp"
             android:id="@+id/status_more"
             style="?attr/image_button_style"
             android:layout_width="32dp"
diff --git a/app/src/main/res/menu/account_toolbar.xml b/app/src/main/res/menu/account_toolbar.xml
index bfc755c71..3188882e1 100644
--- a/app/src/main/res/menu/account_toolbar.xml
+++ b/app/src/main/res/menu/account_toolbar.xml
@@ -2,11 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/action_back"
-        android:title="@string/action_back"
-        android:icon="@drawable/ic_back"
-        app:showAsAction="always" />
-
     <item android:id="@+id/action_open_in_web"
         android:title="@string/action_open_in_web"
         app:showAsAction="never" />
diff --git a/app/src/main/res/menu/main_toolbar.xml b/app/src/main/res/menu/main_toolbar.xml
index 8ed161a5a..2517ee5dd 100644
--- a/app/src/main/res/menu/main_toolbar.xml
+++ b/app/src/main/res/menu/main_toolbar.xml
@@ -3,12 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/action_compose"
-        android:title="@string/action_compose"
-        android:icon="@drawable/ic_compose"
-        app:showAsAction="always" />
-
     <item
         android:id="@+id/action_view_profile"
         android:title="@string/action_view_profile"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8c1a1c01c..13f0502f7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,31 +4,31 @@
     <color name="splash_background">#4F4F4F</color>
     <color name="view_video_background">#000000</color>
     <!--Dark Theme Colors-->
-    <color name="color_primary_dark">#44A673</color>
-    <color name="color_primary_dark_dark">#2C996E</color> <!--Dark Dark-->
-    <color name="color_accent_dark">#3F8A65</color>
-    <color name="button_dark">#3F8A65</color>
-    <color name="color_background_dark">#3C4945</color>
-    <color name="window_background_dark">#191E1E</color>
+    <color name="color_primary_dark">#4c5368</color>
+    <color name="color_primary_dark_dark">#363c4b</color> <!--Dark Dark-->
+    <color name="color_accent_dark">#2b90d9</color>
+    <color name="button_dark">#2b90d9</color>
+    <color name="color_background_dark">#1a1c23</color>
+    <color name="window_background_dark">#282c37</color>
     <color name="edit_text_color_dark">#FFFFFF</color>
     <color name="text_color_primary_dark">#FFFFFF</color>
-    <color name="text_color_secondary_dark">#FFFFFF</color>
-    <color name="text_color_tertiary_dark">#FFFFFF</color>
+    <color name="text_color_secondary_dark">#d9e1e8</color>
+    <color name="text_color_tertiary_dark">#9baec8</color>
     <color name="text_color_primary_inverse_dark">#000000</color>
     <color name="text_color_secondary_inverse_dark">#000000</color>
     <color name="text_color_tertiary_inverse_dark">#000000</color>
-    <color name="toolbar_background_dark">#44A673</color>
-    <color name="toolbar_icon_dark">#FFFFFF</color>
-    <color name="image_button_dark">#CFCFCF</color>
-    <color name="status_reblog_button_dark">#CFCFCF</color>
-    <color name="status_reblog_button_marked_dark">#00DFAF</color>
-    <color name="status_reblog_button_disabled_dark">#6F6F6F</color>
-    <color name="status_favourite_button_dark">#CFCFCF</color>
-    <color name="status_favourite_button_marked_dark">#DFCF00</color>
+    <color name="toolbar_background_dark">#4c5368</color>
+    <color name="toolbar_icon_dark">#d9e1e8</color>
+    <color name="image_button_dark">#68738f</color>
+    <color name="status_reblog_button_dark">#68738f</color>
+    <color name="status_reblog_button_marked_dark">#2b90d9</color>
+    <color name="status_reblog_button_disabled_dark">#363c4b</color>
+    <color name="status_favourite_button_dark">#68738f</color>
+    <color name="status_favourite_button_marked_dark">#ca8f04</color>
     <color name="sensitive_media_warning_background_dark">#303030</color>
     <color name="media_preview_unloaded_background_dark">#2F2F2F</color>
     <color name="status_text_secondary_dark">#A4B4BC</color>
-    <color name="status_divider_dark">#000000</color>
+    <color name="status_divider_dark">#2f3441</color>
     <color name="tab_page_margin_dark">#4C534B</color>
     <color name="account_header_background_dark">#000000</color>
     <color name="compose_media_button_dark">#FFFFFF</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 974097923..249a40ae2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,7 +16,7 @@
         <item name="colorAccent">@color/color_accent_dark</item>
         <item name="colorButtonNormal">@color/button_dark</item>
 
-        <item name="android:colorBackground">@color/color_background_dark</item>
+        <item name="android:colorBackground">@color/color_primary_dark_dark</item>
         <item name="android:windowBackground">@color/window_background_dark</item>
         <item name="android:editTextColor">@color/edit_text_color_dark</item>
         <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
@@ -38,7 +38,6 @@
         <item name="status_favourite_button_marked_tint">@color/status_favourite_button_marked_dark</item>
         <item name="content_warning_button">@drawable/toggle_small</item>
         <item name="sensitive_media_warning_background_color">@color/sensitive_media_warning_background_dark</item>
-        <item name="status_text_color_secondary">@color/status_text_secondary_dark</item>
         <item name="media_preview_unloaded_drawable">@drawable/media_preview_unloaded_dark</item>
         <item name="status_divider_drawable">@drawable/status_divider_dark</item>
         <item name="tab_page_margin_drawable">@drawable/tab_page_margin_dark</item>
diff --git a/build.gradle b/build.gradle
index 74b2ab0dd..1ea4bd055 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f34..19330f4dd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Mon Mar 06 17:29:49 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip