diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 7689907e3c..40abc7a9a0 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -4324,7 +4324,7 @@
   },
   "attachmentsinglefield": {
     "name": "Single Attachment",
-    "icon": "Document",
+    "icon": "Attach",
     "styles": ["size"],
     "requiredAncestors": ["form"],
     "editable": true,
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index e6860da52d..95228c3bdc 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -124,8 +124,8 @@ export const TypeIconMap = {
   [FieldType.ARRAY]: "Duplicate",
   [FieldType.NUMBER]: "123",
   [FieldType.BOOLEAN]: "Boolean",
-  [FieldType.ATTACHMENTS]: "AppleFiles",
-  [FieldType.ATTACHMENT_SINGLE]: "Document",
+  [FieldType.ATTACHMENTS]: "Attach",
+  [FieldType.ATTACHMENT_SINGLE]: "Attach",
   [FieldType.LINK]: "DataCorrelated",
   [FieldType.FORMULA]: "Calculator",
   [FieldType.JSON]: "Brackets",
diff --git a/packages/frontend-core/src/utils/rows.js b/packages/frontend-core/src/utils/rows.js
index ea43d63734..1fb26eabd5 100644
--- a/packages/frontend-core/src/utils/rows.js
+++ b/packages/frontend-core/src/utils/rows.js
@@ -21,6 +21,8 @@ const isBetterSample = (newValue, oldValue) => {
   }
   if (
     newType === "object" &&
+    Array.isArray(newValue) &&
+    Array.isArray(oldValue) &&
     Object.keys(newValue).length > Object.keys(oldValue).length
   ) {
     return true