diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3a95f41a..ef8dbf97c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,16 @@
 ###Changelog
 
-###Version next
+###Version 0.18.4
+* Mi Band 2: Display realtime steps in Live Activity
+* Mi Band: Attempt to recognize Mi Band model with hwVersion = 8
 * Alarms activity improvements and fixes
+* Make Buttons in the main activity easier to hit
 
 ###Version 0.18.3
 * Fix bug that caused the same value in weekly charts for every day on Android 6 and older
 
 ###Version 0.18.2
-* Mi2: Fix crash on "chat" or "social network" text notification (#603)
+* Mi Band 2: Fix crash on "chat" or "social network" text notification (#603)
 
 ###Version 0.18.1
 * Pebble: Fix Firmware insstallation on Pebble Time Round (broken since 0.16.0)
@@ -24,10 +27,10 @@
 * Huge speedup for weekly charts when changing days
 * Drop support for importing pre Gadgetbridge 0.12.0 database
 * Pebble: allow configuration web pages (clay) to access device location
-* Mi2: Initial support for text notifications, caller ID, and icons (requires font installation) (#560)
-* Mi2: Support for flashing Mili_pro.ft* font files
-* Mi2: Improved firmware/font updated
-* Mi2: Set 12h/24h time format, following the Android configuration (#573)
+* Mi Band 2: Initial support for text notifications, caller ID, and icons (requires font installation) (#560)
+* Mi Band 2: Support for flashing Mili_pro.ft* font files
+* Mi Band 2: Improved firmware/font updated
+* Mi Band 2: Set 12h/24h time format, following the Android configuration (#573)
 * Improved BLE discovery and connectivity
 
 ####Version 0.17.5
diff --git a/app/build.gradle b/app/build.gradle
index d6ea9c869..c53951140 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         targetSdkVersion 25
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.18.3"
-        versionCode 90
+        versionName "0.18.4"
+        versionCode 91
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
diff --git a/app/src/main/res/layout/device_itemv2.xml b/app/src/main/res/layout/device_itemv2.xml
index a8979189d..f5c8fe30f 100644
--- a/app/src/main/res/layout/device_itemv2.xml
+++ b/app/src/main/res/layout/device_itemv2.xml
@@ -111,17 +111,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/device_image"
-                android:layout_marginBottom="8dp"
-                android:layout_marginStart="8dp"
+                android:layout_marginBottom="4dp"
+                android:layout_marginStart="4dp"
                 android:layout_marginEnd="0dp"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="4dp"
+                android:padding="4dp"
                 android:minWidth="48dp"
                 android:orientation="vertical">
 
                 <ImageView
                     android:id="@+id/device_battery_status"
                     android:layout_width="48dp"
-                    android:layout_height="36dp"
+                    android:layout_height="40dp"
                     android:tint="@color/secondarytext"
                     card_view:srcCompat="@drawable/level_list_battery" />
 
@@ -142,7 +143,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
+                android:layout_margin="4dp"
+                android:padding="4dp"
                 android:layout_toEndOf="@id/device_battery_status_box"
                 android:gravity="center_vertical"
                 android:minWidth="36dp"
@@ -150,8 +152,8 @@
 
                 <ImageView
                     android:id="@+id/device_action_fetch_activity"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
                     android:clickable="true"
                     android:contentDescription="@string/controlcenter_fetch_activity_data"
                     android:tint="@color/secondarytext"
@@ -171,10 +173,11 @@
 
             <ImageView
                 android:id="@+id/device_action_take_screenshot"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
+                android:layout_margin="4dp"
+                android:padding="4dp"
                 android:layout_toEndOf="@id/device_action_fetch_activity_box"
                 android:clickable="true"
                 android:contentDescription="@string/controlcenter_take_screenshot"
@@ -184,10 +187,11 @@
 
             <ImageView
                 android:id="@+id/device_action_manage_apps"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
+                android:layout_margin="4dp"
+                android:padding="4dp"
                 android:layout_toEndOf="@id/device_action_take_screenshot"
                 android:clickable="true"
                 android:contentDescription="@string/title_activity_appmanager"
@@ -197,10 +201,11 @@
 
             <ImageView
                 android:id="@+id/device_action_set_alarms"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
+                android:layout_margin="4dp"
+                android:padding="4dp"
                 android:layout_toEndOf="@id/device_action_manage_apps"
                 android:clickable="true"
                 android:contentDescription="@string/controlcenter_start_configure_alarms"
@@ -210,10 +215,11 @@
 
             <ImageView
                 android:id="@+id/device_action_show_activity_graphs"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
+                android:layout_margin="4dp"
+                android:padding="4dp"
                 android:layout_toEndOf="@id/device_action_set_alarms"
                 android:clickable="true"
                 android:tint="@color/secondarytext"
@@ -223,10 +229,11 @@
 
             <ImageView
                 android:id="@+id/device_action_find"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
+                android:layout_margin="4dp"
+                android:padding="4dp"
                 android:layout_toEndOf="@id/device_action_show_activity_graphs"
                 android:clickable="true"
                 android:contentDescription="@string/controlcenter_find_device"
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 22c00ad66..218c76fa5 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
-    <release version="next">
+    <release version="0.18.4" versioncode="91">
+        <change>Mi Band 2: Display realtime steps in Live Activity</change>
+        <change>Mi Band: Attempt to recognize Mi Band model with hwVersion = 8</change>
+        <change>Make Buttons in the main activity easier to hit</change>
         <change>Alarms activity improvements and fixes</change>
     </release>
     <release version="0.18.3" versioncode="90">