diff --git a/src/components/home/topNavigation.vue b/src/components/home/topNavigation.vue
index bb8d549505..5a083c123c 100644
--- a/src/components/home/topNavigation.vue
+++ b/src/components/home/topNavigation.vue
@@ -44,7 +44,7 @@
 				<img :src="userAvatar" alt="" class="avatar"/>
 				<div class="dropdown is-right is-active">
 					<div class="dropdown-trigger">
-						<button @click.stop="userMenuActive = !userMenuActive" class="button noshadow">
+						<button @click.stop="userMenuActive = !userMenuActive" class="button has-no-shadow">
 							<span class="username">{{ userInfo.name !== '' ? userInfo.name : userInfo.username }}</span>
 							<span class="icon is-small">
 									<icon icon="chevron-down"/>
diff --git a/src/components/home/update.vue b/src/components/home/update.vue
index 5499f47af3..a7b5f11e7e 100644
--- a/src/components/home/update.vue
+++ b/src/components/home/update.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="update-notification" v-if="updateAvailable">
 		<p>There is an update for Vikunja available!</p>
-		<a @click="refreshApp()" class="button is-primary noshadow">Update Now</a>
+		<a @click="refreshApp()" class="button is-primary has-no-shadow">Update Now</a>
 	</div>
 </template>
 
diff --git a/src/components/migrator/migration.vue b/src/components/migrator/migration.vue
index e8737b31cb..2c9dddbc07 100644
--- a/src/components/migrator/migration.vue
+++ b/src/components/migrator/migration.vue
@@ -39,7 +39,7 @@
 			</p>
 			<div class="buttons">
 				<button @click="migrate" class="button is-primary">I am sure, please start migrating now!</button>
-				<router-link :to="{name: 'home'}" class="button is-text has-text-danger is-inverted noshadow underline-none">Cancel</router-link>
+				<router-link :to="{name: 'home'}" class="button is-text has-text-danger is-inverted has-no-shadow underline-none">Cancel</router-link>
 			</div>
 		</div>
 		<div v-else>
diff --git a/src/components/misc/notification.vue b/src/components/misc/notification.vue
index 4ad3f2bcca..e0d5809e5e 100644
--- a/src/components/misc/notification.vue
+++ b/src/components/misc/notification.vue
@@ -19,7 +19,7 @@
 					<button
 						:key="'action_'+i"
 						@click="action.callback"
-						class="button noshadow is-small" v-for="(action, i) in props.item.data.actions">
+						class="button has-no-shadow is-small" v-for="(action, i) in props.item.data.actions">
 						{{ action.title }}
 					</button>
 				</div>
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 11e521638e..72e706432b 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -11,8 +11,8 @@
 						<slot name="text"></slot>
 					</div>
 					<div class="actions">
-						<button @click="$emit('close')" class="button is-text has-text-danger is-inverted noshadow underline-none">Cancel</button>
-						<button @click="$emit('submit')" class="button is-primary noshadow">Do it!</button>
+						<button @click="$emit('close')" class="button is-text has-text-danger is-inverted has-no-shadow underline-none">Cancel</button>
+						<button @click="$emit('submit')" class="button is-primary has-no-shadow">Do it!</button>
 					</div>
 					</slot>
 				</div>
diff --git a/src/components/sharing/linkSharing.vue b/src/components/sharing/linkSharing.vue
index 065b0a5c5b..754b45136c 100644
--- a/src/components/sharing/linkSharing.vue
+++ b/src/components/sharing/linkSharing.vue
@@ -44,7 +44,7 @@
 								<input :value="getShareLink(s.hash)" class="input" readonly type="text"/>
 							</div>
 							<div class="control">
-								<a @click="copy(getShareLink(s.hash))" class="button is-primary noshadow" v-tooltip="'Copy to clipboard'">
+								<a @click="copy(getShareLink(s.hash))" class="button is-primary has-no-shadow" v-tooltip="'Copy to clipboard'">
 									<span class="icon">
 										<icon icon="paste"/>
 									</span>
diff --git a/src/components/tasks/gantt-component.vue b/src/components/tasks/gantt-component.vue
index 11c8f812a6..364054faa5 100644
--- a/src/components/tasks/gantt-component.vue
+++ b/src/components/tasks/gantt-component.vue
@@ -124,7 +124,7 @@
 					v-model="newTaskTitle"
 				/>
 			</transition>
-			<button @click="showCreateNewTask" class="button is-primary noshadow">
+			<button @click="showCreateNewTask" class="button is-primary has-no-shadow">
 				<span class="icon is-small">
 					<icon icon="plus"/>
 				</span>
