diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java
index 17e704582..546baa0cd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityListingChartFragment.java
@@ -29,6 +29,7 @@ import android.widget.TextView;
 
 import com.github.mikephil.charting.animation.Easing;
 import com.github.mikephil.charting.charts.Chart;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,6 +64,11 @@ public class ActivityListingChartFragment extends AbstractChartFragment {
         stepListAdapter = new ActivityListingAdapter(getContext());
         stepsList.setAdapter(stepListAdapter);
         stepsDateView = rootView.findViewById(R.id.stepsDateView);
+        FloatingActionButton fab;
+        fab = rootView.findViewById(R.id.fab);
+        fab.setVisibility(View.VISIBLE);
+
+
         refresh();
         return rootView;
     }
diff --git a/app/src/main/res/layout-land/fragment_sleepchart.xml b/app/src/main/res/layout-land/fragment_sleepchart.xml
index 320e160d1..ef304bd63 100644
--- a/app/src/main/res/layout-land/fragment_sleepchart.xml
+++ b/app/src/main/res/layout-land/fragment_sleepchart.xml
@@ -45,7 +45,7 @@
 
     </LinearLayout>
     <include
-        layout="@layout/heartrate_average_widget"
+        layout="@layout/layout_widget_heartrate_average"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_alignParentTop="true"
@@ -55,7 +55,7 @@
         android:layout_marginStart="170dp" />
 
     <include
-        layout="@layout/intensity_total_widget"
+        layout="@layout/layout_widget_intensity_total"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_alignParentTop="true"
diff --git a/app/src/main/res/layout/activity_list_dashboard_item.xml b/app/src/main/res/layout/activity_list_dashboard_item.xml
index 0be889885..af89eebbc 100644
--- a/app/src/main/res/layout/activity_list_dashboard_item.xml
+++ b/app/src/main/res/layout/activity_list_dashboard_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list_item_parent_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -67,14 +66,14 @@
                 android:layout_weight="0.5" />
 
             <include
-                layout="@layout/heartrate_average_widget"
+                layout="@layout/layout_widget_heartrate_average"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:layout_gravity="bottom|center"
                 android:layout_weight="1" />
 
             <include
-                layout="@layout/intensity_total_widget"
+                layout="@layout/layout_widget_intensity_total"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:layout_gravity="bottom|center"
@@ -98,146 +97,11 @@
             android:gravity="bottom|center"
             android:orientation="horizontal">
 
-            <LinearLayout
-                android:id="@+id/line_layout_step"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center|top"
-                android:layout_marginStart="1dp"
-                android:layout_marginEnd="1dp"
-                android:layout_weight="1"
-                android:gravity="center|top"
-                android:orientation="vertical">
+            <include layout="@layout/layout_widget_active_steps" />
 
-                <ImageView
-                    android:id="@+id/line_layout_step_icon"
-                    android:layout_width="19dp"
-                    android:layout_height="19dp"
-                    android:layout_gravity="center"
-                    android:contentDescription="@string/candidate_item_device_image"
-                    app:srcCompat="@drawable/ic_shoe_print" />
-
-                <TextView
-                    android:id="@+id/line_layout_step_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:maxLines="2"
-                    android:scrollHorizontally="false"
-                    android:text="@string/activity_list_summary_active_steps"
-                    android:textAllCaps="true"
-                    android:textColor="@color/accent"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/line_layout_step_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:fontFamily="sans-serif-black"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:scrollHorizontally="false"
-                    android:text="15000"
-                    android:textSize="24sp" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/line_layout_distance"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center|top"
-                android:layout_marginStart="1dp"
-                android:layout_marginEnd="1dp"
-                android:layout_weight="1"
-                android:gravity="center|top"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/line_layout_distance_icon"
-                    android:layout_width="19dp"
-                    android:layout_height="19dp"
-                    android:layout_gravity="center"
-                    android:contentDescription="@string/candidate_item_device_image"
-                    app:srcCompat="@drawable/ic_distance" />
-
-                <TextView
-                    android:id="@+id/line_layout_distance_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:maxLines="2"
-                    android:scrollHorizontally="false"
-                    android:text="@string/distance"
-                    android:textAllCaps="true"
-                    android:textColor="@color/accent"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/line_layout_distance_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:fontFamily="sans-serif-black"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:scrollHorizontally="false"
-                    android:text="15.1km"
-                    android:textSize="24sp" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/line_layout_duration"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center|top"
-                android:layout_marginStart="1dp"
-                android:layout_marginEnd="1dp"
-                android:layout_weight="1"
-                android:gravity="center|top"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/line_layout_duration_icon"
-                    android:layout_width="19dp"
-                    android:layout_height="19dp"
-                    android:layout_gravity="center"
-                    android:contentDescription="@string/candidate_item_device_image"
-                    app:srcCompat="@drawable/ic_access_time" />
-
-                <TextView
-                    android:id="@+id/line_layout_duration_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:maxLines="2"
-                    android:scrollHorizontally="false"
-                    android:text="@string/activity_list_summary_active_time"
-                    android:textAllCaps="true"
-                    android:textColor="@color/accent"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/line_layout_duration_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:fontFamily="sans-serif-black"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:scrollHorizontally="false"
-                    android:text="122"
-                    android:textSize="24sp" />
-
-            </LinearLayout>
+            <include layout="@layout/layout_widget_distance" />
 
