diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt
index ea709ec9b0..3c86522aac 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt
@@ -60,6 +60,9 @@ fun VaultItemCardContent(
             isExpanded = isExpanded,
             onExpandClick = { isExpanded = !isExpanded },
         )
+        item {
+            Spacer(modifier = Modifier.height(height = 8.dp))
+        }
         cardState.cardholderName?.let { cardholderName ->
             item(key = "cardholderName") {
                 BitwardenTextField(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt
index 72069334f8..dd8fb3c0d3 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt
@@ -59,6 +59,9 @@ fun VaultItemIdentityContent(
             isExpanded = isExpanded,
             onExpandClick = { isExpanded = !isExpanded },
         )
+        item {
+            Spacer(modifier = Modifier.height(height = 8.dp))
+        }
         identityState.identityName?.let { identityName ->
             item(key = "identityName") {
                 IdentityCopyField(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt
index a90d43d2d6..fddcdc6de2 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemSecureNoteContent.kt
@@ -56,6 +56,9 @@ fun VaultItemSecureNoteContent(
             isExpanded = isExpanded,
             onExpandClick = { isExpanded = !isExpanded },
         )
+        item {
+            Spacer(modifier = Modifier.height(height = 8.dp))
+        }
         commonState.notes?.let { notes ->
             item(key = "notes") {
                 Spacer(modifier = Modifier.height(8.dp))
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt
index 547f71d40c..1c793b32c7 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/component/ItemHeader.kt
@@ -112,7 +112,7 @@ fun LazyListScope.itemHeader(
     }
 
     if (relatedLocations.isEmpty()) {
-        item {
+        item(key = "noFolder") {
             ItemLocationListItem(
                 vectorPainter = rememberVectorPainter(R.drawable.ic_folder),
                 text = stringResource(R.string.no_folder),
@@ -120,9 +120,11 @@ fun LazyListScope.itemHeader(
                 modifier = Modifier
                     .standardHorizontalMargin()
                     .fillMaxWidth()
+                    .animateItem()
                     .cardStyle(
                         cardStyle = CardStyle.Bottom,
                         paddingVertical = 0.dp,
+                        paddingHorizontal = 16.dp,
                     ),
             )
         }