diff --git a/CHANGELOG b/CHANGELOG
index a7de1fd2a..87f201e2b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 KeePassDX(3.0.4)
  * Fix autofill inline bugs #1173 #1165
+ * Small UI change
 
 KeePassDX(3.0.3)
  * Change default Argon2 parameters #1098
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
index 7116d7506..f71724b17 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -1016,7 +1016,7 @@ class GroupActivity : DatabaseLockActivity(),
 
                 if (!sortMenuEducationPerformed) {
                     // lockMenuEducationPerformed
-                    val lockButtonView = findViewById<View>(R.id.lock_button_icon)
+                    val lockButtonView = findViewById<View>(R.id.lock_button)
                     lockButtonView != null
                             && groupActivityEducation.checkAndPerformedLockMenuEducation(
                         lockButtonView,
diff --git a/app/src/main/java/com/kunzisoft/keepass/education/GroupActivityEducation.kt b/app/src/main/java/com/kunzisoft/keepass/education/GroupActivityEducation.kt
index a083f31a0..2293bd47c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/education/GroupActivityEducation.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/education/GroupActivityEducation.kt
@@ -119,7 +119,7 @@ class GroupActivityEducation(activity: Activity)
                         .outerCircleColorInt(getCircleColor())
                         .outerCircleAlpha(getCircleAlpha())
                         .textColorInt(getTextColor())
-                        .tintTarget(true)
+                        .tintTarget(false)
                         .cancelable(true),
                 object : TapTargetView.Listener() {
                     override fun onTargetClick(view: TapTargetView) {
diff --git a/app/src/main/res/color/background_special_button_color.xml b/app/src/main/res/color/background_special_button_color.xml
deleted file mode 100644
index 7e4991bbc..000000000
--- a/app/src/main/res/color/background_special_button_color.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorAccentLight" android:state_pressed="true" />
-    <item android:color="@color/white_grey_darker" android:state_enabled="false" />
-    <item android:color="?attr/colorAccent" android:state_enabled="true" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/btn_special_start_bottom_background.xml b/app/src/main/res/drawable-v21/btn_special_start_bottom_background.xml
deleted file mode 100644
index a70a8b973..000000000
--- a/app/src/main/res/drawable-v21/btn_special_start_bottom_background.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:color="@color/white"
-    tools:targetApi="lollipop">
-    <item>
-        <shape>
-            <corners
-                android:topLeftRadius="0dp"
-                android:topRightRadius="40dp"
-                android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="0dp"/>
-            <solid android:color="?attr/colorAccent"/>
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/btn_special_start_bottom_stroke.xml b/app/src/main/res/drawable-v21/btn_special_start_bottom_stroke.xml
deleted file mode 100644
index 4a121e8be..000000000
--- a/app/src/main/res/drawable-v21/btn_special_start_bottom_stroke.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:color="@color/white"
-    tools:targetApi="lollipop">
-    <item>
-        <shape>
-            <stroke
-                android:width="1dp"
-                android:color="?attr/textColorInverse" />
-            <corners
-                android:topLeftRadius="0dp"
-                android:topRightRadius="40dp"
-                android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="0dp"/>
-            <solid
-                android:color="@color/transparent"/>
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_special_start_bottom_background.xml b/app/src/main/res/drawable/btn_special_start_bottom_background.xml
deleted file mode 100644
index e1a770fc0..000000000
--- a/app/src/main/res/drawable/btn_special_start_bottom_background.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_pressed="true">
-        <shape>
-            <corners
-                android:topLeftRadius="0dp"
-                android:topRightRadius="40dp"
-                android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="0dp"/>
-            <padding
-                android:left="4dp"
-                android:right="12dp"
-                android:top="18dp"
-                android:bottom="8dp"/>
-            <solid android:color="@color/orange_light"/>
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <corners
-                android:topLeftRadius="0dp"
-                android:topRightRadius="40dp"
-                android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="0dp"/>
-            <padding
-                android:left="4dp"
-                android:right="12dp"
-                android:top="18dp"
-                android:bottom="8dp"/>
-            <solid android:color="@color/orange"/>
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_special_start_bottom_stroke.xml b/app/src/main/res/drawable/btn_special_start_bottom_stroke.xml
deleted file mode 100644
index 59e24d00a..000000000
--- a/app/src/main/res/drawable/btn_special_start_bottom_stroke.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/white">
-    <item>
-        <shape>
-            <stroke
-                android:width="1dp"
-                android:color="@color/white_grey" />
-            <corners
-                android:topLeftRadius="0dp"
-                android:topRightRadius="40dp"
-                android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="0dp"/>
-            <solid
-                android:color="@color/transparent"/>
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock_white_padding_24dp.xml b/app/src/main/res/drawable/ic_lock_white_padding_24dp.xml
new file mode 100644
index 000000000..2469e3136
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_white_padding_24dp.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <group
+        android:scaleX="0.8"
+        android:scaleY="0.8"
+        android:pivotX="12"
+        android:pivotY="12">
+        <path
+            android:fillColor="#FFFFFFFF"
+            android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml
index fe37fea78..93107c5e6 100644
--- a/app/src/main/res/layout/activity_entry.xml
+++ b/app/src/main/res/layout/activity_entry.xml
@@ -138,8 +138,8 @@
 
     <include
         layout="@layout/view_button_lock"
-        android:layout_width="@dimen/lock_button_size"
-        android:layout_height="@dimen/lock_button_size"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="start|bottom" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml
index 874d4d891..ca6c7f3a0 100644
--- a/app/src/main/res/layout/activity_entry_edit.xml
+++ b/app/src/main/res/layout/activity_entry_edit.xml
@@ -100,8 +100,8 @@
 
     <include
         layout="@layout/view_button_lock"
-        android:layout_width="@dimen/lock_button_size"
-        android:layout_height="@dimen/lock_button_size"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index 0a2fc8475..1ba069e24 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -132,6 +132,7 @@
             android:orientation="vertical"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_below="@+id/toolbar">
+
             <FrameLayout
                 android:id="@+id/nodes_list_fragment_container"
                 android:layout_width="match_parent"
@@ -168,8 +169,8 @@
 
     <include
         layout="@layout/view_button_lock"
-        android:layout_width="@dimen/lock_button_size"
-        android:layout_height="@dimen/lock_button_size"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_icon_picker.xml b/app/src/main/res/layout/activity_icon_picker.xml
index 9d3acd0ce..0c0714be4 100644
--- a/app/src/main/res/layout/activity_icon_picker.xml
+++ b/app/src/main/res/layout/activity_icon_picker.xml
@@ -59,8 +59,8 @@
 
     <include
         layout="@layout/view_button_lock"
-        android:layout_width="@dimen/lock_button_size"
-        android:layout_height="@dimen/lock_button_size"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_toolbar.xml b/app/src/main/res/layout/activity_toolbar.xml
index 35e1180d5..6a8fa665f 100644
--- a/app/src/main/res/layout/activity_toolbar.xml
+++ b/app/src/main/res/layout/activity_toolbar.xml
@@ -42,8 +42,8 @@
 
     <include
         layout="@layout/view_button_lock"
-        android:layout_width="@dimen/lock_button_size"
-        android:layout_height="@dimen/lock_button_size"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:visibility="gone"
         android:layout_gravity="start|bottom" />
 
diff --git a/app/src/main/res/layout/view_button_lock.xml b/app/src/main/res/layout/view_button_lock.xml
index 2f0a7c662..fb2e02aa1 100644
--- a/app/src/main/res/layout/view_button_lock.xml
+++ b/app/src/main/res/layout/view_button_lock.xml
@@ -1,48 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FrameLayout
-    android:id="@+id/lock_button"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/lock_button_background"
-        android:layout_width="@dimen/lock_button_size"
-        android:layout_height="@dimen/lock_button_size"
-        android:layout_marginStart="-2dp"
-        android:layout_marginLeft="-2dp"
-        android:layout_marginBottom="-2dp"
-        tools:targetApi="lollipop"
-        android:elevation="4dp"
-        style="@style/KeepassDXStyle.Special.Button.Background"
-        android:layout_gravity="bottom|start"
-        android:contentDescription="@string/menu_lock" />
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/lock_button_stroke"
-        android:layout_width="@dimen/lock_button_size"
-        android:layout_height="@dimen/lock_button_size"
-        android:layout_marginStart="-2dp"
-        android:layout_marginLeft="-2dp"
-        android:layout_marginBottom="-2dp"
-        tools:targetApi="lollipop"
-        android:elevation="4dp"
-        style="@style/KeepassDXStyle.Special.Button.Stroke"
-        android:layout_gravity="bottom|start"
-        android:contentDescription="@string/menu_lock" />
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/lock_button_icon"
-        android:layout_width="@dimen/lock_button_size"
-        android:layout_height="@dimen/lock_button_size"
-        android:paddingBottom="6dp"
-        android:paddingTop="16dp"
-        android:paddingStart="4dp"
-        android:paddingLeft="4dp"
-        android:paddingEnd="12dp"
-        android:paddingRight="12dp"
-        tools:targetApi="lollipop"
-        android:elevation="4dp"
-        android:src="@drawable/ic_lock_white_24dp"
-        android:tint="@color/white"
-        android:layout_gravity="bottom|start"
-        android:contentDescription="@string/menu_lock" />
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/lock_button"
+        style="@style/KeepassDXStyle.Fab.Special"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:fabSize="mini"
+        android:layout_margin="8dp"
+        android:contentDescription="@string/lock"
+        android:src="@drawable/ic_lock_white_padding_24dp"
+        xmlns:app="http://schemas.android.com/apk/res-auto" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f7fe15881..e15a03b01 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -443,21 +443,14 @@
         <item name="backgroundTint">?android:attr/windowBackground</item>
     </style>
 
-    <!-- Special button Style -->
-    <style name="KeepassDXStyle.Special.Button.Background" parent="KeepassDXStyle.v21.Button">
-        <item name="android:background">@drawable/btn_special_start_bottom_background</item>
-        <item name="backgroundTint">@color/background_special_button_color</item>
-    </style>
-    <style name="KeepassDXStyle.Special.Button.Stroke" parent="KeepassDXStyle.v21.Button">
-        <item name="android:background">@drawable/btn_special_start_bottom_stroke</item>
-        <item name="backgroundTint">@color/white</item>
-        <item name="backgroundTintMode">src_atop</item>
-    </style>
-
     <!-- FAB -->
     <style name="KeepassDXStyle.v21.Fab" parent="KeepassDXStyle.Light.v21" />
     <style name="KeepassDXStyle.Fab" parent="KeepassDXStyle.v21.Fab">
     </style>
+    <style name="KeepassDXStyle.Fab.Special" parent="KeepassDXStyle.v21.Fab">
+        <item name="backgroundTint">?attr/colorPrimary</item>
+        <item name="tint">?attr/textColorInverse</item>
+    </style>
 
     <!-- Menu FAB -->
     <style name="KeepassDXStyle.v21.FabMenu" parent="KeepassDXStyle.TextAppearance.Default.TextOnPrimary">
diff --git a/fastlane/metadata/android/en-US/changelogs/91.txt b/fastlane/metadata/android/en-US/changelogs/91.txt
index d586470f4..e6972db0c 100644
--- a/fastlane/metadata/android/en-US/changelogs/91.txt
+++ b/fastlane/metadata/android/en-US/changelogs/91.txt
@@ -1 +1,2 @@
- * Fix autofill inline bugs #1173 #1165
\ No newline at end of file
+ * Fix autofill inline bugs #1173 #1165
+ * Small UI change
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/91.txt b/fastlane/metadata/android/fr-FR/changelogs/91.txt
index 8a6c4aeb7..b7b427788 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/91.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/91.txt
@@ -1 +1,2 @@
- * Résolution de bogues du remplissage automatique uniligne #1173 #1165
\ No newline at end of file
+ * Résolution de bogues du remplissage automatique uniligne #1173 #1165
+ * Petit changement dans l'interface utilisateur
\ No newline at end of file