diff --git a/src/locales/en.json b/src/locales/en.json
index 0b63774..23e3274 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -4,8 +4,8 @@
       "en": "ENG"
    },
    "navbar": {
-      "OrderMessagePanel": "ORDER MESSAGE",
-      "OrderListPanel": "SAVED ORDERS",
+      "OrderMessagePanel": "MESSAGE",
+      "OrderListPanel": "SAVED",
       "OrderTrainPickerPanel": "TRAINS"
    },
    "update": {
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 729f07d..249e36c 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -13,8 +13,8 @@
       "info-2": "Pełny changelog dostępny na <a href='https://github.com/Spythere/genera-tor' target='_blank'>GitHubie projektu</a>"
    },
    "navbar": {
-      "OrderMessagePanel": "TREŚĆ ROZKAZU",
-      "OrderListPanel": "ZAPISANE ROZKAZY",
+      "OrderMessagePanel": "WIADOMOŚĆ",
+      "OrderListPanel": "ZAPISANE",
       "OrderTrainPickerPanel": "POCIĄGI"
    },
    "order-message": {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index ab64c61..5ee5d38 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -8,13 +8,33 @@
       <div class="panel-container">
         <div class="panel-nav">
           <button
-            v-for="(action, i) in navActions"
-            :key="action"
-            class="g-button option"
-            :data-active="store.panelMode == action"
-            @click="selectOrderMode(action)"
+            key="OrderMessagePanel"
+            class="g-button"
+            :data-active="store.panelMode == 'OrderMessagePanel'"
+            @click="selectOrderMode('OrderMessagePanel')"
           >
-            {{ t(`navbar.${action}`) }}
+            <MessageSquareTextIcon :size="20" />
+            {{ t(`navbar.OrderMessagePanel`) }}
+          </button>
+
+          <button
+            key="OrderListPanel"
+            class="g-button"
+            :data-active="store.panelMode == 'OrderListPanel'"
+            @click="selectOrderMode('OrderListPanel')"
+          >
+            <BookMarkedIcon :size="20" />
+            {{ t(`navbar.OrderListPanel`) }}
+          </button>
+
+          <button
+            key="OrderTrainPickerPanel"
+            class="g-button"
+            :data-active="store.panelMode == 'OrderTrainPickerPanel'"
+            @click="selectOrderMode('OrderTrainPickerPanel')"
+          >
+            <TrainFrontIcon :size="20" />
+            {{ t(`navbar.OrderTrainPickerPanel`) }}
           </button>
         </div>
 
@@ -38,12 +58,11 @@ import OrderMessagePanel from '../components/Panels/OrderMessagePanel.vue';
 import OrderListPanel from '../components/Panels/OrderListPanel.vue';
 import OrderTrainPickerPanel from '../components/Panels/OrderTrainPickerPanel.vue';
 import { TPanelMode } from '../types/dataTypes';
+import { BookMarkedIcon, MessageSquareTextIcon, TrainFrontIcon } from 'lucide-vue-next';
 
 const { t } = useI18n();
 const store = useStore();
 
-const navActions: TPanelMode[] = ['OrderMessagePanel', 'OrderListPanel', 'OrderTrainPickerPanel'];
-
 function selectOrderMode(mode: TPanelMode) {
   store.panelMode = mode;
 }
@@ -113,8 +132,8 @@ const panelComponent = computed(() => {
 
 .panel-nav {
   display: flex;
-  align-items: center;
   justify-content: center;
+  align-items: center;
   gap: 0.25em;
   flex-wrap: wrap;
 
@@ -124,11 +143,24 @@ const panelComponent = computed(() => {
 .panel-nav > button {
   position: relative;
 
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 0.5em;
+  min-width: 8em;
+  padding: 0.25em 0.5em;
+
+  &:focus-visible {
+    outline: 1px solid white;
+  }
+
   &::before {
     position: absolute;
     content: '';
     bottom: -3px;
-    left: 0;
+    left: 50%;
+    transform: translateX(-50%);
+
     width: 0;
     height: 3px;
 
@@ -137,6 +169,10 @@ const panelComponent = computed(() => {
     background-color: colors.$accentCol;
   }
 
+  &[data-active='true'] {
+    color: colors.$accentCol;
+  }
+
   &[data-active='true']::before {
     width: 100%;
   }