diff --git a/package-lock.json b/package-lock.json
index c7d10c5..af11899 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -233,18 +233,11 @@
       }
     },
     "@angular-material-components/datetime-picker": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@angular-material-components/datetime-picker/-/datetime-picker-6.0.3.tgz",
-      "integrity": "sha512-Pc11woDH0leghqhvqRDKy4/bk3sdYV8f7IJO8om50YTeF2/y9+RfQinxL1JTaojdJ/PBeyGTJlsK3wdxjVZ0cA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@angular-material-components/datetime-picker/-/datetime-picker-7.0.1.tgz",
+      "integrity": "sha512-ukNFdmab++bPF35+56SXFkzWz7F2If3s/rRae37Yq3g7QWWh3kmS7KEbvtSIz000yj3/wGHDV1v9ChGiqsNsgA==",
       "requires": {
-        "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-        }
+        "tslib": "^2.3.0"
       }
     },
     "@angular/animations": {
@@ -256,12 +249,12 @@
       }
     },
     "@angular/cdk": {
-      "version": "12.2.8",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-12.2.8.tgz",
-      "integrity": "sha512-M0Y61o0yEVLMg+DSNsaDgiOifAV6OdumTgt2/kNoSuauPRWS0bkZJE58k3LR+cPi1Cho3UXELMKMOXZN9AhofA==",
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-13.1.3.tgz",
+      "integrity": "sha512-Psuri2mc6W+xKtZr39FHL+cDz7Le9kKTo8ziCtUiydikBBdqfOu6AnWUrEMEGFxS2wt8nolFXDAGUaMUAE3Ekg==",
       "requires": {
         "parse5": "^5.0.0",
-        "tslib": "^2.2.0"
+        "tslib": "^2.3.0"
       },
       "dependencies": {
         "parse5": {
@@ -269,11 +262,6 @@
           "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
           "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
           "optional": true
-        },
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
         }
       }
     },