+            <include layout="@layout/layout_widget_duration" />
 
         </LinearLayout>
 
@@ -250,145 +114,11 @@
             android:gravity="center"
             android:orientation="horizontal">
 
-            <LinearLayout
-                android:id="@+id/line_layout_total_step"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center|top"
-                android:layout_marginStart="1dp"
-                android:layout_marginEnd="1dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
+            <include layout="@layout/layout_widget_total_steps" />
 
-                <ImageView
-                    android:id="@+id/line_layout_total_step_icon"
-                    android:layout_width="19dp"
-                    android:layout_height="19dp"
-                    android:layout_gravity="center"
-                    android:contentDescription="@string/candidate_item_device_image"
-                    app:srcCompat="@drawable/ic_shoe_prints_many" />
-
-                <TextView
-                    android:id="@+id/line_layout_total_step_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:maxLines="2"
-                    android:scrollHorizontally="false"
-                    android:text="@string/live_activity_total_steps"
-                    android:textAllCaps="true"
-                    android:textColor="@color/accent"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/line_layout_total_step_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:fontFamily="sans-serif-black"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:scrollHorizontally="false"
-                    android:text="15000"
-                    android:textSize="24sp" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:id="@+id/line_layout_count"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center|top"
-                android:layout_marginStart="1dp"
-                android:layout_marginEnd="1dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/line_layout_count_icon"
-                    android:layout_width="19dp"
-                    android:layout_height="19dp"
-                    android:layout_gravity="center"
-                    android:contentDescription="@string/candidate_item_device_image"
-                    app:srcCompat="@drawable/ic_activity_stacked" />
-
-                <TextView
-                    android:id="@+id/line_layout_count_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:maxLines="2"
-                    android:scrollHorizontally="false"
-                    android:text="@string/activity_list_summary_activities"
-                    android:textAllCaps="true"
-                    android:textColor="@color/accent"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/line_layout_count_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:fontFamily="sans-serif-black"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:scrollHorizontally="false"
-                    android:text="15"
-                    android:textSize="24sp" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/line_layout_intensity2"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center|top"
-                android:layout_marginStart="1dp"
-                android:layout_marginEnd="1dp"
-                android:layout_weight="1"
-                android:gravity="bottom|center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/line_layout_intensity2_icon"
-                    android:layout_width="19dp"
-                    android:layout_height="19dp"
-                    android:layout_gravity="center"
-                    android:contentDescription="@string/candidate_item_device_image"
-                    app:srcCompat="@drawable/ic_intensity" />
-
-                <TextView
-                    android:id="@+id/line_layout_intensity2_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:maxLines="2"
-                    android:scrollHorizontally="false"
-                    android:text="@string/activity_list_summary_intensity"
-                    android:textAllCaps="true"
-                    android:textColor="@color/accent"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/line_layout_intensity2_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:fontFamily="sans-serif-black"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:scrollHorizontally="false"
-                    android:text="15"
-                    android:textSize="24sp" />
-
-            </LinearLayout>
+            <include layout="@layout/layout_widget_activities_count" />
 
+            <include layout="@layout/layout_widget_intensity_total2" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_sleepchart.xml b/app/src/main/res/layout/fragment_sleepchart.xml
index 35823936e..6c08572fd 100644
--- a/app/src/main/res/layout/fragment_sleepchart.xml
+++ b/app/src/main/res/layout/fragment_sleepchart.xml
@@ -31,7 +31,7 @@
     </LinearLayout>
 
     <include
