diff --git a/mobile/build.gradle b/mobile/build.gradle
index 691d9fc..7f9bed6 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -24,8 +24,8 @@ android {
         applicationId "com.thunsaker.rapido"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 2101
-        versionName "2.1.01"
+        versionCode 2120
+        versionName "2.1.2"
         resConfigs "en", "es"
     }
 
@@ -84,6 +84,8 @@ dependencies {
     compile 'com.android.support:design:23.1.0'
     compile 'com.android.support:support-v4:23.1.0'
     compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:cardview-v7:23.1.0'
+
     compile 'com.google.android.gms:play-services-identity:8.1.0'
     compile 'com.google.android.gms:play-services-plus:8.1.0'
     compile 'com.google.android.gms:play-services-location:8.1.0'
@@ -98,7 +100,6 @@ dependencies {
     compile 'io.reactivex:rxandroid:1.0.1'
     compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
 
-    compile 'com.melnykov:floatingactionbutton:1.1.0'
     compile 'com.github.talenguyen:prettysharedpreferences:1.0.2'
     compile 'com.twitter:twitter-text:1.9.0'
     compile 'org.twitter4j:twitter4j-core:4.0.2'
diff --git a/mobile/src/main/java/com/thunsaker/rapido/ui/MainFragment.java b/mobile/src/main/java/com/thunsaker/rapido/ui/MainFragment.java
index e64bdce..327f2f0 100644
--- a/mobile/src/main/java/com/thunsaker/rapido/ui/MainFragment.java
+++ b/mobile/src/main/java/com/thunsaker/rapido/ui/MainFragment.java
@@ -37,7 +37,13 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.facebook.*;
+import com.facebook.AccessToken;
+import com.facebook.CallbackManager;
+import com.facebook.FacebookCallback;
+import com.facebook.FacebookException;
+import com.facebook.FacebookSdk;
+import com.facebook.GraphRequest;
+import com.facebook.GraphResponse;
 import com.facebook.login.LoginResult;
 import com.foursquare.android.nativeoauth.FoursquareOAuth;
 import com.foursquare.android.nativeoauth.model.AccessTokenResponse;
@@ -86,22 +92,22 @@
 import com.wangjie.wavecompat.WaveDrawable;
 import com.wangjie.wavecompat.WaveTouchHelper;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
 import javax.inject.Inject;
 
-import butterknife.ButterKnife;
 import butterknife.Bind;
+import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnLongClick;
 import de.greenrobot.event.EventBus;
 import io.fabric.sdk.android.Fabric;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.functions.Func1;
diff --git a/mobile/src/main/res/layout-large/fragment_compose.xml b/mobile/src/main/res/layout-large/fragment_compose.xml
new file mode 100644
index 0000000..a4bf198
--- /dev/null
+++ b/mobile/src/main/res/layout-large/fragment_compose.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/colorPrimary">
+
+    <View
+        android:id="@+id/header_color_block"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/compose_wrapper_card"
+        android:layout_alignParentTop="true"
+        android:layout_marginBottom="60dp"
+        android:minHeight="200dp" />
+
+    <LinearLayout
+        android:id="@+id/compose_color_block"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-60dp"
+        android:layout_alignParentBottom="true"
+        android:layout_below="@+id/compose_wrapper_card"
+        android:background="@color/gray_light_super"
+        android:orientation="horizontal">
+        <!--<FrameLayout-->
+            <!--android:id="@+id/compose_map_wrapper"-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="match_parent"-->
+            <!--android:visibility="gone">-->
+            <!--<fragment-->
+                <!--android:layout_width="match_parent"-->
+                <!--android:layout_height="match_parent"-->
+                <!--android:id="@+id/map"-->
+                <!--tools:context="com.thunsaker.rapido.ui.LocationPicker"-->
+                <!--android:name="com.google.android.gms.maps.SupportMapFragment" />-->
+        <!--</FrameLayout>-->
+
+    </LinearLayout>
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/compose_wrapper_card"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/material_padding"
+        android:layout_marginLeft="@dimen/card_padding"
+        android:layout_marginStart="@dimen/card_padding"
+        android:layout_marginRight="@dimen/card_padding"
+        android:layout_marginEnd="@dimen/card_padding">
+        <LinearLayout
+            android:id="@+id/compose_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="@color/white">
+            <LinearLayout
+                android:id="@+id/compose_to_wrapper"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_margin="@dimen/material_padding"
+                android:orientation="horizontal">
+                <LinearLayout
+                    android:id="@+id/compose_to_chips_wrapper"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical|center"
+                    android:orientation="horizontal">
+                    <include
+                        android:id="@+id/compose_to_chip_twitter"
+                        layout="@layout/chip_twitter"/>
+                    <include
+                        android:id="@+id/compose_to_chip_facebook"
+                        layout="@layout/chip_facebook" />
+                    <include
+                        android:id="@+id/compose_to_chip_foursquare"
+                        layout="@layout/chip_foursquare" />
+                    <include
+                        android:id="@+id/compose_to_chip_plus"
+                        layout="@layout/chip_plus" />
+                    <include
+                        android:id="@+id/compose_to_chip_bitly"
+                        layout="@layout/chip_bitly" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <View
+                android:id="@+id/seamCompose"
+                android:layout_height="1dp"
+                android:layout_width="fill_parent"
+                android:background="@color/gray_light_super" />
+
+            <RelativeLayout
+                android:id="@+id/compose_edit_wrapper"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="150dp">
+
+                <EditText
+                    android:id="@+id/compose_edit_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minLines="6"
+                    android:maxLines="6"
+                    android:minHeight="@dimen/material_section_height_xlarge"
+                    android:maxHeight="400dp"
+                    android:gravity="top|start"
+                    android:textColor="@color/primary_text"
+                    android:textSize="@dimen/material_type_small"
+                    android:hint="@string/compose_placeholder"
+                    android:paddingTop="@dimen/material_padding"
+                    android:paddingBottom="@dimen/material_padding_double"
+                    android:layout_marginTop="@dimen/material_padding"
+                    android:layout_marginLeft="@dimen/material_keyline_1"
+                    android:layout_marginStart="@dimen/material_keyline_1"
+                    android:layout_marginRight="@dimen/material_keyline_1"
+                    android:layout_marginEnd="@dimen/material_keyline_1"
+                    android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
+                    android:imeOptions="flagNoExtractUi" />
+
+                <TextView
+                    android:id="@+id/compose_text_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="60sp"
+                    android:textColor="@color/character_count_default"
+                    android:layout_marginRight="@dimen/material_keyline_1"
+                    android:layout_marginEnd="@dimen/material_keyline_1"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    tools:ignore="RelativeOverlap" />
+
+                <ImageButton
+                    android:id="@+id/compose_add_location"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginLeft="@dimen/material_keyline_1"
+                    android:layout_marginStart="@dimen/material_keyline_1"
+                    android:layout_marginBottom="@dimen/material_padding"
+                    android:layout_marginTop="@dimen/material_padding_double"
+                    android:layout_below="@id/compose_edit_text"
+                    android:padding="@dimen/material_padding_half"
+                    android:src="@drawable/location_icon"
+                    android:tint="@color/accent"
+                    android:background="@null"
+                    android:scaleType="fitCenter"
+                    android:contentDescription="@string/location_add"
+                    android:elevation="5dp"
+                    android:visibility="visible"
+                    tools:ignore="UnusedAttribute" />
+
+                <Button
+                    android:id="@+id/compose_send_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="36dp"
+                    android:minWidth="96dp"
+                    android:layout_marginRight="@dimen/material_keyline_1_offset_plus"
+                    android:layout_marginEnd="@dimen/material_keyline_1_offset_plus"
+                    android:layout_marginLeft="@dimen/material_padding"
+                    android:layout_marginStart="@dimen/material_padding"
+                    android:layout_marginBottom="@dimen/material_padding_double"
+                    android:layout_marginTop="@dimen/material_padding_double"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_below="@id/compose_edit_text"
+                    android:elevation="5dp"
+                    android:textColor="@color/white"
+                    android:text="@string/action_send"
+                    android:textSize="14sp"
+                    android:textAllCaps="true"
+                    android:background="@drawable/background_button_rectangle"
+                    tools:ignore="UnusedAttribute" />
+
+                <RelativeLayout
+                    android:id="@+id/compose_location_wrapper"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="@dimen/location_height"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginLeft="@dimen/material_keyline_1"
+                    android:layout_marginStart="@dimen/material_keyline_1"
+                    android:layout_marginRight="@dimen/material_keyline_1"
+                    android:layout_marginEnd="@dimen/material_keyline_1"
+                    android:layout_marginBottom="@dimen/material_padding"
+                    android:layout_marginTop="@dimen/material_padding"
+                    android:layout_below="@id/compose_edit_text"
+                    android:layout_toLeftOf="@+id/compose_send_button"
+                    android:layout_toStartOf="@+id/compose_send_button"
+                    android:visibility="gone">
+
+                    <ImageButton
+                        android:id="@+id/compose_remove_location"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:src="@drawable/ic_action_close_white"
+                        android:tint="@color/accent"
+                        android:background="@drawable/ripple_red"
+                        android:scaleType="fitCenter"
+                        android:contentDescription="@string/location_add"
+                        android:elevation="5dp"
+                        tools:ignore="UnusedAttribute" />
+
+                    <TextView
+                        android:id="@+id/compose_location_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/primary_text"
+                        android:maxLines="2"
+                        android:paddingLeft="@dimen/material_padding"
+                        android:layout_toRightOf="@+id/compose_remove_location"
+                        android:ellipsize="end"
+                        android:gravity="center_vertical"
+                        tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+                </RelativeLayout>
+            </RelativeLayout>
+        </LinearLayout>
+    </android.support.v7.widget.CardView>
+
+    <!--<android.support.design.widget.FloatingActionButton-->
+        <!--android:id="@+id/compose_send_fab"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:src="@drawable/ic_action_send_white"-->
+        <!--android:layout_alignParentRight="true"-->
+        <!--android:layout_alignParentEnd="true"-->
+        <!--android:layout_below="@id/header_color_block"-->
+        <!--android:layout_marginRight="@dimen/fab_side_margin"-->
+        <!--android:layout_marginEnd="@dimen/fab_side_margin"-->
+        <!--android:layout_marginTop="-110dp"/>-->
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="@dimen/material_keyline_1"
+        android:visibility="gone">
+
+        <com.twitter.sdk.android.core.identity.TwitterLoginButton
+            android:id="@+id/twitter_login_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+        <com.facebook.login.widget.LoginButton
+            android:id="@+id/facebook_login_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:layout_gravity="center" />
+
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/activity_location_picker.xml b/mobile/src/main/res/layout/activity_location_picker.xml
index 7a6a12a..1e18ab3 100644
--- a/mobile/src/main/res/layout/activity_location_picker.xml
+++ b/mobile/src/main/res/layout/activity_location_picker.xml
@@ -6,7 +6,7 @@
     <FrameLayout
         android:id="@+id/map_wrapper"
         android:layout_width="match_parent"
-        android:layout_height="180dp"
+        android:layout_height="@dimen/location_picker_map_height"
         android:layout_alignParentTop="true">
         <fragment
             android:layout_width="match_parent"
diff --git a/mobile/src/main/res/layout/chip_add.xml b/mobile/src/main/res/layout/chip_add.xml
index 51b993f..9a0fdf9 100644
--- a/mobile/src/main/res/layout/chip_add.xml
+++ b/mobile/src/main/res/layout/chip_add.xml
@@ -3,8 +3,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/material_icon_size_micro"
     android:layout_height="@dimen/material_icon_size_micro"
-    android:layout_margin="@dimen/material_padding"
     android:padding="@dimen/material_padding_half"
+    android:layout_marginTop="@dimen/material_padding"
+    android:layout_marginLeft="@dimen/chip_padding"
+    android:layout_marginRight="@dimen/chip_padding"
+    android:layout_marginBottom="@dimen/material_padding"
     android:background="@drawable/circle_add"
     android:src="@drawable/ic_action_add"
     android:tint="@color/white"
diff --git a/mobile/src/main/res/layout/chip_bitly.xml b/mobile/src/main/res/layout/chip_bitly.xml
index 9b3d07b..ec3976f 100644
--- a/mobile/src/main/res/layout/chip_bitly.xml
+++ b/mobile/src/main/res/layout/chip_bitly.xml
@@ -3,8 +3,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/material_icon_size_micro"
     android:layout_height="@dimen/material_icon_size_micro"
-    android:layout_margin="@dimen/material_padding"
     android:padding="@dimen/material_padding_half"
+    android:layout_marginTop="@dimen/material_padding"
+    android:layout_marginLeft="@dimen/chip_padding"
+    android:layout_marginRight="@dimen/chip_padding"
+    android:layout_marginBottom="@dimen/material_padding"
     android:clickable="true"
     android:background="@drawable/circle_bitly"
     android:src="@drawable/selector_bitly_icon"
diff --git a/mobile/src/main/res/layout/chip_facebook.xml b/mobile/src/main/res/layout/chip_facebook.xml
index 1d3297a..67ec48e 100644
--- a/mobile/src/main/res/layout/chip_facebook.xml
+++ b/mobile/src/main/res/layout/chip_facebook.xml
@@ -3,8 +3,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/material_icon_size_micro"
     android:layout_height="@dimen/material_icon_size_micro"
-    android:layout_margin="@dimen/material_padding"
     android:padding="@dimen/material_padding"
+    android:layout_marginTop="@dimen/material_padding"
+    android:layout_marginLeft="@dimen/chip_padding"
+    android:layout_marginRight="@dimen/chip_padding"
+    android:layout_marginBottom="@dimen/material_padding"
     android:clickable="true"
     android:background="@drawable/circle_facebook"
     android:src="@drawable/selector_facebook_icon"
diff --git a/mobile/src/main/res/layout/chip_foursquare.xml b/mobile/src/main/res/layout/chip_foursquare.xml
index 8a4aed2..ab6d137 100644
--- a/mobile/src/main/res/layout/chip_foursquare.xml
+++ b/mobile/src/main/res/layout/chip_foursquare.xml
@@ -3,8 +3,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/material_icon_size_micro"
     android:layout_height="@dimen/material_icon_size_micro"
-    android:layout_margin="@dimen/material_padding"
     android:padding="@dimen/material_padding"
+    android:layout_marginTop="@dimen/material_padding"
+    android:layout_marginLeft="@dimen/chip_padding"
+    android:layout_marginRight="@dimen/chip_padding"
+    android:layout_marginBottom="@dimen/material_padding"
     android:clickable="true"
     android:background="@drawable/circle_foursquare"
     android:src="@drawable/selector_foursquare_icon"
diff --git a/mobile/src/main/res/layout/chip_plus.xml b/mobile/src/main/res/layout/chip_plus.xml
index 4659eb0..ed4273c 100644
--- a/mobile/src/main/res/layout/chip_plus.xml
+++ b/mobile/src/main/res/layout/chip_plus.xml
@@ -3,8 +3,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/material_icon_size_micro"
     android:layout_height="@dimen/material_icon_size_micro"
-    android:layout_margin="@dimen/material_padding"
     android:padding="5dp"
+    android:layout_marginTop="@dimen/material_padding"
+    android:layout_marginLeft="@dimen/chip_padding"
+    android:layout_marginRight="@dimen/chip_padding"
+    android:layout_marginBottom="@dimen/material_padding"
     android:clickable="true"
     android:background="@drawable/circle_plus"
     android:src="@drawable/selector_plus_icon"
diff --git a/mobile/src/main/res/layout/chip_twitter.xml b/mobile/src/main/res/layout/chip_twitter.xml
index d64f62c..46e8f01 100644
--- a/mobile/src/main/res/layout/chip_twitter.xml
+++ b/mobile/src/main/res/layout/chip_twitter.xml
@@ -3,8 +3,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/material_icon_size_micro"
     android:layout_height="@dimen/material_icon_size_micro"
-    android:layout_margin="@dimen/material_padding"
     android:padding="@dimen/material_padding"
+    android:layout_marginTop="@dimen/material_padding"
+    android:layout_marginLeft="@dimen/chip_padding"
+    android:layout_marginRight="@dimen/chip_padding"
+    android:layout_marginBottom="@dimen/material_padding"
     android:clickable="true"
     android:background="@drawable/circle_twitter"
     android:src="@drawable/selector_twitter_icon"
diff --git a/mobile/src/main/res/layout/fragment_compose.xml b/mobile/src/main/res/layout/fragment_compose.xml
index 380d5ef..bb19a47 100644
--- a/mobile/src/main/res/layout/fragment_compose.xml
+++ b/mobile/src/main/res/layout/fragment_compose.xml
@@ -216,5 +216,11 @@
                 android:layout_gravity="center" />
 
         </LinearLayout>
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/compose_send_fab"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:visibility="gone"
+            android:src="@drawable/ic_action_send_white" />
     </RelativeLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/mobile/src/main/res/layout/fragment_compose_card.xml b/mobile/src/main/res/layout/fragment_compose_card.xml
deleted file mode 100644
index 2dcb301..0000000
--- a/mobile/src/main/res/layout/fragment_compose_card.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorPrimary">
-
-    <android.support.v7.widget.RecyclerView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/material_padding_triple"
-        android:layout_marginEnd="@dimen/material_padding_triple" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/src/main/res/values-large/styles.xml b/mobile/src/main/res/values-large/styles.xml
new file mode 100644
index 0000000..5063c18
--- /dev/null
+++ b/mobile/src/main/res/values-large/styles.xml
@@ -0,0 +1,9 @@
+<resources>
+    <style name="Theme.Rapido.Base" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary_dark</item>
+        <item name="colorAccent">@color/accent</item>
+
+        <item name="android:textColor">@color/primary_text</item>
+    </style>
+</resources>
diff --git a/mobile/src/main/res/values-w600dp/dimens.xml b/mobile/src/main/res/values-w600dp/dimens.xml
new file mode 100644
index 0000000..b6ba9db
--- /dev/null
+++ b/mobile/src/main/res/values-w600dp/dimens.xml
@@ -0,0 +1,10 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+    <dimen name="chip_padding">@dimen/material_padding_double</dimen>
+    <dimen name="card_padding">90dp</dimen>
+    <dimen name="location_picker_map_height">360dp</dimen>
+    <dimen name="card_padding_top">50dp</dimen>
+</resources>
diff --git a/mobile/src/main/res/values-w820dp/dimens.xml b/mobile/src/main/res/values-w820dp/dimens.xml
index 63fc816..f535103 100644
--- a/mobile/src/main/res/values-w820dp/dimens.xml
+++ b/mobile/src/main/res/values-w820dp/dimens.xml
@@ -3,4 +3,5 @@
          (such as screen margins) for screens with more than 820dp of available width. This
          would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
     <dimen name="activity_horizontal_margin">64dp</dimen>
+    <dimen name="fab_side_margin">@dimen/material_keyline_2</dimen>
 </resources>
diff --git a/mobile/src/main/res/values/dimens.xml b/mobile/src/main/res/values/dimens.xml
index 13aac58..47e79c7 100644
--- a/mobile/src/main/res/values/dimens.xml
+++ b/mobile/src/main/res/values/dimens.xml
@@ -22,7 +22,7 @@
     <dimen name="fab_size_shadow">65dp</dimen>
     <dimen name="fab_size_mini">56dp</dimen>
     <dimen name="fab_icon_padding">10dp</dimen>
-    <dimen name="fab_side_margin">16dp</dimen>
+    <dimen name="fab_side_margin">@dimen/material_keyline_1</dimen>
 
     <dimen name="material_keyline_1">16dp</dimen>
     <dimen name="material_keyline_1_offset_negative">12dp</dimen>
@@ -43,5 +43,10 @@
     <dimen name="account_drawer_width">300dp</dimen>
     <dimen name="navigation_list_item_height">48dp</dimen>
     <dimen name="material_type_nav_drawer">14sp</dimen>
+    <dimen name="chip_padding">@dimen/material_padding</dimen>
+    <dimen name="card_padding">0dp</dimen>
+    <dimen name="location_height">50dp</dimen>
+    <dimen name="location_picker_map_height">180dp</dimen>
+    <dimen name="card_padding_top">0dp</dimen>
 
 </resources>
diff --git a/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml
index 1576b00..f3b5349 100644
--- a/mobile/src/main/res/values/styles.xml
+++ b/mobile/src/main/res/values/styles.xml
@@ -8,8 +8,6 @@
         <item name="colorAccent">@color/accent</item>
 
         <item name="android:textColor">@color/primary_text</item>
-
-        <!--<item name="android:textSize">@dimen/material_type_small</item>-->
     </style>
 
     <style name="Theme.Rapido.White" parent="Theme.Rapido">
@@ -20,8 +18,9 @@
     </style>
 
     <style name="Theme.Rapido.Orange" parent="Theme.Rapido">
+        <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/primary</item>
+        <item name="colorAccent">@color/accent</item>
     </style>
 
     <style name="Theme.Rapido.Plus" parent="Theme.Rapido">