diff --git a/src/app/pages/view/view.page.html b/src/app/pages/view/view.page.html
index a0a5709..eb69dd0 100644
--- a/src/app/pages/view/view.page.html
+++ b/src/app/pages/view/view.page.html
@@ -1,4 +1 @@
-<a mat-mini-fab routerLink="/v/{{name}}/edit" matTooltip="{{'views.edit' | i18n}}" color="primary">
-  <mat-icon inline="true">edit</mat-icon>
-</a>
 <page-entries *ngIf="name" #entries [fetch]="boundFetch"></page-entries>
\ No newline at end of file
diff --git a/src/app/pages/view/view.page.scss b/src/app/pages/view/view.page.scss
index 39c8a39..e69de29 100644
--- a/src/app/pages/view/view.page.scss
+++ b/src/app/pages/view/view.page.scss
@@ -1,6 +0,0 @@
-a.mat-mini-fab {
-  position: fixed;
-  top: 34px;
-  right: 5px;
-  z-index: 5;
-}
\ No newline at end of file
diff --git a/src/app/ui/viewmenu/viewmenu.ui.html b/src/app/ui/viewmenu/viewmenu.ui.html
index c9bd3cd..01c6a41 100644
--- a/src/app/ui/viewmenu/viewmenu.ui.html
+++ b/src/app/ui/viewmenu/viewmenu.ui.html
@@ -1,13 +1,20 @@
 <ng-container *ngIf="settings">
   <ng-container *ngFor="let view of views">
     <mat-divider *ngIf="view.divider"></mat-divider>
-    <a routerLink="/v/{{view.name}}" routerLinkActive="active" mat-list-item>
-      <mat-icon>{{'sorting.' + view.sorting + '.icon' | i18n}}</mat-icon> {{'sorting.' + view.name | i18nEmpty}}
-    </a>
+    <mat-list-item>
+      <a routerLink="/v/{{view.name}}" routerLinkActive="active" class="link">
+        <mat-icon>{{'sorting.' + view.sorting + '.icon' | i18n}}</mat-icon> {{'sorting.' + view.name | i18nEmpty}}
+      </a>
+      <small>
+        <a routerLink="/v/{{view.name}}/edit" matTooltip="{{'views.edit' | i18n}}" color="primary" class="edit">
+          <mat-icon inline="true">edit</mat-icon>
+        </a>
+      </small>
+    </mat-list-item>
   </ng-container>
   <mat-divider></mat-divider>
   <a *ngIf="views.length < settings.maxViews" routerLink="/v" routerLinkActive="active" mat-list-item
     title="{{'views.add' | i18n}}">
     <mat-icon style="margin: 0 auto;">add</mat-icon>
   </a>
-</ng-container>
\ No newline at end of file
+</ng-container>
diff --git a/src/app/ui/viewmenu/viewmenu.ui.scss b/src/app/ui/viewmenu/viewmenu.ui.scss
index 9ee20ad..a4a83c5 100644
--- a/src/app/ui/viewmenu/viewmenu.ui.scss
+++ b/src/app/ui/viewmenu/viewmenu.ui.scss
@@ -1,3 +1,24 @@
 mat-form-field {
   display: block;
 }
+
+mat-list-item {
+  a.link {
+    flex-grow: 1;
+  }
+
+  a.edit {
+    display: none;
+  }
+}
+
+mat-list-item:hover {
+  a.edit {
+    opacity: 0.6;
+    display: inline-block;
+  }
+
+  a.edit:hover {
+    opacity: 1;
+  }
+}
\ No newline at end of file