diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 1dfde45af..8320c7256 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -174,7 +174,7 @@
 					<ActionButton
 						icon="icon-archive"
 						@click="toggleShowArchived">
-						{{ t('deck', 'Show archived cards') }}
+						{{ showArchived ? t('deck', 'Hide archived cards') : t('deck', 'Show archived cards') }}
 					</ActionButton>
 					<ActionButton v-if="compactMode"
 						icon="icon-toggle-compact-collapsed"
diff --git a/src/components/cards/CardBadges.vue b/src/components/cards/CardBadges.vue
index d019bb1e3..8a82603c7 100644
--- a/src/components/cards/CardBadges.vue
+++ b/src/components/cards/CardBadges.vue
@@ -121,6 +121,10 @@ export default {
 		}
 	}
 
+	.card:not(.card__editable) .avatars {
+		margin-right: 10px;
+	}
+
 	.fade-enter-active, .fade-leave-active {
 		transition: opacity .125s;
 	}
diff --git a/src/components/cards/CardItem.vue b/src/components/cards/CardItem.vue
index bc5ec7437..10e605d57 100644
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -26,7 +26,7 @@
 
 <template>
 	<AttachmentDragAndDrop v-if="card" :card-id="card.id" class="drop-upload--card">
-		<div :class="{'compact': compactMode, 'current-card': currentCard, 'has-labels': card.labels && card.labels.length > 0, 'is-editing': editing}"
+		<div :class="{'compact': compactMode, 'current-card': currentCard, 'has-labels': card.labels && card.labels.length > 0, 'is-editing': editing, 'card__editable': canEdit}"
 			tag="div"
 			class="card"
 			@click="openCard">