diff --git a/app/src/main/java/org/y20k/trackbook/Keys.kt b/app/src/main/java/org/y20k/trackbook/Keys.kt
index 21424d8..80d5fd9 100644
--- a/app/src/main/java/org/y20k/trackbook/Keys.kt
+++ b/app/src/main/java/org/y20k/trackbook/Keys.kt
@@ -64,7 +64,7 @@ object Keys {
     // states
     const val STATE_TRACKING_NOT: Int = 0
     const val STATE_TRACKING_ACTIVE: Int = 1
-    const val STATE_TRACKING_STOPPED: Int = 2
+    const val STATE_TRACKING_PAUSED: Int = 2
     const val STATE_THEME_FOLLOW_SYSTEM: String = "stateFollowSystem"
     const val STATE_THEME_LIGHT_MODE: String = "stateLightMode"
     const val STATE_THEME_DARK_MODE: String = "stateDarkMode"
@@ -73,7 +73,7 @@ object Keys {
     const val DIALOG_EMPTY_RECORDING: Int = 0
     const val DIALOG_DELETE_TRACK: Int = 1
     const val DIALOG_DELETE_NON_STARRED: Int = 2
-    const val DIALOG_CLEAR_RECORDING: Int = 3
+    const val DIALOG_DELETE_CURRENT_RECORDING: Int = 3
 
     // dialog results
     const val DIALOG_EMPTY_PAYLOAD_STRING: String = ""
diff --git a/app/src/main/java/org/y20k/trackbook/MapFragment.kt b/app/src/main/java/org/y20k/trackbook/MapFragment.kt
index 7de5274..aeae1ec 100644
--- a/app/src/main/java/org/y20k/trackbook/MapFragment.kt
+++ b/app/src/main/java/org/y20k/trackbook/MapFragment.kt
@@ -74,7 +74,7 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlayHelpe
 
 
     /* Overrides onStop from Fragment */
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         // initialize layout
         val statusBarHeight: Int = UiHelper.getStatusBarHeight(activity as Context)
         layout = MapFragmentLayoutHolder(activity as Context, this as MapOverlayHelper.MarkerListener, inflater, container, statusBarHeight, currentBestLocation, trackingState)
@@ -83,7 +83,7 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlayHelpe
         layout.currentLocationButton.setOnClickListener {
             layout.centerMap(currentBestLocation, animated = true)
         }
-        layout.recordingButton.setOnClickListener {
+        layout.mainButton.setOnClickListener {
             handleTrackingManagementMenu()
         }
         layout.saveButton.setOnClickListener {
@@ -91,18 +91,11 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlayHelpe
         }
         layout.clearButton.setOnClickListener {
             if (track.wayPoints.isNotEmpty()) {
-                YesNoDialog(this as YesNoDialog.YesNoDialogListener).show(
-                    context=activity as Context,
-                    type = Keys.DIALOG_CLEAR_RECORDING,
-                    title = R.string.dialog_clear_recording_title,
-                    message = R.string.dialog_clear_recording_message,
-                    yesButton = R.string.dialog_clear_recording_action_resume
-                )
+                YesNoDialog(this as YesNoDialog.YesNoDialogListener).show(context = activity as Context, type = Keys.DIALOG_DELETE_CURRENT_RECORDING, message = R.string.dialog_delete_current_recording_message, yesButton = R.string.dialog_delete_current_recording_button_discard)
+            } else {
+                trackerService.clearTrack()
             }
         }
-        layout.resumeButton.setOnClickListener {
-            resumeTracking()
-        }
 
         return layout.rootView
     }
@@ -200,7 +193,7 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlayHelpe
                     }
                 }
             }
