diff --git a/cypress/integration/list/list.spec.js b/cypress/integration/list/list.spec.js
index 43939197b..8b8630fdb 100644
--- a/cypress/integration/list/list.spec.js
+++ b/cypress/integration/list/list.spec.js
@@ -31,7 +31,7 @@ describe('Lists', () => {
 		cy.url()
 			.should('contain', '/namespaces/1/list')
 		cy.get('.card-header-title')
-			.contains('Create a new list')
+			.contains('New list')
 		cy.get('input.input')
 			.type('New List')
 		cy.get('.button')
diff --git a/cypress/integration/list/namespaces.spec.js b/cypress/integration/list/namespaces.spec.js
index ee1351ac5..2ede493f5 100644
--- a/cypress/integration/list/namespaces.spec.js
+++ b/cypress/integration/list/namespaces.spec.js
@@ -15,7 +15,7 @@ describe('Namepaces', () => {
 
 	it('Should be all there', () => {
 		cy.visit('/namespaces')
-		cy.get('.namespace h1 span')
+		cy.get('[data-cy="namespace-title"]')
 			.should('contain', namespaces[0].title)
 	})
 
@@ -23,14 +23,14 @@ describe('Namepaces', () => {
 		const newNamespaceTitle = 'New Namespace'
 
 		cy.visit('/namespaces')
-		cy.get('a.button')
-			.contains('Create a new namespace')
+		cy.get('[data-cy="new-namespace"]')
+			.should('contain', 'New namespace')
 			.click()
 
 		cy.url()
 			.should('contain', '/namespaces/new')
 		cy.get('.card-header-title')
-			.should('contain', 'Create a new namespace')
+			.should('contain', 'New namespace')
 		cy.get('input.input')
 			.type(newNamespaceTitle)
 		cy.get('.button')
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 35dbec8f8..7e145529a 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -7,7 +7,7 @@
     "lastViewed": "Last viewed",
     "list": {
       "newText": "You can create a new list for your new tasks:",
-      "new": "Create a new list",
+      "new": "New list",
       "importText": "Or import your lists and tasks from other services into Vikunja:",
       "import": "Import your data into Vikunja"
     }
@@ -157,7 +157,7 @@
     "searchSelect": "Click or press enter to select this list",
     "shared": "Shared Lists",
     "create": {
-      "header": "Create a new list",
+      "header": "New list",
       "titlePlaceholder": "The list's title goes here…",
       "addTitleRequired": "Please specify a title.",
       "createdSuccess": "The list was successfully created.",
@@ -315,7 +315,7 @@
     "namespaces": "Namespaces",
     "search": "Type to search for a namespace…",
     "create": {
-      "title": "Create a new namespace",
+      "title": "New namespace",
       "titleRequired": "Please specify a title.",
       "explanation": "A namespace is a collection of lists you can share and use to organize your lists with. In fact, every list belongs to a namepace.",
       "tooltip": "What's a namespace?",
@@ -383,7 +383,7 @@
       "reminderRange": "Reminder Date Range"
     },
     "create": {
-      "title": "Create A Saved Filter",
+      "title": "New Saved Filter",
       "description": "A saved filter is a virtual list which is computed from a set of filters each time it is accessed. Once created, it will appear in a special namespace.",
       "action": "Create new saved filter"
     },
diff --git a/src/views/namespaces/ListNamespaces.vue b/src/views/namespaces/ListNamespaces.vue
index 82f446590..fdefe4f9c 100644
--- a/src/views/namespaces/ListNamespaces.vue
+++ b/src/views/namespaces/ListNamespaces.vue
@@ -1,17 +1,19 @@
 <template>
 	<div class="content loader-container" :class="{'is-loading': loading}" v-cy="'namespaces-list'">
-		<div class="create-buttons">
+		<header class="namespace-header">
 			<fancycheckbox v-model="showArchived" @change="saveShowArchivedState" v-cy="'show-archived-check'">
 				{{ $t('namespace.showArchived') }}
 			</fancycheckbox>
 
-			<x-button :to="{name: 'filters.create'}" class="new-namespace ml-auto" icon="filter">
-				{{ $t('filters.create.title') }}
-			</x-button>
-			<x-button :to="{name: 'namespace.create'}" class="new-namespace" icon="plus">
-				{{ $t('namespace.create.title') }}
-			</x-button>
-		</div>
+			<div class="action-buttons">
+				<x-button :to="{name: 'filters.create'}" icon="filter">
+					{{ $t('filters.create.title') }}
+				</x-button>
+				<x-button :to="{name: 'namespace.create'}" icon="plus" v-cy="'new-namespace'">
+					{{ $t('namespace.create.title') }}
+				</x-button>
+			</div>
+		</header>
 
 		<p class="has-text-centered has-text-grey mt-4 is-italic" v-if="namespaces.length === 0">
 			{{ $t('namespace.noneAvailable') }}
@@ -40,12 +42,12 @@
 				{{ $t('namespace.unarchive') }}
 			</x-button>
 
-			<h1>
-				<span>{{ getNamespaceTitle(n) }}</span>
+			<h2 class="namespace-title">
+				<span v-cy="'namespace-title'">{{ getNamespaceTitle(n) }}</span>
 				<span class="is-archived" v-if="n.isArchived">
 					{{ $t('namespace.archived') }}
 				</span>
-			</h1>
+			</h2>
 
 			<p class="has-text-centered has-text-grey mt-4 is-italic" v-if="n.lists.length === 0">
 				{{ $t('namespace.noLists') }}
@@ -105,52 +107,53 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.namespace {
-	&:not(:last-child) {
-		margin-bottom: 1rem;
-	}
-
-	h1 {
-		display: flex;
-		align-items: center;
-	}
-
-	.is-archived {
-		font-size: 0.75rem;
-		border: 1px solid var(--grey-500);
-		color: $grey !important;
-		padding: 2px 4px;
-		border-radius: 3px;
-		font-family: $vikunja-font;
-		background: var(--white-translucent);
-		margin-left: .5rem;
-	}
-
-	.lists {
-		display: flex;
-		flex-flow: row wrap;
-	}
-}
-
-.create-buttons {
+.namespace-header {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	gap: .5rem;
+	gap: 1rem;
 
 	@media screen and (max-width: $tablet) {
-		width: 100%;
 		flex-direction: column;
 	}
 }
 
-.new-namespace {
-	margin-bottom: .5rem;
-	width: 100%;
+.action-buttons {
+	display: flex;
+	justify-content: space-between;
+	gap: 1rem;
 
-	@media screen and (min-width: $tablet) {
-		margin-left: 1rem;
-		width: auto;
+	@media screen and (max-width: $tablet) {
+		width: 100%;
+		flex-direction: column;
+		align-items: stretch;
 	}
 }
+
+.namespace {
+	& + & {
+		margin-top: 1rem;
+	}
+}
+
+.namespace-title {
+	display: flex;
+	align-items: center;
+}
+
+.is-archived {
+	font-size: 0.75rem;
+	border: 1px solid var(--grey-500);
+	color: $grey !important;
+	padding: 2px 4px;
+	border-radius: 3px;
+	font-family: $vikunja-font;
+	background: var(--white-translucent);
+	margin-left: .5rem;
+}
+
+.lists {
+	display: flex;
+	flex-flow: row wrap;
+}
 </style>
\ No newline at end of file