@@ -381,18 +369,11 @@
       }
     },
     "@angular/flex-layout": {
-      "version": "12.0.0-beta.35",
-      "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-12.0.0-beta.35.tgz",
-      "integrity": "sha512-nPi2MGDFuCacwWHqxF/G7lUJd2X99HbLjjUvKXnyLwyCIVgH1sfS52su2wYbVYWJRqAVAB2/VMlrtW8Khr8hDA==",
+      "version": "13.0.0-beta.36",
+      "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-13.0.0-beta.36.tgz",
+      "integrity": "sha512-JLC3C1oEKVu9lLyottvHbfyCf/pOPzjXfFO3qOPBbWyVqxuQkfkd2NILZZh4DHsKYbBxIZ01vnfQHCV8NdaZ3w==",
       "requires": {
-        "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-        }
+        "tslib": "^2.3.0"
       }
     },
     "@angular/forms": {
@@ -466,33 +447,19 @@
       }
     },
     "@angular/material": {
-      "version": "12.2.8",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-12.2.8.tgz",
-      "integrity": "sha512-wRTaTZIGC9+2e8aft44V9Qqwp3PsR9AG0FeJ0spl8mdOlYEqMMyoRXjvMiWIjo2ywxHLoQgLXXsWn3ip2xnnVg==",
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-13.1.3.tgz",
+      "integrity": "sha512-fJmd73Tqlk/eKJ68XBGgwnoME3j+tfRG6CEFtNwMnWLkPTziWX5PHkY1D/cDWFa9VB6vjW8jxAE9UeQmXSk/RA==",
       "requires": {
-        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-        }
+        "tslib": "^2.3.0"
       }
     },
     "@angular/material-moment-adapter": {
-      "version": "12.2.8",
-      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-12.2.8.tgz",
-      "integrity": "sha512-uk81sYrY4TfX889ZXo7l7iV8Idxww+sTHzZueq8xC9UTG35FM0KLSvUa/EqwR31lau+6rbgKFCGurQVhBvHrQA==",
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-13.1.3.tgz",
+      "integrity": "sha512-Es3qPto96+Y9K9zaywqfi22IvfbQbAj10Oc/Zj+OFGKyh6k0kbb9VgL95yNr6nMNwflK8gbqhOq9oI/sx2UITA==",
       "requires": {
-        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-        }
+        "tslib": "^2.3.0"
       }
     },
     "@angular/platform-browser": {
diff --git a/package.json b/package.json
index c242945..f2611b5 100644
--- a/package.json
+++ b/package.json
@@ -11,16 +11,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-material-components/datetime-picker": "^6.0.3",
+    "@angular-material-components/datetime-picker": "^7.0.1",
     "@angular/animations": "~13.1.3",
-    "@angular/cdk": "^12.2.8",
+    "@angular/cdk": "^13.1.3",
     "@angular/common": "~13.1.3",
     "@angular/compiler": "~13.1.3",
     "@angular/core": "~13.1.3",
-    "@angular/flex-layout": "^12.0.0-beta.35",
+    "@angular/flex-layout": "^13.0.0-beta.36",
     "@angular/forms": "~13.1.3",
-    "@angular/material": "^12.2.8",
-    "@angular/material-moment-adapter": "^12.2.8",
+    "@angular/material": "^13.1.3",
+    "@angular/material-moment-adapter": "^13.1.3",
     "@angular/platform-browser": "~13.1.3",
     "@angular/platform-browser-dynamic": "~13.1.3",
     "@angular/router": "~13.1.3",
diff --git a/src/app/pages/entry/edit/edit.page.html b/src/app/pages/entry/edit/edit.page.html
index c9b2bd5..6afa12d 100644
--- a/src/app/pages/entry/edit/edit.page.html
+++ b/src/app/pages/entry/edit/edit.page.html
@@ -31,7 +31,7 @@
           </mat-error>
         </mat-form-field>
         <mat-form-field>
-          <textarea [mat-autosize] [matAutosizeMinRows]="3" matInput placeholder="{{'submission.text' | i18n}}"
+          <textarea matAutosize matAutosizeMinRows="3" matInput placeholder="{{'submission.text' | i18n}}"
             [required]="entryType != 'LINK'" formControlName="text"></textarea>
           <mat-error>
             {{'submission.text.error' | i18n}}
diff --git a/src/app/pages/settings/settings.page.html b/src/app/pages/settings/settings.page.html
index cc36d33..060b88f 100644
--- a/src/app/pages/settings/settings.page.html
+++ b/src/app/pages/settings/settings.page.html
@@ -10,7 +10,7 @@
           </mat-error>
         </mat-form-field>
         <mat-form-field>
-          <textarea [mat-autosize] [matAutosizeMinRows]="3" matInput placeholder="{{'settings.about' | i18n}}"
+          <textarea matAutosize matAutosizeMinRows="3" matInput placeholder="{{'settings.about' | i18n}}"
             formControlName="about"></textarea>
           <mat-error>
             {{'settings.about.error' | i18n}}
diff --git a/src/app/ui/comment/comment.ui.html b/src/app/ui/comment/comment.ui.html
index ebfc1c8..2a55678 100644
--- a/src/app/ui/comment/comment.ui.html
+++ b/src/app/ui/comment/comment.ui.html
@@ -68,7 +68,7 @@
   <ng-container *ngIf="comment.metadata && comment.metadata.edit">
     <form [formGroup]="form" (ngSubmit)="update()" #formDirective="ngForm">
       <mat-form-field>
-        <textarea [mat-autosize] [matAutosizeMinRows]="3" matInput formControlName="text"
+        <textarea matAutosize matAutosizeMinRows="3" matInput formControlName="text"
           placeholder="{{'comment.text' | i18n}}" required></textarea>
         <mat-error *ngIf="hasError('text')">
           {{'comment.text.error' | i18n}}
diff --git a/src/app/ui/commentform/commentform.ui.html b/src/app/ui/commentform/commentform.ui.html
index b28bdc3..607deb8 100644
--- a/src/app/ui/commentform/commentform.ui.html
+++ b/src/app/ui/commentform/commentform.ui.html
@@ -1,7 +1,7 @@
 <form [formGroup]="form" (ngSubmit)="create()" #formDirective="ngForm">
 
   <mat-form-field>
-    <textarea [mat-autosize] [matAutosizeMinRows]="3" matInput formControlName="text" placeholder="{{'comment.text' | i18n}}" required></textarea>
+    <textarea matAutosize matAutosizeMinRows="3" matInput formControlName="text" placeholder="{{'comment.text' | i18n}}" required></textarea>
     <mat-error *ngIf="hasError('text')">
       {{'comment.text.error' | i18n}}
     </mat-error>
diff --git a/src/app/ui/main/main.ui.html b/src/app/ui/main/main.ui.html
index ea9ac21..721e188 100644
--- a/src/app/ui/main/main.ui.html
+++ b/src/app/ui/main/main.ui.html
@@ -8,7 +8,7 @@
   </span>
   <span class="spacer"></span>
   <ng-container *ngIf="authenticated">
-    <a routerLink="/submit" mat-raised-button color="accent">{{'submission' |
+    <a routerLink="/submit" mat-raised-button color="accent"><mat-icon>edit</mat-icon> {{'submission' |
       i18n}}</a>
   </ng-container>
   <ng-container>
diff --git a/src/app/ui/viewmenu/viewmenu.ui.html b/src/app/ui/viewmenu/viewmenu.ui.html
index 01c6a41..b853eff 100644
--- a/src/app/ui/viewmenu/viewmenu.ui.html
+++ b/src/app/ui/viewmenu/viewmenu.ui.html
@@ -7,7 +7,7 @@
       </a>
       <small>
         <a routerLink="/v/{{view.name}}/edit" matTooltip="{{'views.edit' | i18n}}" color="primary" class="edit">
-          <mat-icon inline="true">edit</mat-icon>
+          <mat-icon inline="true">tune</mat-icon>
         </a>
       </small>
     </mat-list-item>
diff --git a/src/styles.scss b/src/styles.scss
index c13d265..a7d0ab1 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,5 +1,5 @@
 // Custom Theming for Angular Material
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 // For more information: https://material.angular.io/guide/theming
 // Plus imports for other components in your app.
 
diff --git a/src/variables.scss b/src/variables.scss
index 21d85be..d164a20 100644
--- a/src/variables.scss
+++ b/src/variables.scss
@@ -1,4 +1,4 @@
-@use '~@angular/material' as mat;
+@use '@angular/material' as mat;
 
 $light-primary: mat.define-palette(mat.$deep-orange-palette, 800);
 $light-accent: mat.define-palette(mat.$grey-palette, A400, A200, A700);