-        layout="@layout/heartrate_average_widget"
+        layout="@layout/layout_widget_heartrate_average"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_alignParentTop="true"
@@ -39,7 +39,7 @@
         android:layout_gravity="top|end" />
 
     <include
-        layout="@layout/intensity_total_widget"
+        layout="@layout/layout_widget_intensity_total"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_alignParentTop="true"
diff --git a/app/src/main/res/layout/fragment_steps_list.xml b/app/src/main/res/layout/fragment_steps_list.xml
index 7bc9252b3..10a798c2b 100644
--- a/app/src/main/res/layout/fragment_steps_list.xml
+++ b/app/src/main/res/layout/fragment_steps_list.xml
@@ -1,9 +1,11 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.charts.ChartsActivity$PlaceholderFragment">
+
     <TextView
         android:id="@+id/stepsDateView"
         android:layout_width="match_parent"
@@ -14,11 +16,30 @@
         android:textStyle="bold" />
 
 
-
     <ListView
         android:id="@+id/itemListView"
-        android:layout_marginTop="0dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_below="@id/stepsDateView"
+        android:layout_alignParentBottom="false"
+        android:layout_marginTop="0dp">
 
-</LinearLayout>
+
+    </ListView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_gravity="bottom|end"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
+        app:srcCompat="@drawable/ic_show_chart" />
+
+
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/layout_widget_active_steps.xml b/app/src/main/res/layout/layout_widget_active_steps.xml
new file mode 100644
index 000000000..06a6612b3
--- /dev/null
+++ b/app/src/main/res/layout/layout_widget_active_steps.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:id="@+id/line_layout_step"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:layout_marginStart="1dp"
+    android:layout_marginEnd="1dp"
+    android:layout_weight="1"
+    android:gravity="center|top"
+    android:orientation="vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <ImageView
+        android:id="@+id/line_layout_step_icon"
+        android:layout_width="19dp"
+        android:layout_height="19dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/candidate_item_device_image"
+        app:srcCompat="@drawable/ic_shoe_print" />
+
+    <TextView
+        android:id="@+id/line_layout_step_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:maxLines="2"
+        android:scrollHorizontally="false"
+        android:text="@string/activity_list_summary_active_steps"
+        android:textAllCaps="true"
+        android:textColor="@color/accent"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/line_layout_step_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:fontFamily="sans-serif-black"
+        android:gravity="center"
+        android:maxLines="1"
+        android:scrollHorizontally="false"
+        android:text="15000"
+        android:textSize="24sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_widget_activities_count.xml b/app/src/main/res/layout/layout_widget_activities_count.xml
new file mode 100644
index 000000000..2a63cbb96
--- /dev/null
+++ b/app/src/main/res/layout/layout_widget_activities_count.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/line_layout_count"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:layout_marginStart="1dp"
+    android:layout_marginEnd="1dp"
+    android:layout_weight="1"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/line_layout_count_icon"
+        app:srcCompat="@drawable/ic_activity_stacked"
+        android:layout_width="19dp"
+        android:layout_height="19dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/candidate_item_device_image" />
+
+    <TextView
+        android:id="@+id/line_layout_count_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:maxLines="2"
+        android:scrollHorizontally="false"
+        android:text="@string/activity_list_summary_activities"
+        android:textAllCaps="true"
+        android:textColor="@color/accent"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/line_layout_count_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:fontFamily="sans-serif-black"
+        android:gravity="center"
+        android:maxLines="1"
+        android:scrollHorizontally="false"
+        android:text="15"
+        android:textSize="24sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_widget_distance.xml b/app/src/main/res/layout/layout_widget_distance.xml
new file mode 100644
index 000000000..b29094a59
--- /dev/null
+++ b/app/src/main/res/layout/layout_widget_distance.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/line_layout_distance"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:layout_marginStart="1dp"
+    android:layout_marginEnd="1dp"
+    android:layout_weight="1"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/line_layout_distance_icon"
+        android:layout_width="19dp"
+        android:layout_height="19dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/candidate_item_device_image"
+        app:srcCompat="@drawable/ic_distance" />
+
+    <TextView
+        android:id="@+id/line_layout_distance_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:maxLines="2"
+        android:scrollHorizontally="false"
+        android:text="@string/distance"
+        android:textAllCaps="true"
+        android:textColor="@color/accent"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/line_layout_distance_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:fontFamily="sans-serif-black"
+        android:gravity="center"
+        android:maxLines="1"
+        android:scrollHorizontally="false"
+        android:text="15.1km"
+        android:textSize="24sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_widget_duration.xml b/app/src/main/res/layout/layout_widget_duration.xml
new file mode 100644
index 000000000..8149b6c98
--- /dev/null
+++ b/app/src/main/res/layout/layout_widget_duration.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/line_layout_duration"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:layout_marginStart="1dp"
+    android:layout_marginEnd="1dp"
+    android:layout_weight="1"
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/line_layout_duration_icon"
+        android:layout_width="19dp"
+        android:layout_height="19dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/candidate_item_device_image"
+        app:srcCompat="@drawable/ic_access_time" />
+
+    <TextView
+        android:id="@+id/line_layout_duration_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:maxLines="2"
+        android:scrollHorizontally="false"
+        android:text="@string/activity_list_summary_active_time"
+        android:textAllCaps="true"
+        android:textColor="@color/accent"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/line_layout_duration_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:fontFamily="sans-serif-black"
+        android:gravity="center"
+        android:maxLines="1"
+        android:scrollHorizontally="false"
+        android:text="122"
+        android:textSize="24sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/heartrate_average_widget.xml b/app/src/main/res/layout/layout_widget_heartrate_average.xml
similarity index 100%
rename from app/src/main/res/layout/heartrate_average_widget.xml
rename to app/src/main/res/layout/layout_widget_heartrate_average.xml
diff --git a/app/src/main/res/layout/intensity_total_widget.xml b/app/src/main/res/layout/layout_widget_intensity_total.xml
similarity index 100%
rename from app/src/main/res/layout/intensity_total_widget.xml
rename to app/src/main/res/layout/layout_widget_intensity_total.xml
diff --git a/app/src/main/res/layout/layout_widget_intensity_total2.xml b/app/src/main/res/layout/layout_widget_intensity_total2.xml
new file mode 100644
index 000000000..6857f15e2
--- /dev/null
+++ b/app/src/main/res/layout/layout_widget_intensity_total2.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/line_layout_intensity2"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:layout_marginStart="1dp"
+    android:layout_marginEnd="1dp"
+    android:layout_weight="1"
+    android:gravity="bottom|center"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/line_layout_intensity2_icon"
+        app:srcCompat="@drawable/ic_intensity"
+        android:layout_width="19dp"
+        android:layout_height="19dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/candidate_item_device_image" />
+
+    <TextView
+        android:id="@+id/line_layout_intensity2_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:maxLines="2"
+        android:scrollHorizontally="false"
+        android:text="@string/activity_list_summary_intensity"
+        android:textAllCaps="true"
+        android:textColor="@color/accent"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/line_layout_intensity2_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:fontFamily="sans-serif-black"
+        android:gravity="center"
+        android:maxLines="1"
+        android:scrollHorizontally="false"
+        android:text="15"
+        android:textSize="24sp" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_widget_total_steps.xml b/app/src/main/res/layout/layout_widget_total_steps.xml
new file mode 100644
index 000000000..391804c25
--- /dev/null
+++ b/app/src/main/res/layout/layout_widget_total_steps.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/line_layout_total_step"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center|top"
+    android:layout_marginStart="1dp"
+    android:layout_marginEnd="1dp"
+    android:layout_weight="1"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/line_layout_total_step_icon"
+        app:srcCompat="@drawable/ic_shoe_prints_many"
+        android:layout_width="19dp"
+        android:layout_height="19dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/candidate_item_device_image" />
+
+    <TextView
+        android:id="@+id/line_layout_total_step_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:maxLines="2"
+        android:scrollHorizontally="false"
+        android:text="@string/live_activity_total_steps"
+        android:textAllCaps="true"
+        android:textColor="@color/accent"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/line_layout_total_step_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:fontFamily="sans-serif-black"
+        android:gravity="center"
+        android:maxLines="1"
+        android:scrollHorizontally="false"
+        android:text="15000"
+        android:textSize="24sp" />
+
+</LinearLayout>
\ No newline at end of file