diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index a42f681..24f4b97 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
+    <runningDeviceTargetSelectedWithDropDown>
       <Target>
-        <type value="QUICK_BOOT_TARGET" />
+        <type value="RUNNING_DEVICE_TARGET" />
         <deviceKey>
           <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_XL_API_30.avd" />
+            <type value="SERIAL_NUMBER" />
+            <value value="830cb6b6" />
           </Key>
         </deviceKey>
       </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-09-14T16:48:49.750165Z" />
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2021-09-15T13:58:51.175333Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 80d7605..1000c36 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="../../../../layout/custom_preview.xml" value="0.5661458333333333" />
+        <entry key="app/src/main/res/drawable/floating_semitransparent_button_background.xml" value="0.512962962962963" />
         <entry key="app/src/main/res/drawable/ic_map_pin.xml" value="0.6425925925925926" />
         <entry key="app/src/main/res/layout/activity_geofavorite_detail.xml" value="0.4" />
         <entry key="app/src/main/res/layout/activity_list_view.xml" value="0.5307291666666667" />
diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
index b4921e2..2d27f32 100644
--- a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
+++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java
@@ -280,6 +280,7 @@ public class GeofavoriteDetailActivity extends AppCompatActivity implements Loca
         }
 
         public void updateView(Geofavorite item) {
+            binding.collapsingToolbar.setTitle(item.getName() != null ? item.getName() : getString(R.string.new_geobookmark));
             binding.nameEt.setText(item.getName());
             binding.descriptionEt.setText(item.getComment());
             binding.createdTv.setText(new Date(item.getDateCreated() * 1000).toString());
diff --git a/app/src/main/res/drawable/floating_semitransparent_button_background.xml b/app/src/main/res/drawable/floating_semitransparent_button_background.xml
new file mode 100644
index 0000000..27da624
--- /dev/null
+++ b/app/src/main/res/drawable/floating_semitransparent_button_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="8dp"
+        android:right="8dp"
+        android:top="8dp"
+        android:bottom="8dp">
+        <shape
+            android:shape="oval">
+            <solid android:color="@color/defaultBrandAlpha"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_geofavorite_detail.xml b/app/src/main/res/layout/activity_geofavorite_detail.xml
index bfb8b4c..7d5d19e 100644
--- a/app/src/main/res/layout/activity_geofavorite_detail.xml
+++ b/app/src/main/res/layout/activity_geofavorite_detail.xml
@@ -2,23 +2,32 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <FrameLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/root">
 
-        <ScrollView
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="250dp"
+            android:fitsSystemWindows="true">
 
-            <LinearLayout
-                android:orientation="vertical"
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="match_parent"
+                android:fitsSystemWindows="true"
+                app:contentScrim="@color/defaultBrand"
+                app:layout_scrollFlags="scroll|snap|exitUntilCollapsed"
+                app:title="@string/new_geobookmark"
+                app:expandedTitleTextAppearance="@style/TextAppearance.GeofavoriteDetail.Header.Expanded"
+                app:collapsedTitleTextAppearance="@style/TextAppearance.GeofavoriteDetail.Header.Collapsed">
 
                 <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="200dp">
+                    android:layout_height="match_parent"
+                    app:layout_collapseMode="parallax">
                     <org.osmdroid.views.MapView
                         android:id="@+id/map"
                         android:layout_width="match_parent"
@@ -31,121 +40,144 @@
                         android:layout_height="match_parent"/>
                 </FrameLayout>
 
-                <LinearLayout
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:padding="20dp">
+                    android:layout_height="?attr/actionBarSize"
+                    app:contentInsetStart="0dp"
+                    app:layout_collapseMode="pin"
+                    android:background="@android:color/transparent">
 
-                    <EditText
-                        android:id="@+id/name_et"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:ems="10"
-                        android:hint="@string/name"
-                        android:lines="1"
-                        android:maxLines="1"
-                        android:singleLine="true"
-                        android:ellipsize="end"/>
+                    <!-- Back button -->
+                    <ImageView
+                        android:id="@+id/back_bt"
+                        android:layout_width="?attr/actionBarSize"
+                        android:layout_height="?attr/actionBarSize"
+                        android:padding="16dp"
+                        android:src="@drawable/ic_back_grey"
+                        app:tint="@color/white"
+                        android:background="@drawable/floating_semitransparent_button_background"/>
 
-                    <EditText
-                        android:id="@+id/description_et"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:ems="10"
-                        android:gravity="start|top"
-                        android:inputType="textMultiLine"
-                        android:lines="5"
-                        android:maxLines="10"
-                        android:hint="@string/description"
-                        android:ellipsize="end" />
+                </androidx.appcompat.widget.Toolbar>
+                    
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:textStyle="bold"
-                        android:text="@string/created" />
 
-                    <TextView
-                        android:id="@+id/created_tv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAlignment="textEnd" />
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:textStyle="bold"
-                        android:text="@string/modified" />
+        </com.google.android.material.appbar.AppBarLayout>
 
-                    <TextView
-                        android:id="@+id/modified_tv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAlignment="textEnd" />
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:textStyle="bold"
-                        android:text="@string/category" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:padding="20dp">
 
-                    <TextView
-                        android:id="@+id/category_tv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAlignment="textEnd" />
+                <TextView
+                    android:id="@+id/accuracy_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:textAlignment="center"
+                    android:text="@string/accuracy"
+                    android:textColor="@android:color/white"
+                    android:background="@android:color/darker_gray"/>
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:text="@string/coords"
-                        android:textStyle="bold" />
+                <EditText
+                    android:id="@+id/name_et"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="40dp"
+                    android:ems="10"
+                    android:hint="@string/name"
+                    android:lines="1"
+                    android:maxLines="1"
+                    android:singleLine="true"
+                    android:textColor="@color/defaultBrand"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Title"
+                    android:background="@android:color/transparent"/>
 
-                    <TextView
-                        android:id="@+id/coords_tv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAlignment="textEnd" />
+                <EditText
+                    android:id="@+id/description_et"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:ems="10"
+                    android:gravity="start|top"
+                    android:inputType="textMultiLine"
+                    android:maxLines="10"
+                    android:background="@android:color/transparent"
+                    android:hint="@string/description"/>
 
-                    <TextView
-                        android:id="@+id/accuracy_tv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:textAlignment="center"
-                        android:text="@string/accuracy"
-                        android:textColor="@android:color/white"
-                        android:background="@android:color/darker_gray"/>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="40dp"
+                    android:textStyle="bold"
+                    android:text="@string/created" />
 
-                    <Button
-                        android:id="@+id/submit_bt"
-                        style="@style/Widget.AppCompat.Button.Colored"
-                        android:layout_width="match_parent"
-                        android:layout_height="60dp"
-                        android:layout_margin="50dp"
-                        android:text="@string/confirm"
-                        app:backgroundTint="@color/defaultBrand"
-                        android:onClick="onSubmit"/>
+                <TextView
+                    android:id="@+id/created_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAlignment="textEnd" />
 
-                </LinearLayout>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:textStyle="bold"
+                    android:text="@string/modified" />
+
+                <TextView
+                    android:id="@+id/modified_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAlignment="textEnd" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:textStyle="bold"
+                    android:text="@string/category" />
+
+                <TextView
+                    android:id="@+id/category_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAlignment="textEnd" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    android:text="@string/coords"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/coords_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAlignment="textEnd" />
+
+                <Button
+                    android:id="@+id/submit_bt"
+                    style="@style/Widget.AppCompat.Button.Colored"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_margin="50dp"
+                    android:text="@string/confirm"
+                    app:backgroundTint="@color/defaultBrand"
+                    android:onClick="onSubmit"/>
 
             </LinearLayout>
-        </ScrollView>
 
-        <!-- Back button -->
-        <ImageView
-            android:id="@+id/back_bt"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:padding="12dp"
-            android:src="@drawable/ic_back_grey"
-            app:tint="@color/white"
-            android:background="@color/defaultBrandAlpha"/>
+        </androidx.core.widget.NestedScrollView>
 
-    </FrameLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6f9ea93..2b65b60 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,6 +20,7 @@
     <style name="BaseTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/primary</item>
+<!--        <item name="android:textColorPrimary">@color/white</item>-->
         <item name="colorPrimaryDark">@color/primary</item>
         <item name="colorAccent">@color/accent</item>
         <item name="android:actionModeBackground">?attr/colorPrimary</item>
@@ -48,4 +49,15 @@
         <item name="android:background">?attr/colorPrimary</item>
     </style>
 
+    <!-- Geofavorite detail text appearances -->
+
+    <style name="TextAppearance.GeofavoriteDetail.Header.Expanded" parent="TextAppearance.Design.CollapsingToolbar.Expanded">
+        <item name="android:textSize">36sp</item>
+        <item name="android:textColor">@color/defaultBrand</item>
+    </style>
+
+    <style name="TextAppearance.GeofavoriteDetail.Header.Collapsed" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
 </resources>
\ No newline at end of file