diff --git a/src/styles/theme/form.scss b/src/styles/theme/form.scss
index a2b9a52010..6fdaec4afa 100644
--- a/src/styles/theme/form.scss
+++ b/src/styles/theme/form.scss
@@ -58,19 +58,6 @@
     color: $white;
   }
 
-  &.noshadow {
-    &,
-    &.is-hovered,
-    &:hover,
-    &.is-active,
-    &.is-focused,
-    &:active,
-    &:focus,
-    &:focus:not(:active) {
-      box-shadow: none;
-    }
-  }
-
   &.is-small {
     border-radius: $radius;
   }
diff --git a/src/styles/theme/theme.scss b/src/styles/theme/theme.scss
index f3e818277e..09aae8b5a8 100644
--- a/src/styles/theme/theme.scss
+++ b/src/styles/theme/theme.scss
@@ -1,10 +1,13 @@
-@import '../../../node_modules/bulma/bulma';
+@import "../../../node_modules/bulma/bulma";
 
-@import 'fonts';
+@import "fonts";
 
-@import 'variables-derived';
+@import "variables-derived";
 
-*, *:hover, *:active, *:focus {
+*,
+*:hover,
+*:active,
+*:focus {
   outline: none;
 }
 
@@ -16,12 +19,13 @@
   outline: 0;
 }
 
