diff --git a/client/app/src/main/java/helper/SvgBtnCreator.java b/client/app/src/main/java/helper/SvgBtnCreator.java
index b23e366..5f0e3ff 100644
--- a/client/app/src/main/java/helper/SvgBtnCreator.java
+++ b/client/app/src/main/java/helper/SvgBtnCreator.java
@@ -8,7 +8,7 @@ import javafx.scene.shape.SVGPath;
 
 public class SvgBtnCreator {
 
-    public static Button cretaeBtn(Group group, int svgSize) {
+    public static Button createBtn(Group group, int svgSize) {
         Button btn = new Button();
 
         Bounds boundsDel = group.getBoundsInParent();
diff --git a/client/app/src/main/java/main/MainController.java b/client/app/src/main/java/main/MainController.java
index 937d4c2..446021f 100644
--- a/client/app/src/main/java/main/MainController.java
+++ b/client/app/src/main/java/main/MainController.java
@@ -12,7 +12,6 @@ import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-import javafx.scene.shape.SVGPath;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import res.DataController;
@@ -30,6 +29,8 @@ public class MainController {
     @FXML
     public VBox leftNav;
     @FXML
+    public GridPane mainGridPane;
+    @FXML
     private GridPane calendarGrid;
 
     @FXML
@@ -60,17 +61,17 @@ public class MainController {
                 SvgBtnCreator.createPath("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z",
                         "white", "lightgray")
         );
-        Button addBtn = SvgBtnCreator.cretaeBtn(svgAdd, 40);
+        Button addBtn = SvgBtnCreator.createBtn(svgAdd, 40);
         addBtn.setOnAction(e -> onAddBtnClick());
         addBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(addBtn);
 
         Group svgSettings = new Group(
-                SvgBtnCreator.createPath("M0,0h24v24H0V0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M0 0h24v24H0V0z", "transparent", "transparent"),
                 SvgBtnCreator.createPath("M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z",
                         "white", "lightgray")
         );
-        Button settingsBtn = SvgBtnCreator.cretaeBtn(svgSettings, 40);
+        Button settingsBtn = SvgBtnCreator.createBtn(svgSettings, 40);
         settingsBtn.setOnAction(e -> onSettingBtnClick());
         settingsBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(settingsBtn);
@@ -80,10 +81,43 @@ public class MainController {
                 SvgBtnCreator.createPath("M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z",
                         "white", "lightgray")
         );
-        Button logoutBtn = SvgBtnCreator.cretaeBtn(svgLogout, 40);
+        Button logoutBtn = SvgBtnCreator.createBtn(svgLogout, 40);
         logoutBtn.setOnAction(e -> onLogoutBtnClick());
         logoutBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(logoutBtn);
+
+        Group svgBack = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z",
+                        "white", "lightgray")
+        );
+        Button backBtn = SvgBtnCreator.createBtn(svgBack, 40);
+        backBtn.setOnAction(e -> onBackClick());
+        backBtn.getStyleClass().add("navBtn");
+        GridPane.setColumnIndex(backBtn, 1);
+        mainGridPane.getChildren().add(backBtn);
+
+        Group svgToday = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V8h16v13z",
+                        "white", "lightgray")
+        );
+        Button todayBtn = SvgBtnCreator.createBtn(svgToday, 40);
+        todayBtn.setOnAction(e -> onTodayClick());
+        todayBtn.getStyleClass().add("navBtn");
+        GridPane.setColumnIndex(todayBtn, 2);
+        mainGridPane.getChildren().add(todayBtn);
+
+        Group svgNext = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z",
+                        "white", "lightgray")
+        );
+        Button nextBtn = SvgBtnCreator.createBtn(svgNext, 40);
+        nextBtn.setOnAction(e -> onNextClick());
+        nextBtn.getStyleClass().add("navBtn");
+        GridPane.setColumnIndex(nextBtn, 3);
+        mainGridPane.getChildren().add(nextBtn);
     }
 
     private void updateEvents() {
@@ -189,7 +223,7 @@ public class MainController {
                 SvgBtnCreator.createPath("M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z",
                         "white", "lightgray")
         );
-        Button deleteBtn = SvgBtnCreator.cretaeBtn(svgDel, 24);
+        Button deleteBtn = SvgBtnCreator.createBtn(svgDel, 24);
 
         deleteBtn.getStyleClass().add("deleteEventBtn");
         deleteBtn.setOnAction(e -> {
@@ -203,7 +237,7 @@ public class MainController {
                 SvgBtnCreator.createPath("M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z",
                         "white", "lightgray")
         );
-        Button editBtn = SvgBtnCreator.cretaeBtn(svgEdit, 24);
+        Button editBtn = SvgBtnCreator.createBtn(svgEdit, 24);
         editBtn.getStyleClass().add("editEventBtn");
         editBtn.setOnAction(event1 -> {
             try {
@@ -284,12 +318,5 @@ public class MainController {
 
     }
 
-    private static SVGPath createPath(String d, String fill, String hoverFill) {
-        SVGPath path = new SVGPath();
-        path.getStyleClass().add("svg");
-        path.setContent(d);
-        path.setStyle("-fill:" + fill + ";-hover-fill:"+hoverFill+';');
-        return path;
-    }
 
 }
\ No newline at end of file
diff --git a/client/app/src/main/resources/main/main-view.css b/client/app/src/main/resources/main/main-view.css
index 657cac8..b32e122 100644
--- a/client/app/src/main/resources/main/main-view.css
+++ b/client/app/src/main/resources/main/main-view.css
@@ -76,7 +76,16 @@ Label{
 }
 
 .navBtn{
-    -fx-background-color: white;
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.navBtn .svg {
+    -fx-fill: -fill;
+}
+
+.navBtn:hover .svg {
+    -fx-fill: -hover-fill;
 }
 
 .editEventBtn{
diff --git a/client/app/src/main/resources/main/main-view.fxml b/client/app/src/main/resources/main/main-view.fxml
index 825fb73..3c45b3e 100644
--- a/client/app/src/main/resources/main/main-view.fxml
+++ b/client/app/src/main/resources/main/main-view.fxml
@@ -4,7 +4,6 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
-<?import com.jfoenix.controls.*?>
 
 <GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
           fx:controller="main.MainController">
@@ -21,7 +20,7 @@
 
         </ImageView>
     </VBox>
-    <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
+    <GridPane fx:id="mainGridPane" prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
         <columnConstraints>
             <ColumnConstraints hgrow="ALWAYS"/>
             <ColumnConstraints/>
@@ -40,9 +39,6 @@
                 <Insets left="5"/>
             </padding>
         </Label>
-        <JFXButton styleClass="navBtn" onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</JFXButton>
-        <JFXButton styleClass="navBtn" onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</JFXButton>
-        <JFXButton styleClass="navBtn" onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</JFXButton>
 
         <GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnSpan="4"
                   GridPane.columnIndex="0" GridPane.rowIndex="1">