-            Keys.DIALOG_CLEAR_RECORDING -> {
+            Keys.DIALOG_DELETE_CURRENT_RECORDING -> {
                 when (dialogResult) {
                     true -> {
                         trackerService.clearTrack()
@@ -274,7 +267,7 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlayHelpe
     /* Starts / pauses tracking and toggles the recording sub menu_bottom_navigation */
     private fun handleTrackingManagementMenu() {
         when (trackingState) {
-            Keys.STATE_TRACKING_STOPPED -> layout.toggleRecordingButtonSubMenu()
+            Keys.STATE_TRACKING_PAUSED -> resumeTracking()
             Keys.STATE_TRACKING_ACTIVE -> trackerService.stopTracking()
             Keys.STATE_TRACKING_NOT -> startTracking()
         }
@@ -284,7 +277,7 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlayHelpe
     /* Saves track - shows dialog, if recording is still empty */
     private fun saveTrack() {
         if (track.wayPoints.isEmpty()) {
-            YesNoDialog(this as YesNoDialog.YesNoDialogListener).show(activity as Context, type = Keys.DIALOG_EMPTY_RECORDING, title = R.string.dialog_error_empty_recording_title, message = R.string.dialog_error_empty_recording_message, yesButton = R.string.dialog_error_empty_recording_action_resume)
+            YesNoDialog(this as YesNoDialog.YesNoDialogListener).show(context = activity as Context, type = Keys.DIALOG_EMPTY_RECORDING, message = R.string.dialog_error_empty_recording_message, yesButton = R.string.dialog_error_empty_recording_button_resume)
         } else {
             CoroutineScope(IO).launch {
                 // step 1: create and store filenames for json and gpx files
@@ -324,7 +317,7 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlayHelpe
             Keys.PREF_TRACKING_STATE -> {
                 if (activity != null) {
                     trackingState = PreferencesHelper.loadTrackingState()
-                    layout.updateRecordingButton(trackingState)
+                    layout.updateMainButton(trackingState)
                 }
             }
         }
@@ -345,7 +338,7 @@ class MapFragment : Fragment(), YesNoDialog.YesNoDialogListener, MapOverlayHelpe
             trackerService = binder.service
             // get state of tracking and update button if necessary
             trackingState = trackerService.trackingState
-            layout.updateRecordingButton(trackingState)
+            layout.updateMainButton(trackingState)
             // register listener for changes in shared preferences
             PreferencesHelper.registerPreferenceChangeListener(sharedPreferenceChangeListener)
             // start listening for location updates
diff --git a/app/src/main/java/org/y20k/trackbook/TrackerService.kt b/app/src/main/java/org/y20k/trackbook/TrackerService.kt
index 0f72b19..de41efd 100644
--- a/app/src/main/java/org/y20k/trackbook/TrackerService.kt
+++ b/app/src/main/java/org/y20k/trackbook/TrackerService.kt
@@ -34,8 +34,10 @@ import android.location.LocationListener
 import android.location.LocationManager
 import android.os.*
 import androidx.core.content.ContextCompat
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.Runnable
+import kotlinx.coroutines.launch
 import org.y20k.trackbook.core.Track
 import org.y20k.trackbook.helpers.*
 import java.util.*
@@ -249,7 +251,7 @@ class TrackerService: Service(), SensorEventListener {
         track.recordingStop = GregorianCalendar.getInstance().time
         CoroutineScope(IO).launch { FileHelper.saveTempTrackSuspended(this@TrackerService, track) }
         // save state
-        trackingState = Keys.STATE_TRACKING_STOPPED
+        trackingState = Keys.STATE_TRACKING_PAUSED
         PreferencesHelper.saveTrackingState(trackingState)
         // reset altitude values queue
         altitudeValues.reset()
diff --git a/app/src/main/java/org/y20k/trackbook/TrackingToggleTileService.kt b/app/src/main/java/org/y20k/trackbook/TrackingToggleTileService.kt
index 8a9b349..dd553bf 100644
--- a/app/src/main/java/org/y20k/trackbook/TrackingToggleTileService.kt
+++ b/app/src/main/java/org/y20k/trackbook/TrackingToggleTileService.kt
@@ -99,8 +99,8 @@ class TrackingToggleTileService: TileService() {
         tile.icon = Icon.createWithResource(this, R.drawable.ic_notification_icon_small_24dp)
         when (trackingState) {
             Keys.STATE_TRACKING_ACTIVE -> {
-                tile.label = getString(R.string.quick_settings_tile_title_stop)
-                tile.contentDescription = getString(R.string.descr_quick_settings_tile_title_stop)
+                tile.label = getString(R.string.quick_settings_tile_title_pause)
+                tile.contentDescription = getString(R.string.descr_quick_settings_tile_title_pause)
                 tile.state = Tile.STATE_ACTIVE
             }
             else -> {
diff --git a/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt b/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt
index a4bf7a6..fe80391 100644
--- a/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt
+++ b/app/src/main/java/org/y20k/trackbook/helpers/NotificationHelper.kt
@@ -120,7 +120,7 @@ class NotificationHelper(private val trackerService: TrackerService) {
     /* Notification actions */
     private val stopAction = NotificationCompat.Action(
         R.drawable.ic_notification_action_stop_24dp,
-        trackerService.getString(R.string.notification_stop),
+        trackerService.getString(R.string.notification_pause),
         stopActionPendingIntent)
     private val resumeAction = NotificationCompat.Action(
         R.drawable.ic_notification_action_resume_36dp,
diff --git a/app/src/main/java/org/y20k/trackbook/ui/MapFragmentLayoutHolder.kt b/app/src/main/java/org/y20k/trackbook/ui/MapFragmentLayoutHolder.kt
index bd09d2a..1d6f548 100644
--- a/app/src/main/java/org/y20k/trackbook/ui/MapFragmentLayoutHolder.kt
+++ b/app/src/main/java/org/y20k/trackbook/ui/MapFragmentLayoutHolder.kt
@@ -32,6 +32,7 @@ import androidx.constraintlayout.widget.Group
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textview.MaterialTextView
@@ -62,14 +63,13 @@ data class MapFragmentLayoutHolder(private var context: Context, private var mar
 
     /* Main class variables */
     val rootView: View
-    val mapView: MapView
+    var userInteraction: Boolean = false
     val currentLocationButton: FloatingActionButton
-    val recordingButton: FloatingActionButton
-    val recordingButtonSubMenu: Group
+    val mainButton: ExtendedFloatingActionButton
     val saveButton: FloatingActionButton
     val clearButton: FloatingActionButton
-    val resumeButton: FloatingActionButton
-    var userInteraction: Boolean = false
+    private val additionalButtons: Group
+    private val mapView: MapView
     private var currentPositionOverlay: ItemizedIconOverlay<OverlayItem>
     private var currentTrackOverlay: SimpleFastPointOverlay?
     private var currentTrackSpecialMarkerOverlay: ItemizedIconOverlay<OverlayItem>?
@@ -88,12 +88,11 @@ data class MapFragmentLayoutHolder(private var context: Context, private var mar
         // find views
         rootView = inflater.inflate(R.layout.fragment_map, container, false)
         mapView = rootView.findViewById(R.id.map)
-        currentLocationButton = rootView.findViewById(R.id.fab_location_button)
-        recordingButton = rootView.findViewById(R.id.fab_main_button)
-        recordingButtonSubMenu = rootView.findViewById(R.id.fab_sub_menu)
-        saveButton = rootView.findViewById(R.id.fab_sub_menu_button_save)
-        clearButton = rootView.findViewById(R.id.fab_sub_menu_button_clear)
-        resumeButton = rootView.findViewById(R.id.fab_sub_menu_button_resume)
+        currentLocationButton = rootView.findViewById(R.id.location_button)
+        mainButton = rootView.findViewById(R.id.main_button)
+        additionalButtons = rootView.findViewById(R.id.additional_buttons)
+        saveButton = rootView.findViewById(R.id.button_save)
+        clearButton = rootView.findViewById(R.id.button_clear)
         liveStatisticsDistanceView = rootView.findViewById(R.id.live_statistics_distance)
         liveStatisticsDistanceOutlineView = rootView.findViewById(R.id.live_statistics_distance_outline)
         liveStatisticsDurationView = rootView.findViewById(R.id.live_statistics_duration)
@@ -139,8 +138,8 @@ data class MapFragmentLayoutHolder(private var context: Context, private var mar
         currentTrackOverlay = null
         currentTrackSpecialMarkerOverlay = null
 
-        // initialize recording button state
-        updateRecordingButton(trackingState)
+        // initialize main button state
+        updateMainButton(trackingState)
 
         // listen for user interaction
         addInteractionListener()
@@ -224,34 +223,34 @@ data class MapFragmentLayoutHolder(private var context: Context, private var mar
     }
 
 
-    /* Toggles state of recording button and sub menu_bottom_navigation */
-    fun updateRecordingButton(trackingState: Int) {
+    /* Toggles state of main button and additional buttons (save & resume) */
+    fun updateMainButton(trackingState: Int) {
         when (trackingState) {
             Keys.STATE_TRACKING_NOT -> {
-                recordingButton.setImageResource(R.drawable.ic_fiber_manual_record_inactive_24dp)
-                recordingButtonSubMenu.isGone = true
+                mainButton.setIconResource(R.drawable.ic_fiber_manual_record_inactive_24dp)
+                mainButton.text = context.getString(R.string.button_start)
+                mainButton.contentDescription = context.getString(R.string.descr_button_start)
+                additionalButtons.isGone = true
+                currentLocationButton.isVisible = true
             }
             Keys.STATE_TRACKING_ACTIVE -> {
-                recordingButton.setImageResource(R.drawable.ic_fiber_manual_record_active_24dp)
-                recordingButtonSubMenu.isGone = true
+                mainButton.setIconResource(R.drawable.ic_pause_24dp)
+                mainButton.text = context.getString(R.string.button_pause)
+                mainButton.contentDescription = context.getString(R.string.descr_button_start)
+                additionalButtons.isGone = true
+                currentLocationButton.isVisible = true
             }
-            Keys.STATE_TRACKING_STOPPED -> {
-                recordingButton.setImageResource(R.drawable.ic_save_24dp)
+            Keys.STATE_TRACKING_PAUSED -> {
+                mainButton.setIconResource(R.drawable.ic_fiber_manual_record_inactive_24dp)
+                mainButton.text = context.getString(R.string.button_resume)
+                mainButton.contentDescription = context.getString(R.string.descr_button_resume)
+                additionalButtons.isVisible = true
+                currentLocationButton.isGone = true
             }
         }
     }
 
 
-    /* Toggles visibility of recording button sub menu_bottom_navigation */
-    fun toggleRecordingButtonSubMenu() {
-        when (recordingButtonSubMenu.visibility) {
-            View.VISIBLE -> recordingButtonSubMenu.isGone = true
-            else -> recordingButtonSubMenu.isVisible = true
-        }
-    }
-
-
-
     /* Toggles content and visibility of the location error snackbar */
     fun toggleLocationErrorBar(gpsProviderActive: Boolean, networkProviderActive: Boolean) {
         if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_DENIED) {
diff --git a/app/src/main/res/drawable/ic_clear_24dp.xml b/app/src/main/res/drawable/ic_clear_24dp.xml
index ab1ca32..bffdad2 100755
--- a/app/src/main/res/drawable/ic_clear_24dp.xml
+++ b/app/src/main/res/drawable/ic_clear_24dp.xml
@@ -5,5 +5,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
-        android:fillColor="@color/recording_button_icon" />
+        android:fillColor="@color/recording_management_buttons_icon" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_fiber_manual_record_inactive_24dp.xml b/app/src/main/res/drawable/ic_fiber_manual_record_inactive_24dp.xml
index dac3cd5..6eebd6c 100755
--- a/app/src/main/res/drawable/ic_fiber_manual_record_inactive_24dp.xml
+++ b/app/src/main/res/drawable/ic_fiber_manual_record_inactive_24dp.xml
@@ -5,5 +5,5 @@
         android:viewportHeight="24.0">
     <path
         android:pathData="M12,12m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
-        android:fillColor="@color/recording_button_icon" />
+        android:fillColor="@color/recording_management_buttons_icon" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_pause_24dp.xml b/app/src/main/res/drawable/ic_pause_24dp.xml
new file mode 100644
index 0000000..818bfb3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pause_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@color/recording_management_buttons_icon"
+      android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_save_24dp.xml b/app/src/main/res/drawable/ic_save_24dp.xml
index 6a82063..906e6e5 100644
--- a/app/src/main/res/drawable/ic_save_24dp.xml
+++ b/app/src/main/res/drawable/ic_save_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/recording_button_icon"
+        android:fillColor="@color/recording_management_buttons_icon"
         android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
index 8636270..bd37e4f 100644
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -23,179 +23,67 @@
 
         <!-- BUTTON SAVE -->
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_sub_menu_button_save"
+            android:id="@+id/button_save"
             style="@style/Widget.MaterialComponents.FloatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:clickable="true"
-            android:contentDescription="@string/descr_fab_sub_menu_button_save"
-            android:focusable="true"
+            android:contentDescription="@string/descr_button_save"
             app:backgroundTint="@color/trackbook_green"
             app:fabSize="mini"
-            app:layout_constraintBottom_toTopOf="@+id/fab_sub_menu_button_clear"
-            app:layout_constraintEnd_toEndOf="@+id/fab_sub_menu_button_clear"
-            app:layout_constraintStart_toStartOf="@+id/fab_sub_menu_button_clear"
+            app:layout_constraintBottom_toBottomOf="@+id/main_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.15"
+            app:layout_constraintStart_toEndOf="@+id/main_button"
+            app:layout_constraintTop_toTopOf="@+id/main_button"
             app:srcCompat="@drawable/ic_save_24dp"
-            app:tint="@color/recording_button_icon" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/fab_sub_menu_label_save"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_marginEnd="4dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:visibility="gone"
-            app:cardBackgroundColor="@color/fab_button_card_background"
-            app:cardCornerRadius="2dp"
-            app:cardElevation="4dp"
-            app:cardUseCompatPadding="true"
-            app:strokeWidth="0dp"
-            app:layout_constraintBottom_toBottomOf="@+id/fab_sub_menu_button_save"
-            app:layout_constraintEnd_toStartOf="@+id/fab_sub_menu_button_save"
-            app:layout_constraintTop_toTopOf="@+id/fab_sub_menu_button_save">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:layout_width="wrap_content"
-                android:layout_height="24dp"
-                android:paddingLeft="6dp"
-                android:paddingTop="2dp"
-                android:paddingRight="6dp"
-                android:paddingBottom="2dp"
-                android:text="@string/fab_sub_menu_save"
-                android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
-                android:textColor="@color/fab_button_card_text" />
-        </com.google.android.material.card.MaterialCardView>
+            app:tint="@null" />  <!-- necessary hack: to be able to change icon color programmatically -->
 
         <!-- BUTTON CLEAR -->
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_sub_menu_button_clear"
+            android:id="@+id/button_clear"
             style="@style/Widget.MaterialComponents.FloatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:clickable="true"
-            android:contentDescription="@string/descr_fab_sub_menu_button_clear"
-            android:focusable="true"
-            app:backgroundTint="@color/recording_button_background"
+            android:contentDescription="@string/descr_button_delete"
+            app:backgroundTint="@color/recording_management_buttons_background"
             app:fabSize="mini"
-            app:layout_constraintBottom_toTopOf="@+id/fab_sub_menu_button_resume"
-            app:layout_constraintEnd_toEndOf="@+id/fab_sub_menu_button_resume"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="@+id/fab_sub_menu_button_resume"
-            app:srcCompat="@drawable/ic_clear_24dp"
-            app:tint="@color/recording_button_icon" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/fab_sub_menu_label_clear"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:clickable="true"
-            android:focusable="true"
-            app:cardBackgroundColor="@color/fab_button_card_background"
-            app:cardCornerRadius="2dp"
-            app:cardElevation="4dp"
-            app:cardUseCompatPadding="true"
-            app:strokeWidth="0dp"
-            app:layout_constraintBottom_toBottomOf="@+id/fab_sub_menu_button_clear"
-            app:layout_constraintEnd_toEndOf="@+id/fab_sub_menu_label_save"
-            app:layout_constraintTop_toTopOf="@+id/fab_sub_menu_button_clear">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="6dp"
-                android:paddingTop="2dp"
-                android:paddingRight="6dp"
-                android:paddingBottom="2dp"
-                android:text="@string/fab_sub_menu_clear"
-                android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
-                android:textColor="@color/fab_button_card_text" />
-        </com.google.android.material.card.MaterialCardView>
-
-        <!-- BUTTON RESUME -->
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_sub_menu_button_resume"
-            style="@style/Widget.MaterialComponents.FloatingActionButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:clickable="true"
-            android:contentDescription="@string/descr_fab_sub_menu_button_resume"
-            android:focusable="true"
-            app:backgroundTint="@color/recording_button_background"
-            app:fabSize="mini"
-            app:layout_constraintBottom_toTopOf="@+id/fab_main_button"
-            app:layout_constraintEnd_toEndOf="@+id/fab_main_button"
-            app:layout_constraintStart_toStartOf="@+id/fab_main_button"
-            app:srcCompat="@drawable/ic_fiber_manual_record_inactive_24dp"
-            app:tint="@color/recording_button_icon" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/fab_sub_menu_label_resume"
-            style="@style/Widget.MaterialComponents.CardView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clickable="true"
-            android:focusable="true"
-            app:cardBackgroundColor="@color/fab_button_card_background"
-            app:cardCornerRadius="2dp"
-            app:cardElevation="4dp"
-            app:cardUseCompatPadding="true"
-            app:strokeWidth="0dp"
-            app:layout_constraintBottom_toBottomOf="@+id/fab_sub_menu_button_resume"
-            app:layout_constraintEnd_toEndOf="@+id/fab_sub_menu_label_clear"
-            app:layout_constraintTop_toTopOf="@+id/fab_sub_menu_button_resume">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="6dp"
-                android:paddingTop="2dp"
-                android:paddingRight="6dp"
-                android:paddingBottom="2dp"
-                android:text="@string/fab_sub_menu_resume"
-                android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
-                android:textColor="@color/fab_button_card_text" />
-        </com.google.android.material.card.MaterialCardView>
-
+            app:layout_constraintBottom_toBottomOf="@+id/main_button"
+            app:layout_constraintEnd_toStartOf="@+id/main_button"
+            app:layout_constraintHorizontal_bias="0.85"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/main_button"
+            app:srcCompat="@drawable/ic_delete_24dp"
+            app:tint="@null" />  <!-- necessary hack: to be able to change icon color programmatically -->
 
         <!-- MAIN BUTTON -->
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_main_button"
-            style="@style/Widget.Design.FloatingActionButton"
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/main_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            android:clickable="true"
-            android:contentDescription="@string/descr_fab_main_start"
-            android:focusable="true"
-            app:backgroundTint="@color/recording_button_background"
+            android:contentDescription="@string/descr_button_start"
+            android:text="@string/button_start"
+            app:backgroundTint="@color/recording_management_buttons_background"
+            app:icon="@drawable/ic_fiber_manual_record_inactive_24dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:srcCompat="@drawable/ic_fiber_manual_record_inactive_24dp"
+            app:layout_constraintStart_toStartOf="parent"
             app:tint="@null" /> <!-- necessary hack: to be able to change icon color programmatically -->
 
         <!-- CURRENT LOCATION BUTTON -->
         <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_location_button"
+            android:id="@+id/location_button"
             style="@style/Widget.MaterialComponents.FloatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginBottom="16dp"
-            android:clickable="true"
-            android:contentDescription="@string/descr_fab_location"
-            android:focusable="true"
+            android:contentDescription="@string/descr_button_location"
             android:src="@drawable/ic_current_location_24dp"
             app:backgroundTint="@color/location_button_background"
             app:fabSize="mini"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="@+id/main_button"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/main_button"
             app:tint="@color/location_button_icon" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -244,11 +132,11 @@
 
         <!-- GROUPS -->
         <androidx.constraintlayout.widget.Group
-            android:id="@+id/fab_sub_menu"
+            android:id="@+id/additional_buttons"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:visibility="gone"
-            app:constraint_referenced_ids="fab_sub_menu_button_save,fab_sub_menu_label_save,fab_sub_menu_button_clear,fab_sub_menu_label_clear,fab_sub_menu_button_resume,fab_sub_menu_label_resume" />
+            app:constraint_referenced_ids="button_clear,button_save" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index b8d29bc..bfa9c17 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -8,7 +8,7 @@
     <!-- notification -->
     <string name="notification_title_trackbook_running">Trackbook kører</string>
     <string name="notification_title_trackbook_not_running">Trackbook kører ikke</string>
-    <string name="notification_stop">Stop</string>
+    <string name="notification_pause">Stop</string>
     <string name="notification_resume">Fortsæt</string>
     <string name="notification_show">Vis</string>
     <string name="notification_channel_recording_name">Bevægelse optagelses tilstand</string>
@@ -16,14 +16,13 @@
     <!-- snackbar messages -->
     <string name="snackbar_message_location_offline">Lokalisering er slået fra. Trackbook kan ikke virke.</string>
     <!-- fab sub menu_bottom_navigation -->
-    <string name="fab_sub_menu_clear">Ryd</string>
-    <string name="fab_sub_menu_save">Gem</string>
-    <string name="fab_sub_menu_resume">Fortsæt</string>
+    <string name="button_delete">Ryd</string>
+    <string name="button_save">Gem</string>
+    <string name="button_resume">Fortsæt</string>
     <!-- dialogs -->
     <string name="dialog_share_gpx">Del GPX fil med</string>
-    <string name="dialog_error_empty_recording_title">Kan ikke gemme</string>
     <string name="dialog_error_empty_recording_message">Trackbook har ingen rutepunkter endnu.</string>
-    <string name="dialog_error_empty_recording_action_resume">Fortsæt optagelse</string>
+    <string name="dialog_error_empty_recording_button_resume">Fortsæt optagelse</string>
     <!-- toast messages -->
     <string name="toast_message_elevation_info">Tip: nøjagtigheden af højde målingerne afhænger af din enhed. Op ad og nedadgående højder på hele ruten måles.</string>
     <string name="toast_message_install_file_helper">Kan ikke gemme. Installer venligst en filhåndteringsprogram først.</string>
@@ -50,10 +49,10 @@
     <!-- descriptions -->
     <string name="descr_map_current_track">Kortlægning af nuværende tur</string>
     <string name="descr_map_last_track">Kortlægning af sidste tur</string>
-    <string name="descr_fab_main_start">Start optagelse knap</string>
-    <string name="descr_fab_sub_menu_button_save">Gem knap</string>
-    <string name="descr_fab_sub_menu_button_clear">Ryd knap</string>
-    <string name="descr_fab_sub_menu_button_resume">Fortsæt knap</string>
+    <string name="descr_button_start">Start optagelse knap</string>
+    <string name="descr_button_save">Gem knap</string>
+    <string name="descr_button_delete">Ryd knap</string>
+    <string name="descr_button_resume">Fortsæt knap</string>
     <string name="descr_statistics_sheet_delete_button">Slet tur knap</string>
     <string name="descr_statistics_sheet_save_button">Del eksport som GPX knap</string>
     <string name="pref_imperial_measurement_units_title">Brug britiske mål</string>
@@ -61,7 +60,7 @@
     <string name="pref_general_title">Generelt</string>
     <string name="pref_delete_non_starred_title">Slet optagelser uden stjerner</string>
     <string name="pref_delete_non_starred_summary">Slet alle optagelser i \"Tracks\", som ikke er stjernede.</string>
-    <string name="quick_settings_tile_title_stop">Stop optagelsen</string>
+    <string name="quick_settings_tile_title_pause">Stop optagelsen</string>
     <string name="quick_settings_tile_title_default">Optagelse</string>
     <string name="statistics_sheet_p_velocity">Gennemsnitlig hastighed:</string>
     <string name="toast_message_poi_added">Der er tilføjet et interessepunkt.</string>
@@ -108,7 +107,7 @@
     <string name="pref_theme_selection_summary">Aktuelt tema:</string>
     <string name="pref_theme_selection_mode_light">Lystilstand</string>
     <string name="descr_statistics_sheet_edit_button">Knap til at redigere spor</string>
-    <string name="descr_quick_settings_tile_title_stop">Stop optagelsen</string>
+    <string name="descr_quick_settings_tile_title_pause">Stop optagelsen</string>
     <string name="descr_quick_settings_tile_title_start">Start optagelse</string>
     <string name="statistics_sheet_p_recording_paused">Optagelse afbrudt:</string>
     <string name="toast_message_save_gpx">Gemmer optagelsen som GPX.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a446577..2f302b7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -8,7 +8,7 @@
     <!-- notification -->
     <string name="notification_title_trackbook_not_running">Trackbook ist inaktiv</string>
     <string name="notification_title_trackbook_running">Trackbook ist aktiv</string>
-    <string name="notification_stop">Stoppen</string>
+    <string name="notification_pause">Stoppen</string>
     <string name="notification_resume">Fortsetzen</string>
     <string name="notification_show">Anzeigen</string>
     <string name="notification_channel_recording_name">Status der Aufnahme</string>
@@ -16,14 +16,13 @@
     <!-- snackbar messages -->
     <string name="snackbar_message_location_offline">Standortdienste sind deaktiviert. Trackbook wird nicht funktionieren.</string>
     <!-- fab sub menu_bottom_navigation -->
-    <string name="fab_sub_menu_clear">Zurücksetzen</string>
-    <string name="fab_sub_menu_save">Speichern</string>
-    <string name="fab_sub_menu_resume">Fortsetzen</string>
+    <string name="button_delete">Zurücksetzen</string>
+    <string name="button_save">Speichern</string>
+    <string name="button_resume">Fortsetzen</string>
     <!-- dialogs -->
     <string name="dialog_share_gpx">GPX-Datei teilen mit</string>
-    <string name="dialog_error_empty_recording_title">Speichern nicht möglich</string>
     <string name="dialog_error_empty_recording_message">Trackbook hat noch keine Wegpunkte aufgenommen.</string>
-    <string name="dialog_error_empty_recording_action_resume">Aufnahme fortsetzen</string>
+    <string name="dialog_error_empty_recording_button_resume">Aufnahme fortsetzen</string>
     <!-- toast messages -->
     <string name="toast_message_copied_to_clipboard">In die Zwischenablage kopiert.</string>
     <string name="toast_message_elevation_info">Hinweis: Die Genauigkeit der Höhenmeter-Werte ist geräteabhängig. Gemessen werden Steigungen und Gefälle der Gesamtstrecke.</string>
@@ -52,10 +51,10 @@
     <!-- descriptions -->
     <string name="descr_map_current_track">Kartierung der aktuellen Strecken</string>
     <string name="descr_map_last_track">Kartierung der letzten Strecke</string>
-    <string name="descr_fab_main_start">Taste für „Aufnahme starten“</string>
-    <string name="descr_fab_sub_menu_button_save">Taste für „Speichern“</string>
-    <string name="descr_fab_sub_menu_button_clear">Taste für „Zurücksetzen“</string>
-    <string name="descr_fab_sub_menu_button_resume">Taste für „Fortsetzen“</string>
+    <string name="descr_button_start">Taste für „Aufnahme starten“</string>
+    <string name="descr_button_save">Taste für „Speichern“</string>
+    <string name="descr_button_delete">Taste für „Zurücksetzen“</string>
+    <string name="descr_button_resume">Taste für „Fortsetzen“</string>
     <string name="descr_statistics_sheet_delete_button">Taste für „Strecke löschen“</string>
     <string name="descr_statistics_sheet_save_button">Taste für „Als GPX speichern“</string>
     <string name="pref_theme_selection_mode_light">Heller Modus</string>
@@ -96,8 +95,8 @@
     <string name="pref_advanced_title">Erweitert</string>
     <string name="pref_accuracy_threshold_title">Genauigkeits-Schwellenwert</string>
     <string name="pref_accuracy_threshold_summary">Ortsfixierungen verwerfen, mit einer Genauigkeit größer als (Meter):</string>
-    <string name="descr_quick_settings_tile_title_stop">Aufnahme stoppen</string>
-    <string name="quick_settings_tile_title_stop">Aufnahme stoppen</string>
+    <string name="descr_quick_settings_tile_title_pause">Aufnahme stoppen</string>
+    <string name="quick_settings_tile_title_pause">Aufnahme stoppen</string>
     <string name="snackbar_message_location_permission_denied">Genehmigung für Standortdienste nicht erteilt. Trackbook wird nicht funktionieren.</string>
     <string name="tab_tracks">Strecken</string>
     <string name="descr_quick_settings_tile_title_start">Aufnahme starten</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7f5f95b..1cf3ed0 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -10,7 +10,7 @@
     <string name="pref_gps_only_summary_gps_only">Actualmente se usa solo GPS para la localización.</string>
     <string name="pref_imperial_measurement_units_summary_imperial">Actualmente se utilizan unidades imperiales (millas, pies).</string>
     <string name="pref_report_issue_summary">Informar errores y sugerir mejoras en GitHub.</string>
-    <string name="descr_fab_sub_menu_button_resume">Resumir grabación</string>
+    <string name="descr_button_resume">Resumir grabación</string>
     <string name="track_list_p_element_statistics">Distancia total grabada</string>
     <string name="abbreviation_minutes">Minutos</string>
     <string name="app_name">Trackbook</string>
@@ -18,7 +18,7 @@
     <string name="tab_settings">Ajustes</string>
     <string name="notification_title_trackbook_running">Trackbook en ejecución</string>
     <string name="notification_title_trackbook_not_running">Trackbook no se está ejecutando</string>
-    <string name="notification_stop">Detener</string>
+    <string name="notification_pause">Detener</string>
     <string name="tab_tracks">Rutas</string>
     <string name="notification_resume">Resumir</string>
     <string name="notification_show">Mostrar</string>
@@ -26,12 +26,11 @@
     <string name="notification_channel_recording_description">Muestra la duración y la distancia. Opción para detener la grabación de movimiento.</string>
     <string name="snackbar_message_location_offline">La ubicación está desactivada. Trackbook no funcionará.</string>
     <string name="snackbar_message_location_permission_denied">Permiso de ubicación no concedido. Trackbook no funcionará.</string>
-    <string name="fab_sub_menu_clear">Limpiar</string>
-    <string name="fab_sub_menu_save">Guardar</string>
-    <string name="fab_sub_menu_resume">Resumir</string>
+    <string name="button_delete">Limpiar</string>
+    <string name="button_save">Guardar</string>
+    <string name="button_resume">Resumir</string>
     <string name="dialog_generic_button_okay">OK</string>
     <string name="dialog_generic_details_button">Mostrar detalles</string>
-    <string name="dialog_error_empty_recording_title">No fue posible guardar cambios</string>
     <string name="dialog_error_empty_recording_message">Trackbook no registró ningún punto de referencia hasta el momento.</string>
     <string name="dialog_rename_track_input_hint">Introduce un nombre nuevo</string>
     <string name="dialog_share_gpx">Compartir el archivo GPX con</string>
@@ -41,7 +40,7 @@
     <string name="dialog_yes_no_message_delete_recording">¿Eliminar esta grabación\?</string>
     <string name="toast_message_copied_to_clipboard">Copiado al portapapeles.</string>
     <string name="toast_message_install_file_helper">No se puede guardar. Primero instala un administrador de archivos.</string>
-    <string name="dialog_error_empty_recording_action_resume">Continuar grabación</string>
+    <string name="dialog_error_empty_recording_button_resume">Continuar grabación</string>
     <string name="toast_message_poi_added">Se agregó un marcador de punto de interés.</string>
     <string name="toast_message_poi_removed">Se elimino un marcador de punto de interés.</string>
     <string name="toast_message_save_gpx">Guardando grabacion como GPX.</string>
@@ -59,7 +58,7 @@
     <string name="statistics_sheet_p_velocity">Velocidad promedio:</string>
     <string name="quick_settings_tile_title_default">Grabando</string>
     <string name="quick_settings_tile_title_start">Iniciar Grabación</string>
-    <string name="quick_settings_tile_title_stop">Detener Grabación</string>
+    <string name="quick_settings_tile_title_pause">Detener Grabación</string>
     <string name="layout_onboarding_description_app_icon">Icono de la aplicación Trackbook</string>
     <string name="track_list_onboarding_h1_part_1">Tus rutas grabadas</string>
     <string name="statistics_sheet_p_recording_paused">Grabación pausada:</string>
@@ -92,14 +91,14 @@
     <string name="abbreviation_hours">Horas</string>
     <string name="descr_map_current_track">Mapeando la ruta actual</string>
     <string name="descr_map_last_track">Mapeo de la última ruta</string>
-    <string name="descr_fab_main_start">Botón de inicio de grabación</string>
-    <string name="descr_fab_sub_menu_button_save">Guardar grabación</string>
-    <string name="descr_fab_sub_menu_button_clear">Eliminar grabación</string>
+    <string name="descr_button_start">Botón de inicio de grabación</string>
+    <string name="descr_button_save">Guardar grabación</string>
+    <string name="descr_button_delete">Eliminar grabación</string>
     <string name="descr_mark_starred_button">Marcar como botón destacado</string>
     <string name="descr_quick_settings_tile_title_start">Iniciar grabación</string>
-    <string name="descr_quick_settings_tile_title_stop">Detener grabación</string>
+    <string name="descr_quick_settings_tile_title_pause">Detener grabación</string>
     <string name="descr_statistics_sheet_delete_button">Botón de eliminar ruta</string>
     <string name="descr_statistics_sheet_edit_button">Botón de editar ruta</string>
     <string name="descr_statistics_sheet_save_button">Botón Guardar como GPX</string>
-    <string name="descr_fab_location">Centrar en la ubicación actual</string>
+    <string name="descr_button_location">Centrar en la ubicación actual</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0208d09..a1a5964 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -10,19 +10,18 @@
     <string name="notification_channel_recording_name">État de l\'enregistrement des déplacements</string>
     <string name="notification_resume">Reprendre</string>
     <string name="notification_show">Afficher</string>
-    <string name="notification_stop">Arrêter</string>
+    <string name="notification_pause">Arrêter</string>
     <string name="notification_title_trackbook_not_running">Suivi inactif</string>
     <string name="notification_title_trackbook_running">Suivi actif</string>
     <!-- snackbar messages -->
     <string name="snackbar_message_location_offline">Localisation désactivée. Le suivi ne fonctionnera pas.</string>
     <!-- fab sub menu_bottom_navigation -->
-    <string name="fab_sub_menu_clear">Supprimer</string>
-    <string name="fab_sub_menu_resume">Reprendre</string>
-    <string name="fab_sub_menu_save">Sauvegarder</string>
+    <string name="button_delete">Supprimer</string>
+    <string name="button_resume">Reprendre</string>
+    <string name="button_save">Sauvegarder</string>
     <!-- dialogs -->
-    <string name="dialog_error_empty_recording_action_resume">Reprendre l\'enregistrement</string>
+    <string name="dialog_error_empty_recording_button_resume">Reprendre l\'enregistrement</string>
     <string name="dialog_error_empty_recording_message">Trackbook n\'a enregistré aucun point de parcours jusqu\'à présent.</string>
-    <string name="dialog_error_empty_recording_title">Sauvegarde impossible</string>
     <string name="dialog_share_gpx">Partager le fichier GPX avec</string>
     <!-- toast messages -->
     <string name="toast_message_elevation_info">Astuce : La précision des données d\'altitude dépend de votre appareil. La dénivellation globale du parcours est mesurée.</string>
@@ -49,10 +48,10 @@
     <string name="track_list_onboarding_h1_part_2">… seront affichés ici.</string>
     <!-- descriptions -->
     <string name="descr_statistics_sheet_delete_button">Bouton « Supprimer le parcours »</string>
-    <string name="descr_fab_main_start">Bouton « Démarrer l\'enregistrement »</string>
-    <string name="descr_fab_sub_menu_button_clear">Effacer l\'enregistrement</string>
-    <string name="descr_fab_sub_menu_button_resume">Reprendre l\'enregistrement</string>
-    <string name="descr_fab_sub_menu_button_save">Sauvegarder l\'enregistrement</string>
+    <string name="descr_button_start">Bouton « Démarrer l\'enregistrement »</string>
+    <string name="descr_button_delete">Effacer l\'enregistrement</string>
+    <string name="descr_button_resume">Reprendre l\'enregistrement</string>
+    <string name="descr_button_save">Sauvegarder l\'enregistrement</string>
     <string name="descr_map_current_track">Affichage du parcours actuel</string>
     <string name="descr_map_last_track">Affichage du dernier parcours</string>
     <string name="descr_statistics_sheet_save_button">Bouton « Partager au format GPX »</string>
@@ -86,9 +85,9 @@
     <string name="descr_statistics_sheet_edit_button">Bouton « Modifier le parcours »</string>
     <string name="quick_settings_tile_title_default">Enregistrement</string>
     <string name="quick_settings_tile_title_start">Démarrer l\'enregistrement</string>
-    <string name="quick_settings_tile_title_stop">Arrêter l\'enregistrement</string>
+    <string name="quick_settings_tile_title_pause">Arrêter l\'enregistrement</string>
     <string name="descr_quick_settings_tile_title_start">Démarrer l\'enregistrement</string>
-    <string name="descr_quick_settings_tile_title_stop">Arrêter l\'enregistrement</string>
+    <string name="descr_quick_settings_tile_title_pause">Arrêter l\'enregistrement</string>
     <string name="pref_theme_selection_mode_dark">Thème sombre</string>
     <string name="pref_theme_selection_mode_device_default">Thème de l\'appareil</string>
     <string name="pref_theme_selection_mode_light">Thème clair</string>
@@ -114,5 +113,5 @@
     <string name="pref_recording_accuracy_summary_default">Les points de cheminements ont une précision plus faible mais sont plus fréquents.</string>
     <string name="pref_recording_accuracy_summary_high">Les points de cheminement ont une plus grande précision mais sont moins fréquents.</string>
     <string name="track_list_p_element_statistics">Distance totale enregistrée</string>
-    <string name="descr_fab_location">Centrer sur la position actuelle</string>
+    <string name="descr_button_location">Centrer sur la position actuelle</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index b46ea18..82bdeef 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -8,21 +8,20 @@
     <string name="pref_gps_only_title">Ograniči na GPS</string>
     <string name="statistics_sheet_p_steps_no_pedometer">brojač koraka nije dostupan</string>
     <string name="dialog_generic_details_button">Prikaži detalje</string>
-    <string name="dialog_error_empty_recording_title">Nije moguće spremiti</string>
     <string name="descr_statistics_sheet_edit_button">Gumb za uređivanje puta</string>
     <string name="statistics_sheet_p_positive_elevation">Visinska razlika (uzbrdo):</string>
     <string name="statistics_sheet_p_negative_elevation">Visinska razlika (nizbrdo):</string>
     <string name="pref_theme_selection_mode_light">Svijetli modus</string>
     <string name="dialog_yes_no_positive_button_delete_recording">Izbriši</string>
-    <string name="notification_stop">Prekini</string>
-    <string name="fab_sub_menu_clear">Poništi</string>
+    <string name="notification_pause">Prekini</string>
+    <string name="button_delete">Poništi</string>
     <string name="notification_show">Prikaži</string>
     <string name="statistics_sheet_p_steps">Broj koraka:</string>
     <string name="descr_quick_settings_tile_title_start">Počni snimati</string>
-    <string name="descr_fab_sub_menu_button_save">Spremi snimanje</string>
+    <string name="descr_button_save">Spremi snimanje</string>
     <string name="notification_channel_recording_name">Stanje snimanja kretanja</string>
     <string name="statistics_sheet_p_max_altitude">Najviša točka rute:</string>
-    <string name="descr_fab_sub_menu_button_clear">Izbriši snimanje</string>
+    <string name="descr_button_delete">Izbriši snimanje</string>
     <string name="pref_accuracy_threshold_summary">Odbaci određivanje mjesta s točnošću većom od (u metrima):</string>
     <string name="dialog_yes_no_message_delete_recording">Ovo snimanje izbrisati\?</string>
     <string name="notification_title_trackbook_running">Trackbook radi</string>
@@ -30,10 +29,10 @@
     <string name="pref_delete_non_starred_title">Izbriši neoznačene snimke</string>
     <string name="descr_mark_starred_button">Gumb za označavanje</string>
     <string name="snackbar_message_location_permission_denied">Lokaliziranje nije dozvoljeno. Trackbook neće raditi.</string>
-    <string name="fab_sub_menu_save">Spremi</string>
+    <string name="button_save">Spremi</string>
     <string name="pref_general_title">Opće</string>
     <string name="pref_accuracy_threshold_title">Prag točnosti</string>
-    <string name="fab_sub_menu_resume">Nastavi</string>
+    <string name="button_resume">Nastavi</string>
     <string name="pref_theme_selection_title">Tema programa</string>
     <string name="tab_tracks">Rute</string>
     <string name="descr_map_last_track">Mapa zadnje rute</string>
@@ -63,12 +62,12 @@
     <string name="notification_channel_recording_description">Prikaz trajanja i udaljenosti. Opcija za zaustavljanje snimanja kretanja.</string>
     <string name="tab_settings">Postavke</string>
     <string name="pref_imperial_measurement_units_summary_imperial">Trenutačno se koriste imperijalne jedinice (milje, stopa).</string>
-    <string name="descr_fab_main_start">Gumb za snimanje</string>
-    <string name="quick_settings_tile_title_stop">Prekini snimati</string>
+    <string name="descr_button_start">Gumb za snimanje</string>
+    <string name="quick_settings_tile_title_pause">Prekini snimati</string>
     <string name="track_list_onboarding_h1_part_1">Tvoje snimljene rute</string>
     <string name="dialog_generic_button_okay">U redu</string>
-    <string name="descr_quick_settings_tile_title_stop">Prekini snimati</string>
-    <string name="descr_fab_sub_menu_button_resume">Nastavi snimanje</string>
+    <string name="descr_quick_settings_tile_title_pause">Prekini snimati</string>
+    <string name="descr_button_resume">Nastavi snimanje</string>
     <string name="descr_statistics_sheet_delete_button">Gumb za brisanje puta</string>
     <string name="pref_reset_advanced_title">Vrati na standardne vrijednosti</string>
     <string name="notification_title_trackbook_not_running">Trackbook ne radi</string>
@@ -80,7 +79,7 @@
     <string name="statistics_sheet_p_duration">Ukupno trajanje:</string>
     <string name="statistics_sheet_p_waypoints">Snimljene točke rute:</string>
     <string name="layout_onboarding_description_app_icon">Ikona programa Trackbook</string>
-    <string name="dialog_error_empty_recording_action_resume">Nastavi snimati</string>
+    <string name="dialog_error_empty_recording_button_resume">Nastavi snimati</string>
     <string name="pref_maintenance_title">Održavanje</string>
     <string name="pref_gps_only_summary_gps_only">Za određivanje lokacije trenutačno se koristi samo GPS.</string>
     <string name="dialog_yes_no_positive_button_delete_non_starred">Izbriši</string>
@@ -101,5 +100,5 @@
     <string name="pref_recording_accuracy_title">Točnost snimanja</string>
     <string name="pref_recording_accuracy_summary_default">Točke rute imaju manju točnost ali su češće.</string>
     <string name="track_list_p_element_statistics">Ukupna udaljenost snimljena</string>
-    <string name="descr_fab_location">Centriraj na trenutačno mjesto</string>
+    <string name="descr_button_location">Centriraj na trenutačno mjesto</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index a06bc80..cf94933 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -7,7 +7,7 @@
     <!-- notification -->
     <string name="notification_title_trackbook_running">Trackbook aktif</string>
     <string name="notification_title_trackbook_not_running">Trackbook tidak aktif</string>
-    <string name="notification_stop">Berhenti</string>
+    <string name="notification_pause">Berhenti</string>
     <!--<string name="notification_resume"></string>-->
     <!--<string name="notification_show"></string>-->
     <!--<string name="notification_channel_recording_name"></string>-->
@@ -105,13 +105,13 @@
     <string name="statistics_sheet_p_max_altitude">Titik arah tertinggi:</string>
     <string name="descr_statistics_sheet_edit_button">Tombol edit jalur</string>
     <string name="descr_statistics_sheet_delete_button">Tombol hapus jalur</string>
-    <string name="descr_quick_settings_tile_title_stop">Hentikan Perekaman</string>
+    <string name="descr_quick_settings_tile_title_pause">Hentikan Perekaman</string>
     <string name="descr_quick_settings_tile_title_start">Mulai Perekaman</string>
     <string name="descr_mark_starred_button">Tandai sebagai tombol berbintang</string>
-    <string name="descr_fab_sub_menu_button_resume">Tombol Lanjutkan</string>
-    <string name="descr_fab_sub_menu_button_clear">Tombol hapus</string>
-    <string name="descr_fab_sub_menu_button_save">Tombol simpan</string>
-    <string name="descr_fab_main_start">Tombol Mulai perekaman</string>
+    <string name="descr_button_resume">Tombol Lanjutkan</string>
+    <string name="descr_button_delete">Tombol hapus</string>
+    <string name="descr_button_save">Tombol simpan</string>
+    <string name="descr_button_start">Tombol Mulai perekaman</string>
     <string name="descr_map_last_track">Pemetaan jalur terakhir</string>
     <string name="descr_map_current_track">Pemetaan jalur saat ini</string>
     <string name="abbreviation_seconds">dtk</string>
@@ -145,7 +145,7 @@
     <string name="track_list_onboarding_h1_part_2">... akan muncul di sini.</string>
     <string name="track_list_onboarding_h1_part_1">Jalur rekaman Anda</string>
     <string name="layout_onboarding_description_app_icon">Ikon Aplikasi Trackbook</string>
-    <string name="quick_settings_tile_title_stop">Hentikan Perekaman</string>
+    <string name="quick_settings_tile_title_pause">Hentikan Perekaman</string>
     <string name="quick_settings_tile_title_start">Mulai Perekaman</string>
     <string name="quick_settings_tile_title_default">Rekaman</string>
     <string name="statistics_sheet_p_velocity">Kecepatan rata-rata:</string>
@@ -177,15 +177,14 @@
     <string name="dialog_share_gpx">Bagikan file GPX dengan</string>
     <string name="dialog_rename_track_input_hint">Masukkan nama baru</string>
     <string name="dialog_rename_track_button">Ubah nama</string>
-    <string name="dialog_error_empty_recording_action_resume">Lanjutkan Perekaman</string>
+    <string name="dialog_error_empty_recording_button_resume">Lanjutkan Perekaman</string>
     <string name="dialog_error_empty_recording_message">Trackbook tidak merekam titik arah sejauh ini.</string>
-    <string name="dialog_error_empty_recording_title">Tidak bisa menyimpan</string>
     <string name="dialog_generic_details_button">Tampilkan detil</string>
     <string name="dialog_generic_button_okay">Oke</string>
     <string name="dialog_generic_button_cancel">Batalkan</string>
-    <string name="fab_sub_menu_resume">Lanjutkan</string>
-    <string name="fab_sub_menu_save">Simpan</string>
-    <string name="fab_sub_menu_clear">Bersihkan</string>
+    <string name="button_resume">Lanjutkan</string>
+    <string name="button_save">Simpan</string>
+    <string name="button_delete">Bersihkan</string>
     <string name="snackbar_message_location_permission_denied">Izin lokasi tak diberikan. Trackbook tidak akan berfungsi.</string>
     <string name="snackbar_message_location_offline">Lokasi dimatikan. Trackbook tidak akan berfungsi.</string>
     <string name="notification_channel_recording_description">Tampilan durasi dan jarak. Opsi untuk menghentikan perekaman gerakan.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 32e7e75..5a85c36 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -10,7 +10,7 @@
     <!-- Notification -->
     <string name="notification_title_trackbook_running">Trackbook in esecuzione</string>
     <string name="notification_title_trackbook_not_running">Trackbook non in esecuzione</string>
-    <string name="notification_stop">Ferma</string>
+    <string name="notification_pause">Ferma</string>
     <string name="notification_resume">Riprendi</string>
     <string name="notification_show">Mostra</string>
     <string name="notification_channel_recording_name">Stato della registrazione del movimento</string>
@@ -19,16 +19,15 @@
     <string name="snackbar_message_location_offline">La posizione è disattivata. Trackbook non funzionerà.</string>
     <string name="snackbar_message_location_permission_denied">Autorizzazione alla posizione non concessa. Trackbook non funzionerà.</string>
     <!-- FAB Sub Menu -->
-    <string name="fab_sub_menu_clear">Cancella</string>
-    <string name="fab_sub_menu_save">Salva</string>
-    <string name="fab_sub_menu_resume">Riprendi</string>
+    <string name="button_delete">Cancella</string>
+    <string name="button_save">Salva</string>
+    <string name="button_resume">Riprendi</string>
     <!-- Dialogs -->
     <string name="dialog_generic_button_cancel">Annulla</string>
     <string name="dialog_generic_button_okay">OK</string>
     <string name="dialog_generic_details_button">Dettagli</string>
-    <string name="dialog_error_empty_recording_title">Impossibile salvare</string>
     <string name="dialog_error_empty_recording_message">Trackbook non ha registrato nessuna tappa intermedia finora.</string>
-    <string name="dialog_error_empty_recording_action_resume">Riprendi la registrazione</string>
+    <string name="dialog_error_empty_recording_button_resume">Riprendi la registrazione</string>
     <string name="dialog_rename_track_button">Rinomina</string>
     <string name="dialog_rename_track_input_hint">Inserisci un nuovo nome</string>
     <string name="dialog_share_gpx">Condividi il file GPX con</string>
@@ -64,7 +63,7 @@
     <!-- Recording Quick Settings Tile -->
     <string name="quick_settings_tile_title_default">Registrazione</string>
     <string name="quick_settings_tile_title_start">Avvia registrazione</string>
-    <string name="quick_settings_tile_title_stop">Ferma registrazione</string>
+    <string name="quick_settings_tile_title_pause">Ferma registrazione</string>
     <!-- Onboarding Layout -->
     <string name="layout_onboarding_description_app_icon">Icona dell\'applicazione Trackbook</string>
     <!-- Track Tab Onboarding -->
@@ -103,13 +102,13 @@
     <!-- Descriptions -->
     <string name="descr_map_current_track">Mappatura della traccia corrente</string>
     <string name="descr_map_last_track">Mappatura dell\'ultima traccia</string>
-    <string name="descr_fab_main_start">Pulsante Avvia registrazione</string>
-    <string name="descr_fab_sub_menu_button_save">Pulsante Salva</string>
-    <string name="descr_fab_sub_menu_button_clear">Pulsante Cancella</string>
-    <string name="descr_fab_sub_menu_button_resume">Pulsante Riprendi</string>
+    <string name="descr_button_start">Pulsante Avvia registrazione</string>
+    <string name="descr_button_save">Pulsante Salva</string>
+    <string name="descr_button_delete">Pulsante Cancella</string>
+    <string name="descr_button_resume">Pulsante Riprendi</string>
     <string name="descr_mark_starred_button">Segna come preferito</string>
     <string name="descr_quick_settings_tile_title_start">Inizia registrazione</string>
-    <string name="descr_quick_settings_tile_title_stop">Ferma Registrazione</string>
+    <string name="descr_quick_settings_tile_title_pause">Ferma Registrazione</string>
     <string name="descr_statistics_sheet_delete_button">Tasto cancella traccia</string>
     <string name="descr_statistics_sheet_edit_button">Tasto modifica traccia</string>
     <string name="descr_statistics_sheet_save_button">Tasto salva come GPX</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f41c2d8..4933068 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -8,7 +8,7 @@
     <!-- notification -->
     <string name="notification_title_trackbook_running">Trackbook 実行中</string>
     <string name="notification_title_trackbook_not_running">Trackbook は実行していません</string>
-    <string name="notification_stop">停止</string>
+    <string name="notification_pause">停止</string>
     <string name="notification_resume">再開</string>
     <string name="notification_show">表示</string>
     <string name="notification_channel_recording_name">移動記録状態</string>
@@ -16,14 +16,13 @@
     <!-- snackbar messages -->
     <string name="snackbar_message_location_offline">位置情報がオフです。Trackbook は動作しません。</string>
     <!-- fab sub menu_bottom_navigation -->
-    <string name="fab_sub_menu_clear">クリア</string>
-    <string name="fab_sub_menu_save">保存してクリア</string>
-    <string name="fab_sub_menu_resume">再開</string>
+    <string name="button_delete">クリア</string>
+    <string name="button_save">保存してクリア</string>
+    <string name="button_resume">再開</string>
     <!-- dialogs -->
     <string name="dialog_share_gpx">GPX ファイルを共有...</string>
-    <string name="dialog_error_empty_recording_title">保存できません</string>
     <string name="dialog_error_empty_recording_message">トラックブックはこれまでウェイポイントを記録していません。</string>
-    <string name="dialog_error_empty_recording_action_resume">記録を再開</string>
+    <string name="dialog_error_empty_recording_button_resume">記録を再開</string>
     <!-- toast messages -->
     <string name="toast_message_elevation_info">ヒント: 標高データの精度は、お使いのデバイスによって異なります。ルート全体の上り坂と下り坂の標高を測定します。</string>
     <string name="toast_message_install_file_helper">先にファイルマネージャか GPX トレースビューアーをインストールしてください。</string>
@@ -50,10 +49,10 @@
     <!-- descriptions -->
     <string name="descr_map_current_track">現在のトレースのマッピング</string>
     <string name="descr_map_last_track">最後のトレースのマッピング</string>
-    <string name="descr_fab_main_start">記録開始ボタン</string>
-    <string name="descr_fab_sub_menu_button_save">保存ボタン</string>
-    <string name="descr_fab_sub_menu_button_clear">クリアボタン</string>
-    <string name="descr_fab_sub_menu_button_resume">再開ボタン</string>
+    <string name="descr_button_start">記録開始ボタン</string>
+    <string name="descr_button_save">保存ボタン</string>
+    <string name="descr_button_delete">クリアボタン</string>
+    <string name="descr_button_resume">再開ボタン</string>
     <string name="descr_statistics_sheet_delete_button">トレース削除ボタン</string>
     <string name="descr_statistics_sheet_save_button">GPX としてエクスポートする共有ボタン</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index c06973a..92335aa 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -8,7 +8,7 @@
     <!-- notification -->
     <string name="notification_title_trackbook_running">Trackbook kjører</string>
     <string name="notification_title_trackbook_not_running">Trackbook kjører ikke</string>
-    <string name="notification_stop">Stopp</string>
+    <string name="notification_pause">Stopp</string>
     <string name="notification_resume">Fortsett</string>
     <string name="notification_show">Vis</string>
     <string name="notification_channel_recording_name">Bevegelsesopptakstilstand</string>
@@ -16,14 +16,13 @@
     <!-- snackbar messages -->
     <string name="snackbar_message_location_offline">Plassering avskrudd. Trackbook bil ikke fungere.</string>
     <!-- fab sub menu_bottom_navigation -->
-    <string name="fab_sub_menu_clear">Tøm</string>
-    <string name="fab_sub_menu_save">Lagre og tøm</string>
-    <string name="fab_sub_menu_resume">Fortsett</string>
+    <string name="button_delete">Tøm</string>
+    <string name="button_save">Lagre og tøm</string>
+    <string name="button_resume">Fortsett</string>
     <!-- dialogs -->
     <string name="dialog_share_gpx">Del GPX-fil med</string>
-    <string name="dialog_error_empty_recording_title">Kunne ikke lagre</string>
     <string name="dialog_error_empty_recording_message">Trackbook har ikke registrert noen veipunkter så langt.</string>
-    <string name="dialog_error_empty_recording_action_resume">Gjenoppta opptak</string>
+    <string name="dialog_error_empty_recording_button_resume">Gjenoppta opptak</string>
     <!-- toast messages -->
     <string name="toast_message_elevation_info">Hint: Høydedataens nøyaktighet avhenger av enheten din. Opp og ned-stigningen for hele ruten måles.</string>
     <string name="toast_message_install_file_helper">Klarte ikke å lagre. Installer en filbehandler først.</string>
@@ -50,10 +49,10 @@
     <!-- descriptions -->
     <string name="descr_map_current_track">Kartlegging av nåværende spor</string>
     <string name="descr_map_last_track">Kartlegging av forrige spor</string>
-    <string name="descr_fab_main_start">Opptaksstart-knapp</string>
-    <string name="descr_fab_sub_menu_button_save">Lagre opptak</string>
-    <string name="descr_fab_sub_menu_button_clear">Fjern opptak</string>
-    <string name="descr_fab_sub_menu_button_resume">Fortsett opptak</string>
+    <string name="descr_button_start">Opptaksstart-knapp</string>
+    <string name="descr_button_save">Lagre opptak</string>
+    <string name="descr_button_delete">Fjern opptak</string>
+    <string name="descr_button_resume">Fortsett opptak</string>
     <string name="descr_statistics_sheet_delete_button">Sporslettingsknapp</string>
     <string name="descr_statistics_sheet_save_button">Delingsknapp som muliggjør eksport som GPX</string>
     <string name="tab_tracks">Spor</string>
@@ -86,9 +85,9 @@
     <string name="descr_statistics_sheet_edit_button">Sporredigeringsknapp</string>
     <string name="quick_settings_tile_title_default">Opptak</string>
     <string name="quick_settings_tile_title_start">Start opptak</string>
-    <string name="quick_settings_tile_title_stop">Stopp opptak</string>
+    <string name="quick_settings_tile_title_pause">Stopp opptak</string>
     <string name="descr_quick_settings_tile_title_start">Start opptak</string>
-    <string name="descr_quick_settings_tile_title_stop">Stopp opptak</string>
+    <string name="descr_quick_settings_tile_title_pause">Stopp opptak</string>
     <string name="pref_theme_selection_mode_dark">Mørkt modus</string>
     <string name="pref_theme_selection_mode_device_default">Samme som enhet</string>
     <string name="pref_theme_selection_mode_light">Lyst modus</string>
@@ -114,5 +113,5 @@
     <string name="track_list_p_element_statistics">Totalavstand registrert</string>
     <string name="pref_recording_accuracy_summary_default">Veipunkter har lavere nøyaktighet, men er hyppigere.</string>
     <string name="pref_recording_accuracy_title">Opptaksnøyaktighet</string>
-    <string name="descr_fab_location">Sentrer på nåværende sted</string>
+    <string name="descr_button_location">Sentrer på nåværende sted</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e4f3d72..b7a66c2 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -8,7 +8,7 @@
     <!-- notification -->
     <string name="notification_title_trackbook_running">Trackbook is actief</string>
     <string name="notification_title_trackbook_not_running">Trackbook is niet actief</string>
-    <string name="notification_stop">Stoppen</string>
+    <string name="notification_pause">Stoppen</string>
     <string name="notification_resume">Hervatten</string>
     <string name="notification_show">Tonen</string>
     <string name="notification_channel_recording_name">Bewegingsopname status</string>
@@ -16,14 +16,13 @@
     <!-- snackbar messages -->
     <string name="snackbar_message_location_offline">Locatieservice is uitgeschakeld. Trackbook zal niet werken.</string>
     <!-- fab sub menu_bottom_navigation -->
-    <string name="fab_sub_menu_clear">Wissen</string>
-    <string name="fab_sub_menu_save">Opslaan</string>
-    <string name="fab_sub_menu_resume">Hervatten</string>
+    <string name="button_delete">Wissen</string>
+    <string name="button_save">Opslaan</string>
+    <string name="button_resume">Hervatten</string>
     <!-- dialogs -->
     <string name="dialog_share_gpx">GPX-bestand delen met</string>
-    <string name="dialog_error_empty_recording_title">Opslaan niet mogelijk</string>
     <string name="dialog_error_empty_recording_message">Trackbook heeft nog geen routepunten vastgelegd.</string>
-    <string name="dialog_error_empty_recording_action_resume">Opnemen hervatten</string>
+    <string name="dialog_error_empty_recording_button_resume">Opnemen hervatten</string>
     <!-- toast messages -->
     <string name="toast_message_elevation_info">Tip: De nauwkeurigheid van de hoogtemeter hangt af van uw toestel. De stijging en daling van de hele afstand wordt gemeten.</string>
     <string name="toast_message_install_file_helper">Kan niet opslaan. Installeer eerst een bestandsbeheerder.</string>
@@ -50,10 +49,10 @@
     <!-- descriptions -->
     <string name="descr_map_current_track">Kaartweergave van huidige route</string>
     <string name="descr_map_last_track">Kaart van de laatste route</string>
-    <string name="descr_fab_main_start">Start opname</string>
-    <string name="descr_fab_sub_menu_button_save">Opname opslaan</string>
-    <string name="descr_fab_sub_menu_button_clear">Opname wissen</string>
-    <string name="descr_fab_sub_menu_button_resume">Opname hervatten</string>
+    <string name="descr_button_start">Start opname</string>
+    <string name="descr_button_save">Opname opslaan</string>
+    <string name="descr_button_delete">Opname wissen</string>
+    <string name="descr_button_resume">Opname hervatten</string>
     <string name="descr_statistics_sheet_delete_button">Route verwijderen</string>
     <string name="descr_statistics_sheet_save_button">Opslaan als GPX</string>
     <string name="tab_tracks">Routes</string>
@@ -86,9 +85,9 @@
     <string name="descr_statistics_sheet_edit_button">Route aanpassen</string>
     <string name="quick_settings_tile_title_default">Opname</string>
     <string name="quick_settings_tile_title_start">Opname starten</string>
-    <string name="quick_settings_tile_title_stop">Opname stoppen</string>
+    <string name="quick_settings_tile_title_pause">Opname stoppen</string>
     <string name="descr_quick_settings_tile_title_start">Opname starten</string>
-    <string name="descr_quick_settings_tile_title_stop">Opname stoppen</string>
+    <string name="descr_quick_settings_tile_title_pause">Opname stoppen</string>
     <string name="pref_theme_selection_mode_dark">Donkere modus</string>
     <string name="pref_theme_selection_mode_device_default">Zelfde als toestel</string>
     <string name="pref_theme_selection_mode_light">Lichte modus</string>
@@ -114,5 +113,5 @@
     <string name="pref_recording_accuracy_summary_default">Routepunten zijn minder nauwkeurig, maar frequenter.</string>
     <string name="pref_recording_accuracy_summary_high">Routepunten zijn nauwkeuriger, maar minder frequent.</string>
     <string name="track_list_p_element_statistics">Totaal afgelegde afstand</string>
-    <string name="descr_fab_location">Centreren op huidige locatie</string>
+    <string name="descr_button_location">Centreren op huidige locatie</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0ecfc65..9b41a99 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,34 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="dialog_error_empty_recording_title">Błąd podczas zapisu</string>
     <string name="dialog_generic_details_button">Pokaż szczegóły</string>
     <string name="dialog_generic_button_okay">OK</string>
     <string name="dialog_generic_button_cancel">Anuluj</string>
-    <string name="fab_sub_menu_resume">Kontynuuj</string>
-    <string name="fab_sub_menu_save">Zapisz</string>
-    <string name="fab_sub_menu_clear">Wyczyść</string>
+    <string name="button_resume">Kontynuuj</string>
+    <string name="button_save">Zapisz</string>
+    <string name="button_delete">Wyczyść</string>
     <string name="snackbar_message_location_offline">Lokalizacja jest wyłączona. Trackbook nie będzie działać.</string>
     <string name="notification_channel_recording_description">Pokaż czas oraz przebyty dystans. Opcja którą można zatrzymać zapisywanie ruchu.</string>
     <string name="notification_channel_recording_name">Status Zapisywania Ruchu</string>
     <string name="notification_show">Pokaż</string>
     <string name="notification_resume">Kontynuuj</string>
-    <string name="notification_stop">Zatrzymaj</string>
+    <string name="notification_pause">Zatrzymaj</string>
     <string name="notification_title_trackbook_not_running">Trackbook zatrzymany</string>
     <string name="notification_title_trackbook_running">Trackbook uruchomiony</string>
     <string name="tab_settings">Ustawienia</string>
     <string name="tab_tracks">Trasy</string>
     <string name="tab_map">Mapa</string>
     <string name="pref_theme_selection_mode_device_default">Tak jak urządzenie</string>
-    <string name="descr_fab_sub_menu_button_clear">Wyczyść przycisk</string>
+    <string name="descr_button_delete">Wyczyść przycisk</string>
     <string name="descr_statistics_sheet_delete_button">Przycisk usuwania ścieżki</string>
-    <string name="descr_quick_settings_tile_title_stop">Zatrzymaj nagrywanie</string>
+    <string name="descr_quick_settings_tile_title_pause">Zatrzymaj nagrywanie</string>
     <string name="descr_quick_settings_tile_title_start">Rozpocznij nagrywanie</string>
     <string name="dialog_yes_no_positive_button_delete_recording">Usuń</string>
     <string name="abbreviation_seconds">s</string>
     <string name="descr_statistics_sheet_save_button">Zapisz jako GPX przycisk</string>
     <string name="descr_statistics_sheet_edit_button">Przycisk edycji ścieżki</string>
-    <string name="descr_fab_sub_menu_button_save">Przycisk Zapisz</string>
-    <string name="descr_fab_main_start">Przycisk rozpoczęcia nagrywania</string>
+    <string name="descr_button_save">Przycisk Zapisz</string>
+    <string name="descr_button_start">Przycisk rozpoczęcia nagrywania</string>
     <string name="pref_imperial_measurement_units_title">Używaj miar imperialnych</string>
     <string name="descr_map_last_track">Mapowanie ostatniej ścieżki</string>
     <string name="descr_mark_starred_button">Przycisk Oznacz jako gwiazdę</string>
@@ -48,7 +47,7 @@
     <string name="marker_description_time">Czas</string>
     <string name="snackbar_message_location_permission_denied">Nie udzielono zezwolenia na lokalizację. Trackbook nie będzie działać.</string>
     <string name="dialog_rename_track_input_hint">Wpisz nową nazwę</string>
-    <string name="dialog_error_empty_recording_action_resume">Zapis życiorysu</string>
+    <string name="dialog_error_empty_recording_button_resume">Zapis życiorysu</string>
     <string name="toast_message_elevation_info">Wskazówka: Dokładność danych dotyczących wysokości zależy od urządzenia użytkownika. Mierzone jest wzniesienie i zejście całej trasy.</string>
     <string name="toast_message_install_file_helper">Nie można zapisać. Proszę najpierw zainstalować menedżera plików.</string>
     <string name="statistics_sheet_p_steps">Podjęte kroki:</string>
@@ -80,14 +79,14 @@
     <string name="pref_recording_accuracy_title">Dokładność zapisu</string>
     <string name="pref_recording_accuracy_summary_default">Punkty trasy mają mniejszą dokładność, ale są częstsze.</string>
     <string name="pref_recording_accuracy_summary_high">Punkty trasy mają większą dokładność, ale występują rzadziej.</string>
-    <string name="descr_fab_sub_menu_button_resume">Przycisk Wznów</string>
+    <string name="descr_button_resume">Przycisk Wznów</string>
     <string name="descr_map_current_track">Odwzorowanie bieżącego toru</string>
     <string name="abbreviation_minutes">min</string>
     <string name="abbreviation_hours">godz</string>
     <string name="pref_theme_selection_title">Aplikacja Temat</string>
     <string name="pref_theme_selection_summary">Aktualny temat:</string>
     <string name="quick_settings_tile_title_start">Zacznij nagrywanie</string>
-    <string name="quick_settings_tile_title_stop">Zatrzymaj zapis</string>
+    <string name="quick_settings_tile_title_pause">Zatrzymaj zapis</string>
     <string name="layout_onboarding_description_app_icon">Ikona Trackbook App</string>
     <string name="statistics_sheet_p_positive_elevation">Wysokość (w górę):</string>
     <string name="quick_settings_tile_title_default">Zapisywanie</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 57c096b..c3eee3e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -11,7 +11,7 @@
     <!-- Notification -->
     <string name="notification_title_trackbook_running">Trackbook em execução</string>
     <string name="notification_title_trackbook_not_running">Trackbook parado</string>
-    <string name="notification_stop">Parar</string>
+    <string name="notification_pause">Parar</string>
     <string name="notification_resume">Retomar</string>
     <string name="notification_show">Mostrar</string>
     <string name="notification_channel_recording_name">Gravando Estado De Movimento</string>
@@ -20,16 +20,15 @@
     <string name="snackbar_message_location_offline">Localização está desligada. Trackbook não funcionará.</string>
     <string name="snackbar_message_location_permission_denied">Permissão de localização não liberada. Trackbook não funcionará.</string>
     <!-- FAB Sub Menu -->
-    <string name="fab_sub_menu_clear">Limpar</string>
-    <string name="fab_sub_menu_save">Salvar</string>
-    <string name="fab_sub_menu_resume">Retomar</string>
+    <string name="button_delete">Limpar</string>
+    <string name="button_save">Salvar</string>
+    <string name="button_resume">Retomar</string>
     <!-- Dialogs -->
     <string name="dialog_generic_button_cancel">Cancelar</string>
     <string name="dialog_generic_button_okay">OK</string>
     <string name="dialog_generic_details_button">Mostrar detalhes</string>
-    <string name="dialog_error_empty_recording_title">Incapaz de salvar</string>
     <string name="dialog_error_empty_recording_message">Trackbook não registrou nenhum ponto de passagem até agora.</string>
-    <string name="dialog_error_empty_recording_action_resume">Retomar gravação</string>
+    <string name="dialog_error_empty_recording_button_resume">Retomar gravação</string>
     <string name="dialog_rename_track_button">Renomear</string>
     <string name="dialog_rename_track_input_hint">Insira um novo nome</string>
     <string name="dialog_share_gpx">Compartilhar arquivo GPX com</string>
@@ -65,7 +64,7 @@
     <!-- Recording Quick Settings Tile -->
     <string name="quick_settings_tile_title_default">Gravação</string>
     <string name="quick_settings_tile_title_start">Iniciar gravação</string>
-    <string name="quick_settings_tile_title_stop">Parar gravação</string>
+    <string name="quick_settings_tile_title_pause">Parar gravação</string>
     <!-- Onboarding Layout -->
     <string name="layout_onboarding_description_app_icon">Trackbook ícone do aplicativo</string>
     <!-- Track Tab Onboarding -->
@@ -104,13 +103,13 @@
     <!-- Descriptions -->
     <string name="descr_map_current_track">Mapeamento da trilha atual</string>
     <string name="descr_map_last_track">Mapeamento da última trilha</string>
-    <string name="descr_fab_main_start">Botão para iniciar gravação</string>
-    <string name="descr_fab_sub_menu_button_save">Botão salvar</string>
-    <string name="descr_fab_sub_menu_button_clear">Bototão limpar</string>
-    <string name="descr_fab_sub_menu_button_resume">Botão retomar</string>
+    <string name="descr_button_start">Botão para iniciar gravação</string>
+    <string name="descr_button_save">Botão salvar</string>
+    <string name="descr_button_delete">Bototão limpar</string>
+    <string name="descr_button_resume">Botão retomar</string>
     <string name="descr_mark_starred_button">Botão marcar com estrela</string>
     <string name="descr_quick_settings_tile_title_start">Iniciar gravação</string>
-    <string name="descr_quick_settings_tile_title_stop">Parar gravação</string>
+    <string name="descr_quick_settings_tile_title_pause">Parar gravação</string>
     <string name="descr_statistics_sheet_delete_button">Botão apagar rota</string>
     <string name="descr_statistics_sheet_edit_button">Botão editar rota</string>
     <string name="descr_statistics_sheet_save_button">Botão salvar como GPX</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ba83c8c..7378cdb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -28,22 +28,21 @@
     <string name="dialog_share_gpx">Поделиться файлом GPX через</string>
     <string name="dialog_rename_track_input_hint">Введите новое имя</string>
     <string name="dialog_rename_track_button">Переименовать</string>
-    <string name="dialog_error_empty_recording_action_resume">Возобновить запись</string>
+    <string name="dialog_error_empty_recording_button_resume">Возобновить запись</string>
     <string name="dialog_error_empty_recording_message">В Trackbook пока что не записаны путевые точки.</string>
-    <string name="dialog_error_empty_recording_title">Не удалось сохранить</string>
     <string name="dialog_generic_details_button">Показать подробности</string>
     <string name="dialog_generic_button_okay">ОЕ</string>
     <string name="dialog_generic_button_cancel">Отмена</string>
-    <string name="fab_sub_menu_resume">Продолжить</string>
-    <string name="fab_sub_menu_save">Сохранить</string>
-    <string name="fab_sub_menu_clear">Очистить</string>
+    <string name="button_resume">Продолжить</string>
+    <string name="button_save">Сохранить</string>
+    <string name="button_delete">Очистить</string>
     <string name="snackbar_message_location_permission_denied">Разрешение на определение местоположения не предоставлено. Trackbook работать не будет.</string>
     <string name="snackbar_message_location_offline">Местоположение отключено. Trackbook работать не будет.</string>
     <string name="notification_channel_recording_description">Отображение продолжительности и расстояния. Возможность остановить запись движения.</string>
     <string name="notification_channel_recording_name">Состояние записи движения</string>
     <string name="notification_show">Показать</string>
     <string name="notification_resume">Продолжить</string>
-    <string name="notification_stop">Остановить</string>
+    <string name="notification_pause">Остановить</string>
     <string name="notification_title_trackbook_not_running">Trackbook не запущен</string>
     <string name="notification_title_trackbook_running">Trackbook запущен</string>
     <string name="tab_settings">Настройки</string>
@@ -58,7 +57,7 @@
     <string name="statistics_sheet_p_min_altitude">Низшая путевая точка:</string>
     <string name="statistics_sheet_p_max_altitude">Наивысшая путевая точка:</string>
     <string name="statistics_sheet_p_negative_elevation">Возвышение (спуск):</string>
-    <string name="quick_settings_tile_title_stop">Остановить запись</string>
+    <string name="quick_settings_tile_title_pause">Остановить запись</string>
     <string name="quick_settings_tile_title_start">Начать запись</string>
     <string name="layout_onboarding_description_app_icon">Иконка приложения Trackbook</string>
     <string name="track_list_onboarding_h1_part_2">... появится здесь.</string>
@@ -89,13 +88,13 @@
     <string name="pref_maintenance_title">Обслуживание</string>
     <string name="pref_delete_non_starred_title">Удаление записей, не включенных в список</string>
     <string name="track_list_p_element_statistics">Общее зарегистрированное расстояние</string>
-    <string name="descr_quick_settings_tile_title_stop">Остановить запись</string>
+    <string name="descr_quick_settings_tile_title_pause">Остановить запись</string>
     <string name="descr_quick_settings_tile_title_start">Начать запись</string>
     <string name="descr_mark_starred_button">Кнопка \"Пометить звездой</string>
-    <string name="descr_fab_sub_menu_button_resume">Кнопка резюме</string>
-    <string name="descr_fab_sub_menu_button_clear">Кнопка очистки</string>
-    <string name="descr_fab_sub_menu_button_save">Кнопка сохранения</string>
-    <string name="descr_fab_main_start">Кнопка начала записи</string>
+    <string name="descr_button_resume">Кнопка резюме</string>
+    <string name="descr_button_delete">Кнопка очистки</string>
+    <string name="descr_button_save">Кнопка сохранения</string>
+    <string name="descr_button_start">Кнопка начала записи</string>
     <string name="descr_map_last_track">Отображение последнего трека</string>
     <string name="pref_theme_selection_mode_device_default">Аналогично устройству</string>
     <string name="descr_statistics_sheet_edit_button">Кнопка редактирования трека</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 3b14071..840ced0 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -9,7 +9,7 @@
     <!-- notification -->
     <string name="notification_title_trackbook_running">Trackbook körs</string>
     <string name="notification_title_trackbook_not_running">Trackbook körs inte</string>
-    <string name="notification_stop">Stopp</string>
+    <string name="notification_pause">Stopp</string>
     <string name="notification_resume">Återuppta</string>
     <string name="notification_show">Visa</string>
     <!--<string name="notification_channel_recording_name"></string>-->
@@ -17,14 +17,13 @@
     <!-- snackbar messages -->
     <string name="snackbar_message_location_offline">Plats är avstängt. Trackbook kommer inte fungera.</string>
     <!-- fab sub menu_bottom_navigation -->
-    <string name="fab_sub_menu_clear">Rensa</string>
-    <string name="fab_sub_menu_save">Spara</string>
-    <string name="fab_sub_menu_resume">Återuppta</string>
+    <string name="button_delete">Rensa</string>
+    <string name="button_save">Spara</string>
+    <string name="button_resume">Återuppta</string>
     <!-- dialogs -->
     <string name="dialog_share_gpx">Dela GPX-fil med</string>
-    <string name="dialog_error_empty_recording_title">Kunde inte spara</string>
     <string name="dialog_error_empty_recording_message">Trackbook spelade inte in några vägpunkter så här långt.</string>
-    <string name="dialog_error_empty_recording_action_resume">Återuppta inspelning</string>
+    <string name="dialog_error_empty_recording_button_resume">Återuppta inspelning</string>
     <!-- toast messages -->
     <!--<string name="toast_message_permissions_granted"></string>-->
     <!--<string name="toast_message_no_external_storage"></string>-->
@@ -106,8 +105,8 @@
     <string name="pref_app_version_summary">Version</string>
     <string name="pref_about_title">Om</string>
     <string name="track_list_p_element_statistics">Totalt registrerat avstånd</string>
-    <string name="descr_fab_sub_menu_button_clear">Rensa inspelning</string>
-    <string name="descr_fab_sub_menu_button_save">Spara inspelning</string>
+    <string name="descr_button_delete">Rensa inspelning</string>
+    <string name="descr_button_save">Spara inspelning</string>
     <string name="abbreviation_hours">timmar</string>
     <string name="pref_theme_selection_title">Tema för appen</string>
     <string name="pref_theme_selection_mode_light">Ljusläge</string>
@@ -120,7 +119,7 @@
     <string name="track_list_onboarding_h1_part_2">... kommer att visas här.</string>
     <string name="track_list_onboarding_h1_part_1">Dina inspelade spår</string>
     <string name="layout_onboarding_description_app_icon">Ikon för Trackbook-appen</string>
-    <string name="quick_settings_tile_title_stop">Stoppa inspelningen</string>
+    <string name="quick_settings_tile_title_pause">Stoppa inspelningen</string>
     <string name="quick_settings_tile_title_start">Starta inspelning</string>
     <string name="quick_settings_tile_title_default">Inspelning</string>
     <string name="statistics_sheet_p_velocity">Genomsnittlig hastighet:</string>
@@ -154,14 +153,14 @@
     <string name="tab_tracks">Spår</string>
     <string name="descr_statistics_sheet_delete_button">Knapp för radering av spår</string>
     <string name="descr_statistics_sheet_save_button">Spara som GPX-knapp</string>
-    <string name="descr_quick_settings_tile_title_stop">Stoppa inspelningen</string>
+    <string name="descr_quick_settings_tile_title_pause">Stoppa inspelningen</string>
     <string name="descr_mark_starred_button">Markera som stjärnmärkt</string>
-    <string name="descr_fab_sub_menu_button_resume">Återuppta inspelning</string>
+    <string name="descr_button_resume">Återuppta inspelning</string>
     <string name="pref_recording_accuracy_summary_default">Vägpunkter har lägre noggrannhet men är mer frekventa.</string>
     <string name="statistics_sheet_p_duration">Total varaktighet:</string>
     <string name="pref_gps_only_summary_gps_only">För närvarande används endast GPS för lokalisering.</string>
     <string name="pref_delete_non_starred_summary">Ta bort alla inspelningar i \"Tracks\" som inte har stjärnor.</string>
-    <string name="descr_fab_main_start">Starta inspelning</string>
+    <string name="descr_button_start">Starta inspelning</string>
     <string name="pref_theme_selection_summary">Aktuellt tema:</string>
     <string name="statistics_sheet_p_steps_no_pedometer">Pedometer inte tillgänglig</string>
     <string name="pref_imperial_measurement_units_title">Använd brittiska mått</string>
@@ -169,5 +168,5 @@
     <string name="statistics_sheet_p_waypoints">Inspelade waypoints:</string>
     <string name="snackbar_message_location_permission_denied">Tillstånd för placering inte beviljat. Trackbook fungerar inte.</string>
     <string name="notification_channel_recording_description">Visa varaktighet och avstånd. Möjlighet att stoppa rörelseinspelningen.</string>
-    <string name="descr_fab_location">Centrera på aktuell plats</string>
+    <string name="descr_button_location">Centrera på aktuell plats</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 02e22ca..1c51a0c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -3,15 +3,15 @@
     <string name="descr_statistics_sheet_save_button">GPX olarak kaydet düğmesi</string>
     <string name="descr_statistics_sheet_edit_button">Yol düzenleme düğmesi</string>
     <string name="descr_statistics_sheet_delete_button">Yol silme düğmesi</string>
-    <string name="descr_quick_settings_tile_title_stop">Kaydı Durdur</string>
+    <string name="descr_quick_settings_tile_title_pause">Kaydı Durdur</string>
     <string name="descr_quick_settings_tile_title_start">Kaydı Başlat</string>
     <string name="descr_mark_starred_button">Yıldızlı olarak işaretle düğmesi</string>
-    <string name="descr_fab_sub_menu_button_resume">Kaydı devam ettir</string>
+    <string name="descr_button_resume">Kaydı devam ettir</string>
     <string name="notification_resume">Devam ettir</string>
-    <string name="fab_sub_menu_resume">Devam ettir</string>
-    <string name="descr_fab_sub_menu_button_clear">Kaydı temizle</string>
-    <string name="descr_fab_sub_menu_button_save">Kaydı kaydet</string>
-    <string name="descr_fab_main_start">Kaydı başlat düğmesi</string>
+    <string name="button_resume">Devam ettir</string>
+    <string name="descr_button_delete">Kaydı temizle</string>
+    <string name="descr_button_save">Kaydı kaydet</string>
+    <string name="descr_button_start">Kaydı başlat düğmesi</string>
     <string name="descr_map_last_track">Son yolun haritalanması</string>
     <string name="descr_map_current_track">Geçerli yolun haritalanması</string>
     <string name="abbreviation_seconds">sn</string>
@@ -45,9 +45,9 @@
     <string name="track_list_onboarding_h1_part_2">… burada görünecek.</string>
     <string name="track_list_onboarding_h1_part_1">Kaydedilen yollarınız</string>
     <string name="layout_onboarding_description_app_icon">Trackbook Uygulama Simgesi</string>
-    <string name="quick_settings_tile_title_stop">Kaydı Durdur</string>
+    <string name="quick_settings_tile_title_pause">Kaydı Durdur</string>
     <string name="quick_settings_tile_title_start">Kaydı Başlat</string>
-    <string name="dialog_error_empty_recording_action_resume">Kaydı Devam Ettir</string>
+    <string name="dialog_error_empty_recording_button_resume">Kaydı Devam Ettir</string>
     <string name="quick_settings_tile_title_default">Kayıt</string>
     <string name="statistics_sheet_p_velocity">Ortalama hız:</string>
     <string name="statistics_sheet_p_negative_elevation">Yükseklik (yokuş aşağı):</string>
@@ -79,18 +79,17 @@
     <string name="dialog_rename_track_input_hint">Yeni bir ad girin</string>
     <string name="dialog_rename_track_button">Yeniden adlandır</string>
     <string name="dialog_error_empty_recording_message">Trackbook şu ana kadar herhangi bir ara nokta kaydetmedi.</string>
-    <string name="dialog_error_empty_recording_title">Kaydedilemiyor</string>
     <string name="dialog_generic_details_button">Ayrıntıları göster</string>
     <string name="dialog_generic_button_okay">Tamam</string>
     <string name="dialog_generic_button_cancel">İptal</string>
-    <string name="fab_sub_menu_save">Kaydet</string>
-    <string name="fab_sub_menu_clear">Temizle</string>
+    <string name="button_save">Kaydet</string>
+    <string name="button_delete">Temizle</string>
     <string name="snackbar_message_location_permission_denied">Konum izni verilmedi. Trackbook çalışmayacak.</string>
     <string name="snackbar_message_location_offline">Konum kapalı. Trackbook çalışmayacak.</string>
     <string name="notification_channel_recording_description">Süre ve mesafeyi görüntüle. Hareket kaydını durdurma seçeneği.</string>
     <string name="notification_channel_recording_name">Hareket Kayıt Durumu</string>
     <string name="notification_show">Göster</string>
-    <string name="notification_stop">Dur</string>
+    <string name="notification_pause">Dur</string>
     <string name="notification_title_trackbook_not_running">Trackbook çalışmıyor</string>
     <string name="notification_title_trackbook_running">Trackbook çalışıyor</string>
     <string name="tab_settings">Ayarlar</string>
@@ -101,5 +100,5 @@
     <string name="pref_recording_accuracy_summary_default">Ara noktalar daha düşük doğruluğa sahiptir ancak daha sıktır.</string>
     <string name="pref_recording_accuracy_summary_high">Ara noktalar daha yüksek doğruluğa sahiptir ancak daha az sıklıktadır.</string>
     <string name="track_list_p_element_statistics">Kaydedilen Toplam Mesafe</string>
-    <string name="descr_fab_location">Geçerli konuma ortala</string>
+    <string name="descr_button_location">Geçerli konuma ortala</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 250488d..eb8662b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -10,7 +10,7 @@
     <!-- Notification -->
     <string name="notification_title_trackbook_running">Trackbook 正在运行</string>
     <string name="notification_title_trackbook_not_running">Trackbook 未在运行</string>
-    <string name="notification_stop">停止</string>
+    <string name="notification_pause">停止</string>
     <string name="notification_resume">恢复</string>
     <string name="notification_show">显示</string>
     <string name="notification_channel_recording_name">运动记录状态</string>
@@ -19,16 +19,15 @@
     <string name="snackbar_message_location_offline">定位已关闭。Trackbook 将不会运行。</string>
     <string name="snackbar_message_location_permission_denied">未被授予定位权限。Trackbook 将不会运行。</string>
     <!-- FAB Sub Menu -->
-    <string name="fab_sub_menu_clear">清除</string>
-    <string name="fab_sub_menu_save">保存</string>
-    <string name="fab_sub_menu_resume">恢复</string>
+    <string name="button_delete">清除</string>
+    <string name="button_save">保存</string>
+    <string name="button_resume">恢复</string>
     <!-- Dialogs -->
     <string name="dialog_generic_button_cancel">取消</string>
     <string name="dialog_generic_button_okay">确定</string>
     <string name="dialog_generic_details_button">显示详情</string>
-    <string name="dialog_error_empty_recording_title">无法保存</string>
     <string name="dialog_error_empty_recording_message">Trackbook 目前未记录任何航点。</string>
-    <string name="dialog_error_empty_recording_action_resume">恢复记录</string>
+    <string name="dialog_error_empty_recording_button_resume">恢复记录</string>
     <string name="dialog_rename_track_button">重命名</string>
     <string name="dialog_rename_track_input_hint">请输入一个新名称</string>
     <string name="dialog_share_gpx">分享 GPX 文件到</string>
@@ -64,7 +63,7 @@
     <!-- Recording Quick Settings Tile -->
     <string name="quick_settings_tile_title_default">记录</string>
     <string name="quick_settings_tile_title_start">开始记录</string>
-    <string name="quick_settings_tile_title_stop">停止记录</string>
+    <string name="quick_settings_tile_title_pause">停止记录</string>
     <!-- Onboarding Layout -->
     <string name="layout_onboarding_description_app_icon">Trackbook 程序图标</string>
     <!-- Track Tab Onboarding -->
@@ -108,14 +107,14 @@
     <!-- Descriptions -->
     <string name="descr_map_current_track">当前轨迹的航迹图</string>
     <string name="descr_map_last_track">最后一个轨迹的航迹图</string>
-    <string name="descr_fab_main_start">开始记录按钮</string>
-    <string name="descr_fab_sub_menu_button_save">保存录制</string>
-    <string name="descr_fab_sub_menu_button_clear">清除录制</string>
-    <string name="descr_fab_sub_menu_button_resume">恢复录制</string>
-    <string name="descr_fab_location">以当前位置为中心</string>
+    <string name="descr_button_start">开始记录按钮</string>
+    <string name="descr_button_save">保存录制</string>
+    <string name="descr_button_delete">清除录制</string>
+    <string name="descr_button_resume">恢复录制</string>
+    <string name="descr_button_location">以当前位置为中心</string>
     <string name="descr_mark_starred_button">加星按钮</string>
     <string name="descr_quick_settings_tile_title_start">开始记录</string>
-    <string name="descr_quick_settings_tile_title_stop">停止记录</string>
+    <string name="descr_quick_settings_tile_title_pause">停止记录</string>
     <string name="descr_statistics_sheet_delete_button">删除轨迹按钮</string>
     <string name="descr_statistics_sheet_edit_button">编辑轨迹按钮</string>
     <string name="descr_statistics_sheet_save_button">保存为 GPX 按钮</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9e1a99d..9927e12 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -26,8 +26,8 @@
     <color name="icon_lightweight">@color/trackbook_neutral_medium_light</color>
     <color name="icon_star_selected">@color/trackbook_blue</color>
 
-    <color name="recording_button_background">@color/trackbook_accent_intense</color>
-    <color name="recording_button_icon">@color/trackbook_neutral_very_dark</color>
+    <color name="recording_management_buttons_background">@color/trackbook_accent_intense</color>
+    <color name="recording_management_buttons_icon">@color/trackbook_neutral_very_dark</color>
 
     <color name="list_card_background">@color/trackbook_neutral_white</color>
     <color name="list_card_delete_background">@color/trackbook_red</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c6571fd..45a1b95 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,28 +11,29 @@
     <!-- Notification -->
     <string name="notification_title_trackbook_running">Trackbook running</string>
     <string name="notification_title_trackbook_not_running">Trackbook not running</string>
-    <string name="notification_stop">Stop</string>
+    <string name="notification_pause">Pause</string>
     <string name="notification_resume">Resume</string>
     <string name="notification_show">Show</string>
     <string name="notification_channel_recording_name">Movement Recording State</string>
-    <string name="notification_channel_recording_description">Display duration and distance. Option to stop movement recording.</string>
+    <string name="notification_channel_recording_description">Display duration and distance. Option to pause movement recording.</string>
     <!-- Snackbar Messages -->
     <string name="snackbar_message_location_offline">Location is turned off. Trackbook will not work.</string>
     <string name="snackbar_message_location_permission_denied">Location permission not granted. Trackbook will not work.</string>
-    <!-- FAB Sub Menu -->
-    <string name="fab_sub_menu_clear">Clear</string>
-    <string name="fab_sub_menu_save">Save</string>
-    <string name="fab_sub_menu_resume">Resume</string>
+    <!-- Buttons -->
+
+    <string name="button_delete">Delete</string>
+    <string name="button_pause">Pause</string>
+    <string name="button_resume">Resume</string>
+    <string name="button_save">Save</string>
+    <string name="button_start">Start</string>
     <!-- Dialogs -->
-    <string name="dialog_clear_recording_title">Clear recorded points?</string>
-    <string name="dialog_clear_recording_message">Clear all points and start a new track.</string>
-    <string name="dialog_clear_recording_action_resume">Clear</string>
+    <string name="dialog_delete_current_recording_message">Discard the current recording?</string>
+    <string name="dialog_delete_current_recording_button_discard">Discard</string>
     <string name="dialog_generic_button_cancel">Cancel</string>
     <string name="dialog_generic_button_okay">OK</string>
     <string name="dialog_generic_details_button">Show details</string>
-    <string name="dialog_error_empty_recording_title">Unable to save</string>
-    <string name="dialog_error_empty_recording_message">Trackbook did not record any waypoints so far.</string>
-    <string name="dialog_error_empty_recording_action_resume">Resume Recording</string>
+    <string name="dialog_error_empty_recording_message">Unable to save. Trackbook did not record any waypoints so far.</string>
+    <string name="dialog_error_empty_recording_button_resume">Resume Recording</string>
     <string name="dialog_rename_track_button">Rename</string>
     <string name="dialog_rename_track_input_hint">Enter a new name</string>
     <string name="dialog_share_gpx">Share GPX file with</string>
@@ -68,7 +69,7 @@
     <!-- Recording Quick Settings Tile -->
     <string name="quick_settings_tile_title_default">Recording</string>
     <string name="quick_settings_tile_title_start">Start Recording</string>
-    <string name="quick_settings_tile_title_stop">Stop Recording</string>
+    <string name="quick_settings_tile_title_pause">Pause Recording</string>
     <!-- Onboarding Layout -->
     <string name="layout_onboarding_description_app_icon">Trackbook App Icon</string>
     <!-- Track Tab Onboarding -->
@@ -112,16 +113,17 @@
     <string name="abbreviation_minutes">min</string>
     <string name="abbreviation_seconds">sec</string>
     <!-- Descriptions -->
+    <string name="descr_button_delete">Discard recording</string>
+    <string name="descr_button_location">Center on current location</string>
+    <string name="descr_button_pause">Pause recording</string>
+    <string name="descr_button_resume">Resume recording</string>
+    <string name="descr_button_save">Save recording</string>
+    <string name="descr_button_start">Start recording</string>
     <string name="descr_map_current_track">Mapping of current track</string>
     <string name="descr_map_last_track">Mapping of last track</string>
-    <string name="descr_fab_main_start">Start recording button</string>
-    <string name="descr_fab_sub_menu_button_save">Save recording</string>
-    <string name="descr_fab_sub_menu_button_clear">Clear recording</string>
-    <string name="descr_fab_sub_menu_button_resume">Resume recording</string>
-    <string name="descr_fab_location">Center on current location</string>
     <string name="descr_mark_starred_button">Mark as starred button</string>
     <string name="descr_quick_settings_tile_title_start">Start Recording</string>
-    <string name="descr_quick_settings_tile_title_stop">Stop Recording</string>
+    <string name="descr_quick_settings_tile_title_pause">Pause Recording</string>
     <string name="descr_statistics_sheet_delete_button">Track delete button</string>
     <string name="descr_statistics_sheet_edit_button">Track edit button</string>
     <string name="descr_statistics_sheet_save_button">Save as GPX button</string>