-:focus-visible, :-moz-focusring {
+:focus-visible,
+:-moz-focusring {
   box-shadow: 0 0 0 2px rgba($primary, 0.5);
 }
 
 body {
-  background: url('../../public/images/llama.svg') no-repeat bottom left fixed $light-background;
+  background: url("../../public/images/llama.svg") no-repeat bottom left fixed $light-background;
   min-height: 100vh;
 
   @media screen and (max-width: $tablet) {
@@ -31,13 +35,17 @@ body {
   }
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   font-family: $vikunja-font;
   font-weight: 400 !important;
 }
 
 .logo {
-
   padding-left: 2rem !important;
 
   img {
@@ -81,7 +89,8 @@ button.table {
 .pagination {
   padding-bottom: 1em;
 
-  .pagination-previous, .pagination-next {
+  .pagination-previous,
+  .pagination-next {
     &:not(:disabled):hover {
       background: $button-background-color;
       cursor: pointer;
@@ -96,7 +105,16 @@ button.table {
 }
 
 .has-no-shadow {
-  box-shadow: none !important;
+  &,
+  &.is-hovered,
+  &:hover,
+  &.is-active,
+  &.is-focused,
+  &:active,
+  &:focus,
+  &:focus:not(:active) {
+    box-shadow: none !important;
+  }
 }
 
 .is-fullwidth {
diff --git a/src/views/labels/NewLabel.vue b/src/views/labels/NewLabel.vue
index a00c2c8c8b..eea5a3606d 100644
--- a/src/views/labels/NewLabel.vue
+++ b/src/views/labels/NewLabel.vue
@@ -15,7 +15,7 @@
 						v-model="label.title"/>
 				</p>
 				<p class="control">
-					<button class="button is-primary noshadow" type="submit">
+					<button class="button is-primary has-no-shadow" type="submit">
 						<span class="icon is-small">
 							<icon icon="plus"/>
 						</span>
diff --git a/src/views/list/NewList.vue b/src/views/list/NewList.vue
index a6b68b7f99..fe9ee2c895 100644
--- a/src/views/list/NewList.vue
+++ b/src/views/list/NewList.vue
@@ -18,7 +18,7 @@
 					v-model="list.title"/>
 			</p>
 			<p class="control">
-				<button :disabled="list.title === ''" @click="newList()" class="button is-primary noshadow">
+				<button :disabled="list.title === ''" @click="newList()" class="button is-primary has-no-shadow">
 						<span class="icon is-small">
 							<icon icon="plus"/>
 						</span>
diff --git a/src/views/list/views/Kanban.vue b/src/views/list/views/Kanban.vue
index 66a085ea6c..a5552e8c85 100644
--- a/src/views/list/views/Kanban.vue
+++ b/src/views/list/views/Kanban.vue
@@ -193,7 +193,7 @@
 					</div>
 					<a
 						@click="toggleShowNewTaskInput(bucket.id)"
-						class="button noshadow is-transparent is-fullwidth has-text-centered"
+						class="button has-no-shadow is-transparent is-fullwidth has-text-centered"
 						v-if="!showNewTaskInput[bucket.id]">
 						<span class="icon is-small">
 							<icon icon="plus"/>
@@ -224,7 +224,7 @@
 				/>
 				<a
 					@click="() => showNewBucketInput = true"
-					class="button noshadow is-transparent is-fullwidth has-text-centered" v-if="!showNewBucketInput">
+					class="button has-no-shadow is-transparent is-fullwidth has-text-centered" v-if="!showNewBucketInput">
 					<span class="icon is-small">
 						<icon icon="plus"/>
 					</span>
diff --git a/src/views/list/views/List.vue b/src/views/list/views/List.vue
index 18a767dc95..849ae2fcce 100644
--- a/src/views/list/views/List.vue
+++ b/src/views/list/views/List.vue
@@ -21,7 +21,7 @@
 							<button
 								:class="{'is-loading': taskCollectionService.loading}"
 								@click="searchTasks"
-								class="button noshadow is-primary">
+								class="button has-no-shadow is-primary">
 								Search
 							</button>
 						</div>
diff --git a/src/views/namespaces/NewNamespace.vue b/src/views/namespaces/NewNamespace.vue
index 48622662af..bac97505c0 100644
--- a/src/views/namespaces/NewNamespace.vue
+++ b/src/views/namespaces/NewNamespace.vue
@@ -18,7 +18,7 @@
 					v-model="namespace.title"/>
 			</p>
 			<p class="control">
-				<button :disabled="namespace.title === ''" @click="newNamespace()" class="button is-primary noshadow">
+				<button :disabled="namespace.title === ''" @click="newNamespace()" class="button is-primary has-no-shadow">
 						<span class="icon is-small">
 							<icon icon="plus"/>
 						</span>
diff --git a/src/views/tasks/ShowTasks.vue b/src/views/tasks/ShowTasks.vue
index c89282ce3f..1be9bdc58e 100644
--- a/src/views/tasks/ShowTasks.vue
+++ b/src/views/tasks/ShowTasks.vue
@@ -30,9 +30,9 @@
 			/>
 		</h3>
 		<div v-if="!showAll">
-			<a @click="showTodaysTasks()"     class="button noshadow mr-2">Today</a>
-			<a @click="setDatesToNextWeek()"  class="button noshadow mr-2">Next Week</a>
-			<a @click="setDatesToNextMonth()" class="button noshadow">Next Month</a>
+			<a @click="showTodaysTasks()"     class="button has-no-shadow mr-2">Today</a>
+			<a @click="setDatesToNextWeek()"  class="button has-no-shadow mr-2">Next Week</a>
+			<a @click="setDatesToNextMonth()" class="button has-no-shadow">Next Month</a>
 		</div>
 		<template v-if="!taskService.loading && (!hasUndoneTasks || !tasks || tasks.length === 0)">
 			<h3 class="nothing">Nothing to do - Have a nice day!</h3>
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index fe7e03cf0f..dc0193f429 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -319,7 +319,7 @@
 						<span class="icon is-small"><icon icon="fill-drip"/></span>
 						Set task color
 					</a>
-					<a @click="showDeleteModal = true" class="button is-danger is-outlined noshadow has-no-border">
+					<a @click="showDeleteModal = true" class="button is-danger is-outlined has-no-shadow has-no-border">
 						<span class="icon is-small"><icon icon="trash-alt"/></span>
 						Delete task
 					</a>
diff --git a/src/views/teams/NewTeam.vue b/src/views/teams/NewTeam.vue
index a844d4513b..9f6fc3bcb6 100644
--- a/src/views/teams/NewTeam.vue
+++ b/src/views/teams/NewTeam.vue
@@ -16,7 +16,7 @@
 						v-model="team.name"/>
 				</p>
 				<p class="control">
-					<button class="button is-primary noshadow" type="submit">
+					<button class="button is-primary has-no-shadow" type="submit">
 						<span class="icon is-small">
 							<icon icon="plus"/>
 						</span>
diff --git a/src/views/user/Settings.vue b/src/views/user/Settings.vue
index ce7a9d0c20..6c6ac0c4f0 100644
--- a/src/views/user/Settings.vue
+++ b/src/views/user/Settings.vue
@@ -248,7 +248,7 @@
 						<input type="text" v-model="caldavUrl" class="input" readonly/>
 					</div>
 					<div class="control">
-						<a @click="copy(caldavUrl)" class="button is-primary noshadow" v-tooltip="'Copy to clipboard'">
+						<a @click="copy(caldavUrl)" class="button is-primary has-no-shadow" v-tooltip="'Copy to clipboard'">
 							<span class="icon">
 								<icon icon="paste"/>
 							</span>