diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt
index 48cad7ba5..9bc382902 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt
@@ -32,7 +32,7 @@ class IconImageStandard : Parcelable {
     }
 
     constructor(iconId: Int) {
-        if (iconId < 0 || iconId > NB_ICONS)
+        if (iconId < 0 || iconId >= NB_ICONS)
             this.id = KEY_ID
         else
             this.id = iconId
diff --git a/app/src/main/java/com/kunzisoft/keepass/icons/IconPack.kt b/app/src/main/java/com/kunzisoft/keepass/icons/IconPack.kt
index 4616f9cde..7dc5985bf 100644
--- a/app/src/main/java/com/kunzisoft/keepass/icons/IconPack.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/icons/IconPack.kt
@@ -78,7 +78,7 @@ class IconPack(packageName: String, resources: Resources, resourceId: Int) {
 
         // Build the list of icons
         var num = 0
-        while (num <= NB_ICONS) {
+        while (num < NB_ICONS) {
             // To construct the id with name_ic_XX_32dp (ex : classic_ic_08_32dp )
             val resId = resources.getIdentifier(
                     id + "_" + String.format(Locale.ENGLISH, "%02d", num) + "_32dp",
@@ -134,6 +134,6 @@ class IconPack(packageName: String, resources: Resources, resourceId: Int) {
     }
 
     companion object {
-        const val NB_ICONS = 68
+        const val NB_ICONS = 69
     }
 }
diff --git a/app/src/main/res/layout/fragment_icon_custom_picker.xml b/app/src/main/res/layout/fragment_icon_custom_picker.xml
index f55703542..9a6822cdc 100644
--- a/app/src/main/res/layout/fragment_icon_custom_picker.xml
+++ b/app/src/main/res/layout/fragment_icon_custom_picker.xml
@@ -24,12 +24,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-    app:spanCount="2"
-    android:verticalSpacing="32dp"
-    android:paddingTop="20dp"
-    android:gravity="center"
-    android:layout_gravity="center"
-    android:columnWidth="64dp"
-    android:numColumns="auto_fit"
-    android:stretchMode="spacingWidthUniform">
-</androidx.recyclerview.widget.RecyclerView>
+    app:spanCount="4" />
diff --git a/app/src/main/res/layout/fragment_icon_standard_picker.xml b/app/src/main/res/layout/fragment_icon_standard_picker.xml
index f55703542..9a6822cdc 100644
--- a/app/src/main/res/layout/fragment_icon_standard_picker.xml
+++ b/app/src/main/res/layout/fragment_icon_standard_picker.xml
@@ -24,12 +24,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-    app:spanCount="2"
-    android:verticalSpacing="32dp"
-    android:paddingTop="20dp"
-    android:gravity="center"
-    android:layout_gravity="center"
-    android:columnWidth="64dp"
-    android:numColumns="auto_fit"
-    android:stretchMode="spacingWidthUniform">
-</androidx.recyclerview.widget.RecyclerView>
+    app:spanCount="4" />
diff --git a/app/src/main/res/layout/item_icon.xml b/app/src/main/res/layout/item_icon.xml
index f5cdc4ad4..ed05364f3 100644
--- a/app/src/main/res/layout/item_icon.xml
+++ b/app/src/main/res/layout/item_icon.xml
@@ -17,11 +17,15 @@
   You should have received a copy of the GNU General Public License
   along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<androidx.appcompat.widget.AppCompatImageView
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/icon_image"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:layout_margin="32dp">
-</androidx.appcompat.widget.AppCompatImageView>
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="16dp">
+    </androidx.appcompat.widget.AppCompatImageView>
+</FrameLayout>